162749 2016-09-29 14:03:13 -0700 Air should be able to replace constant materializations with adds 2016-10-11 14:36:41 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=162764 P2 Normal --- 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1234956 0 fpizlo 2016-09-29 14:03:13 -0700 We thought this was a good idea for a long time but then we got evidence that it's not a good idea. In the meantime, I implemented it. I will use this bug to stash the code and report any results. 1234960 1 290241 fpizlo 2016-09-29 14:03:49 -0700 Created attachment 290241 the patch This turns out to be very easy to write. 1238702 2 291216 fpizlo 2016-10-10 20:00:25 -0700 Created attachment 291216 the patch 1238704 3 291218 fpizlo 2016-10-10 20:15:25 -0700 Created attachment 291218 the patch 1238984 4 291218 ysuzuki 2016-10-11 13:47:39 -0700 Comment on attachment 291218 the patch r=me 1238989 5 fpizlo 2016-10-11 13:54:47 -0700 Landed in https://trac.webkit.org/changeset/207164 1239018 6 291218 saam 2016-10-11 14:36:41 -0700 Comment on attachment 291218 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=291218&action=review > Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp:195 > + // First handle some special instructions. Nit: I don't think this comment really adds anything. > Source/JavaScriptCore/b3/air/AirFixObviousSpills.cpp:210 > + // should add fancier materializations here for ARM if the BigImm is yuge. s/yuge/huge Maybe open a bug for this? 290241 2016-09-29 14:03:49 -0700 2016-10-10 20:00:25 -0700 the patch blah.patch text/plain 2187 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyRml4T2J2aW91c1NwaWxscy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJGaXhPYnZp b3VzU3BpbGxzLmNwcAkocmV2aXNpb24gMjA2NTg0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2IzL2Fpci9BaXJGaXhPYnZpb3VzU3BpbGxzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkxLDYg KzE5MSw0MiBAQCBwcml2YXRlOgogCiAgICAgICAgIGlmICh2ZXJib3NlKQogICAgICAgICAgICAg ZGF0YUxvZygiRml4aW5nIGluc3QgIiwgaW5zdCwgIjogIiwgbV9zdGF0ZSwgIlxuIik7CisgICAg ICAgIAorICAgICAgICAvLyBGaXJzdCBoYW5kbGUgc29tZSBzcGVjaWFsIGluc3RydWN0aW9ucy4K KyAgICAgICAgc3dpdGNoIChpbnN0Lm9wY29kZSkgeworICAgICAgICBjYXNlIE1vdmU6IHsKKyAg ICAgICAgICAgIGlmIChpbnN0LmFyZ3NbMF0uaXNCaWdJbW0oKSAmJiBpbnN0LmFyZ3NbMV0uaXNS ZWcoKQorICAgICAgICAgICAgICAgICYmIGlzVmFsaWRGb3JtKEFkZDY0LCBBcmc6OkltbSwgQXJn OjpUbXAsIEFyZzo6VG1wKSkgeworICAgICAgICAgICAgICAgIC8vIEJpZ0ltbSBtYXRlcmlhbGl6 YXRpb25zIGFyZSBzdXBlciBleHBlbnNpdmUgb24gYm90aCB4ODYgYW5kIEFSTS4gTGV0J3MgdHJ5 IHRvCisgICAgICAgICAgICAgICAgLy8gbWF0ZXJpYWxpemUgdGhpcyBiYWQgYm95IHVzaW5nIG1h dGggaW5zdGVhZC4gTm90ZSB0aGF0IHdlIHVzZSB1bnNpZ25lZCBtYXRoIGhlcmUKKyAgICAgICAg ICAgICAgICAvLyBzaW5jZSBpdCdzIG1vcmUgZGV0ZXJtaW5pc3RpYy4KKyAgICAgICAgICAgICAg ICB1aW50NjRfdCBteVZhbHVlID0gaW5zdC5hcmdzWzBdLnZhbHVlKCk7CisgICAgICAgICAgICAg ICAgUmVnIG15RGVzdCA9IGluc3QuYXJnc1sxXS5yZWcoKTsKKyAgICAgICAgICAgICAgICBmb3Ig KGNvbnN0IFJlZ0NvbnN0JiByZWdDb25zdCA6IG1fc3RhdGUucmVnQ29uc3QpIHsKKyAgICAgICAg ICAgICAgICAgICAgdWludDY0X3Qgb3RoZXJWYWx1ZSA9IHJlZ0NvbnN0LmNvbnN0YW50OworICAg ICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgLy8gTGV0J3MgdHJ5IGFkZC4g VGhhdCdzIHRoZSBvbmx5IHRoaW5nIHRoYXQgd29ya3Mgb24gYWxsIHBsYXRmb3Jtcywgc2luY2Ug aXQncworICAgICAgICAgICAgICAgICAgICAvLyB0aGUgb25seSBjaGVhcCBhcml0aG1ldGljIG9w IHRoYXQgeDg2IGRvZXMgaW4gdGhyZWUgb3BlcmFuZHMuIExvbmcgdGVybSwgd2UKKyAgICAgICAg ICAgICAgICAgICAgLy8gc2hvdWxkIGFkZCBmYW5jaWVyIG1hdGVyaWFsaXphdGlvbnMgaGVyZSBm b3IgQVJNIGlmIHRoZSBCaWdJbW0gaXMgeXVnZS4KKyAgICAgICAgICAgICAgICAgICAgdWludDY0 X3QgZGVsdGEgPSBteVZhbHVlIC0gb3RoZXJWYWx1ZTsKKyAgICAgICAgICAgICAgICAgICAgCisg ICAgICAgICAgICAgICAgICAgIGlmIChBcmc6OmlzVmFsaWRJbW1Gb3JtKGRlbHRhKSkgeworICAg ICAgICAgICAgICAgICAgICAgICAgaW5zdC5vcGNvZGUgPSBBZGQ2NDsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGluc3QuYXJncy5yZXNpemUoMyk7CisgICAgICAgICAgICAgICAgICAgICAgICBp bnN0LmFyZ3NbMF0gPSBBcmc6OmltbShkZWx0YSk7CisgICAgICAgICAgICAgICAgICAgICAgICBp bnN0LmFyZ3NbMV0gPSBUbXAocmVnQ29uc3QucmVnKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGluc3QuYXJnc1syXSA9IFRtcChteURlc3QpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CisgICAgICAgICAgICAKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CiAKICAgICAgICAgLy8gQ3JlYXRlIGEgY29weSBpbiBjYXNlIHdlIGludmFsaWRh dGUgdGhlIGluc3RydWN0aW9uLiBUaGF0IGRvZXNuJ3QgaGFwcGVuIG9mdGVuLgogICAgICAgICBJ bnN0IGluc3RDb3B5ID0gaW5zdDsK 291216 2016-10-10 20:00:25 -0700 2016-10-10 20:15:25 -0700 the patch blah.patch text/plain 3190 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MDM4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDE2LTEwLTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QWlyIHNob3VsZCBiZSBhYmxlIHRvIHJlcGxhY2UgY29uc3RhbnQgbWF0ZXJpYWxpemF0aW9ucyB3 aXRoIGFkZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2Mjc0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgV2UgaGF2ZSBhIGxvdCBvZiBkZWZlbnNlcyBhZ2FpbnN0IGVtaXR0aW5nIGNvZGUg dGhhdCBtYXRlcmlhbGl6ZXMgaHVnZSBjb250YW50cy4gQnV0IGlmIHdlIGRvCisgICAgICAgIGVu ZCB1cCB3aXRoIHN1Y2ggY29kZSBpbiB0aGUgYmFja2VuZCwgaXQncyBiZXR0ZXIgdG8gY29udmVy dCB0aG9zZSBtYXRlcmlhbGl6YXRpb25zIGludG8gYWRkCisgICAgICAgIGluc3RydWN0aW9ucyBi eSBjaGVja2luZyBpZiBvdGhlciByZWdpc3RlcnMgYXJlIGtub3duIHRvIGNvbnRhaW4gbmVhcmJ5 IGNvbnN0YW50cy4gVGhhdCdzCisgICAgICAgIHdoYXQgdGhpcyBwYXRjaCBkb2VzLgorCisgICAg ICAgICogYjMvYWlyL0FpckZpeE9idmlvdXNTcGlsbHMuY3BwOgorCiAyMDE2LTEwLTEwICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBDaGFuZ2UgQXJyYXlQcm90b3R5 cGUuY3BwJ3MgcHV0TGVuZ3RoKCkgYW5kIHNldExlbmd0aCgpIHRvIHRha2UgYSBWTSYgc28gdGhh dCB3ZSBjYW4gdXNlIHZtLnByb3BlcnR5TmFtZXMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYjMvYWlyL0FpckZpeE9idmlvdXNTcGlsbHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyRml4T2J2aW91c1NwaWxscy5jcHAJKHJldmlzaW9uIDIw NzAzNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyRml4T2J2aW91c1NwaWxs cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5MSw2ICsxOTEsNDIgQEAgcHJpdmF0ZToKIAogICAg ICAgICBpZiAodmVyYm9zZSkKICAgICAgICAgICAgIGRhdGFMb2coIkZpeGluZyBpbnN0ICIsIGlu c3QsICI6ICIsIG1fc3RhdGUsICJcbiIpOworICAgICAgICAKKyAgICAgICAgLy8gRmlyc3QgaGFu ZGxlIHNvbWUgc3BlY2lhbCBpbnN0cnVjdGlvbnMuCisgICAgICAgIHN3aXRjaCAoaW5zdC5raW5k Lm9wY29kZSkgeworICAgICAgICBjYXNlIE1vdmU6IHsKKyAgICAgICAgICAgIGlmIChpbnN0LmFy Z3NbMF0uaXNCaWdJbW0oKSAmJiBpbnN0LmFyZ3NbMV0uaXNSZWcoKQorICAgICAgICAgICAgICAg ICYmIGlzVmFsaWRGb3JtKEFkZDY0LCBBcmc6OkltbSwgQXJnOjpUbXAsIEFyZzo6VG1wKSkgewor ICAgICAgICAgICAgICAgIC8vIEJpZ0ltbSBtYXRlcmlhbGl6YXRpb25zIGFyZSBzdXBlciBleHBl bnNpdmUgb24gYm90aCB4ODYgYW5kIEFSTS4gTGV0J3MgdHJ5IHRvCisgICAgICAgICAgICAgICAg Ly8gbWF0ZXJpYWxpemUgdGhpcyBiYWQgYm95IHVzaW5nIG1hdGggaW5zdGVhZC4gTm90ZSB0aGF0 IHdlIHVzZSB1bnNpZ25lZCBtYXRoIGhlcmUKKyAgICAgICAgICAgICAgICAvLyBzaW5jZSBpdCdz IG1vcmUgZGV0ZXJtaW5pc3RpYy4KKyAgICAgICAgICAgICAgICB1aW50NjRfdCBteVZhbHVlID0g aW5zdC5hcmdzWzBdLnZhbHVlKCk7CisgICAgICAgICAgICAgICAgUmVnIG15RGVzdCA9IGluc3Qu YXJnc1sxXS5yZWcoKTsKKyAgICAgICAgICAgICAgICBmb3IgKGNvbnN0IFJlZ0NvbnN0JiByZWdD b25zdCA6IG1fc3RhdGUucmVnQ29uc3QpIHsKKyAgICAgICAgICAgICAgICAgICAgdWludDY0X3Qg b3RoZXJWYWx1ZSA9IHJlZ0NvbnN0LmNvbnN0YW50OworICAgICAgICAgICAgICAgICAgICAKKyAg ICAgICAgICAgICAgICAgICAgLy8gTGV0J3MgdHJ5IGFkZC4gVGhhdCdzIHRoZSBvbmx5IHRoaW5n IHRoYXQgd29ya3Mgb24gYWxsIHBsYXRmb3Jtcywgc2luY2UgaXQncworICAgICAgICAgICAgICAg ICAgICAvLyB0aGUgb25seSBjaGVhcCBhcml0aG1ldGljIG9wIHRoYXQgeDg2IGRvZXMgaW4gdGhy ZWUgb3BlcmFuZHMuIExvbmcgdGVybSwgd2UKKyAgICAgICAgICAgICAgICAgICAgLy8gc2hvdWxk IGFkZCBmYW5jaWVyIG1hdGVyaWFsaXphdGlvbnMgaGVyZSBmb3IgQVJNIGlmIHRoZSBCaWdJbW0g aXMgeXVnZS4KKyAgICAgICAgICAgICAgICAgICAgdWludDY0X3QgZGVsdGEgPSBteVZhbHVlIC0g b3RoZXJWYWx1ZTsKKyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgICAgIGlm IChBcmc6OmlzVmFsaWRJbW1Gb3JtKGRlbHRhKSkgeworICAgICAgICAgICAgICAgICAgICAgICAg aW5zdC5raW5kID0gQWRkNjQ7CisgICAgICAgICAgICAgICAgICAgICAgICBpbnN0LmFyZ3MucmVz aXplKDMpOworICAgICAgICAgICAgICAgICAgICAgICAgaW5zdC5hcmdzWzBdID0gQXJnOjppbW0o ZGVsdGEpOworICAgICAgICAgICAgICAgICAgICAgICAgaW5zdC5hcmdzWzFdID0gVG1wKHJlZ0Nv bnN0LnJlZyk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbnN0LmFyZ3NbMl0gPSBUbXAobXlE ZXN0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICAgICAgCisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogCiAgICAgICAgIC8v IENyZWF0ZSBhIGNvcHkgaW4gY2FzZSB3ZSBpbnZhbGlkYXRlIHRoZSBpbnN0cnVjdGlvbi4gVGhh dCBkb2Vzbid0IGhhcHBlbiBvZnRlbi4KICAgICAgICAgSW5zdCBpbnN0Q29weSA9IGluc3Q7Cg== 291218 2016-10-10 20:15:25 -0700 2016-10-11 13:47:39 -0700 the patch blah.patch text/plain 4613 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MDM4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE2LTEwLTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QWlyIHNob3VsZCBiZSBhYmxlIHRvIHJlcGxhY2UgY29uc3RhbnQgbWF0ZXJpYWxpemF0aW9ucyB3 aXRoIGFkZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2Mjc0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgV2UgaGF2ZSBhIGxvdCBvZiBkZWZlbnNlcyBhZ2FpbnN0IGVtaXR0aW5nIGNvZGUg dGhhdCBtYXRlcmlhbGl6ZXMgaHVnZSBjb250YW50cy4gQnV0IGlmIHdlIGRvCisgICAgICAgIGVu ZCB1cCB3aXRoIHN1Y2ggY29kZSBpbiB0aGUgYmFja2VuZCwgaXQncyBiZXR0ZXIgdG8gY29udmVy dCB0aG9zZSBtYXRlcmlhbGl6YXRpb25zIGludG8gYWRkCisgICAgICAgIGluc3RydWN0aW9ucyBi eSBjaGVja2luZyBpZiBvdGhlciByZWdpc3RlcnMgYXJlIGtub3duIHRvIGNvbnRhaW4gbmVhcmJ5 IGNvbnN0YW50cy4gVGhhdCdzCisgICAgICAgIHdoYXQgdGhpcyBwYXRjaCBkb2VzLgorCisgICAg ICAgICogYjMvYWlyL0FpckZpeE9idmlvdXNTcGlsbHMuY3BwOgorICAgICAgICAqIGIzL3Rlc3Ri My5jcHA6CisKIDIwMTYtMTAtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIENoYW5nZSBBcnJheVByb3RvdHlwZS5jcHAncyBwdXRMZW5ndGgoKSBhbmQgc2V0TGVu Z3RoKCkgdG8gdGFrZSBhIFZNJiBzbyB0aGF0IHdlIGNhbiB1c2Ugdm0ucHJvcGVydHlOYW1lcy4K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy90ZXN0YjMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy90ZXN0YjMuY3BwCShyZXZpc2lvbiAyMDcwMzcpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvdGVzdGIzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTMzODEsNiArMTMzODEsMzAgQEAgdm9pZCB0ZXN0UGluUmVnaXN0ZXJzKCkKICAgICBnbyhmYWxz ZSk7CiB9CiAKK3ZvaWQgdGVzdE9wdGltaXplTWF0ZXJpYWxpemF0aW9uKCkKK3sKKyAgICBQcm9j ZWR1cmUgcHJvYzsKKyAgICBCYXNpY0Jsb2NrKiByb290ID0gcHJvYy5hZGRCbG9jaygpOworICAg IHJvb3QtPmFwcGVuZE5ldzxDQ2FsbFZhbHVlPigKKyAgICAgICAgcHJvYywgVm9pZCwgT3JpZ2lu KCksCisgICAgICAgIHJvb3QtPmFwcGVuZE5ldzxDb25zdFB0clZhbHVlPihwcm9jLCBPcmlnaW4o KSwgMHgxMjM0MjM0NTM0NTZsbHUpLAorICAgICAgICByb290LT5hcHBlbmROZXc8Q29uc3RQdHJW YWx1ZT4ocHJvYywgT3JpZ2luKCksIDB4MTIzNDIzNDUzNDU2bGx1ICsgMzUpKTsKKyAgICByb290 LT5hcHBlbmROZXc8VmFsdWU+KHByb2MsIFJldHVybiwgT3JpZ2luKCkpOworICAgIAorICAgIGF1 dG8gY29kZSA9IGNvbXBpbGUocHJvYyk7CisgICAgYm9vbCBmb3VuZCA9IGZhbHNlOworICAgIGZv ciAoQWlyOjpCYXNpY0Jsb2NrKiBibG9jayA6IHByb2MuY29kZSgpKSB7CisgICAgICAgIGZvciAo QWlyOjpJbnN0JiBpbnN0IDogKmJsb2NrKSB7CisgICAgICAgICAgICBpZiAoaW5zdC5raW5kLm9w Y29kZSAhPSBBaXI6OkFkZDY0KQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgaWYgKGluc3QuYXJnc1swXSAhPSBBaXI6OkFyZzo6aW1tKDM1KSkKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0K KyAgICBDSEVDSyhmb3VuZCk7Cit9CisKIC8vIE1ha2Ugc3VyZSB0aGUgY29tcGlsZXIgZG9lcyBu b3QgdHJ5IHRvIG9wdGltaXplIGFueXRoaW5nIG91dC4KIE5FVkVSX0lOTElORSBkb3VibGUgemVy bygpCiB7CkBAIC0xNDgyOSw2ICsxNDg1Myw3IEBAIHZvaWQgcnVuKGNvbnN0IGNoYXIqIGZpbHRl cikKICAgICBSVU4odGVzdE1vdmVDb25zdGFudHMoKSk7CiAgICAgUlVOKHRlc3RQQ09yaWdpbk1h cERvZXNudEluc2VydE5vcHMoKSk7CiAgICAgUlVOKHRlc3RQaW5SZWdpc3RlcnMoKSk7CisgICAg UlVOKHRlc3RPcHRpbWl6ZU1hdGVyaWFsaXphdGlvbigpKTsKICAgICAKICAgICBpZiAodGFza3Mu aXNFbXB0eSgpKQogICAgICAgICB1c2FnZSgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2IzL2Fpci9BaXJGaXhPYnZpb3VzU3BpbGxzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYjMvYWlyL0FpckZpeE9idmlvdXNTcGlsbHMuY3BwCShyZXZpc2lvbiAyMDcw MzcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0FpckZpeE9idmlvdXNTcGlsbHMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTEsNiArMTkxLDQyIEBAIHByaXZhdGU6CiAKICAgICAg ICAgaWYgKHZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9nKCJGaXhpbmcgaW5zdCAiLCBpbnN0 LCAiOiAiLCBtX3N0YXRlLCAiXG4iKTsKKyAgICAgICAgCisgICAgICAgIC8vIEZpcnN0IGhhbmRs ZSBzb21lIHNwZWNpYWwgaW5zdHJ1Y3Rpb25zLgorICAgICAgICBzd2l0Y2ggKGluc3Qua2luZC5v cGNvZGUpIHsKKyAgICAgICAgY2FzZSBNb3ZlOiB7CisgICAgICAgICAgICBpZiAoaW5zdC5hcmdz WzBdLmlzQmlnSW1tKCkgJiYgaW5zdC5hcmdzWzFdLmlzUmVnKCkKKyAgICAgICAgICAgICAgICAm JiBpc1ZhbGlkRm9ybShBZGQ2NCwgQXJnOjpJbW0sIEFyZzo6VG1wLCBBcmc6OlRtcCkpIHsKKyAg ICAgICAgICAgICAgICAvLyBCaWdJbW0gbWF0ZXJpYWxpemF0aW9ucyBhcmUgc3VwZXIgZXhwZW5z aXZlIG9uIGJvdGggeDg2IGFuZCBBUk0uIExldCdzIHRyeSB0bworICAgICAgICAgICAgICAgIC8v IG1hdGVyaWFsaXplIHRoaXMgYmFkIGJveSB1c2luZyBtYXRoIGluc3RlYWQuIE5vdGUgdGhhdCB3 ZSB1c2UgdW5zaWduZWQgbWF0aCBoZXJlCisgICAgICAgICAgICAgICAgLy8gc2luY2UgaXQncyBt b3JlIGRldGVybWluaXN0aWMuCisgICAgICAgICAgICAgICAgdWludDY0X3QgbXlWYWx1ZSA9IGlu c3QuYXJnc1swXS52YWx1ZSgpOworICAgICAgICAgICAgICAgIFJlZyBteURlc3QgPSBpbnN0LmFy Z3NbMV0ucmVnKCk7CisgICAgICAgICAgICAgICAgZm9yIChjb25zdCBSZWdDb25zdCYgcmVnQ29u c3QgOiBtX3N0YXRlLnJlZ0NvbnN0KSB7CisgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IG90 aGVyVmFsdWUgPSByZWdDb25zdC5jb25zdGFudDsKKyAgICAgICAgICAgICAgICAgICAgCisgICAg ICAgICAgICAgICAgICAgIC8vIExldCdzIHRyeSBhZGQuIFRoYXQncyB0aGUgb25seSB0aGluZyB0 aGF0IHdvcmtzIG9uIGFsbCBwbGF0Zm9ybXMsIHNpbmNlIGl0J3MKKyAgICAgICAgICAgICAgICAg ICAgLy8gdGhlIG9ubHkgY2hlYXAgYXJpdGhtZXRpYyBvcCB0aGF0IHg4NiBkb2VzIGluIHRocmVl IG9wZXJhbmRzLiBMb25nIHRlcm0sIHdlCisgICAgICAgICAgICAgICAgICAgIC8vIHNob3VsZCBh ZGQgZmFuY2llciBtYXRlcmlhbGl6YXRpb25zIGhlcmUgZm9yIEFSTSBpZiB0aGUgQmlnSW1tIGlz IHl1Z2UuCisgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IGRlbHRhID0gbXlWYWx1ZSAtIG90 aGVyVmFsdWU7CisgICAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgICAgICBpZiAo QXJnOjppc1ZhbGlkSW1tRm9ybShkZWx0YSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlu c3Qua2luZCA9IEFkZDY0OworICAgICAgICAgICAgICAgICAgICAgICAgaW5zdC5hcmdzLnJlc2l6 ZSgzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGluc3QuYXJnc1swXSA9IEFyZzo6aW1tKGRl bHRhKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGluc3QuYXJnc1sxXSA9IFRtcChyZWdDb25z dC5yZWcpOworICAgICAgICAgICAgICAgICAgICAgICAgaW5zdC5hcmdzWzJdID0gVG1wKG15RGVz dCk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAg ICBkZWZhdWx0OgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KIAogICAgICAgICAvLyBD cmVhdGUgYSBjb3B5IGluIGNhc2Ugd2UgaW52YWxpZGF0ZSB0aGUgaW5zdHJ1Y3Rpb24uIFRoYXQg ZG9lc24ndCBoYXBwZW4gb2Z0ZW4uCiAgICAgICAgIEluc3QgaW5zdENvcHkgPSBpbnN0Owo=