57322 2011-03-29 03:02:18 -0700 Add the NEXT_OPCODE() macro to the DFG-JIT parser 2011-03-30 00:56:43 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 zherczeg webkit-unassigned barraclough commit-queue oldest_to_newest 375145 0 zherczeg 2011-03-29 03:02:18 -0700 In JavaScriptCore we use macros to jump to the next opcode (both in interpreter and JIT). This macro is added to the DFG-JIT parser as well. 375151 1 87290 zherczeg 2011-03-29 03:08:55 -0700 Created attachment 87290 patch 376053 2 87290 mjs 2011-03-29 23:16:33 -0700 Comment on attachment 87290 patch r=me 376113 3 87290 commit-queue 2011-03-30 00:50:51 -0700 Comment on attachment 87290 patch Clearing flags on attachment: 87290 Committed r82406: <http://trac.webkit.org/changeset/82406> 376114 4 commit-queue 2011-03-30 00:50:56 -0700 All reviewed patches have been landed. Closing bug. 376120 5 commit-queue 2011-03-30 00:56:43 -0700 The commit-queue encountered the following flaky tests while processing attachment 87290: transitions/transition-end-event-transform.html bug 37145 (authors: dino@apple.com, ojan@chromium.org, and pol@apple.com) The commit-queue is continuing to process your patch. 87290 2011-03-29 03:08:55 -0700 2011-03-30 00:50:51 -0700 patch 0001-nextopcode.patch text/plain 10503 zherczeg RnJvbSAwOTRjNGNiNWI0ZGIyZjE5YzJlNDYzNDU5MzAxZGU4MmFiZjM0ZTY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAaW5mLnUtc3plZ2Vk Lmh1PgpEYXRlOiBUdWUsIDI5IE1hciAyMDExIDEyOjA3OjE5ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gbmV4dG9wY29kZQoKLS0tCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICB8ICAgMTQgKysrKwogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRl Q29kZVBhcnNlci5jcHAgfCAgIDc2ICsrKysrKysrLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKaW5kZXggODU0YzRjMS4uN2UxOTEzNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjkgIFpvbHRhbiBIZXJjemVnICA8emhlcmN6ZWdAaW5m LnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCB0aGUgTkVYVF9PUENPREUoKSBtYWNybyB0byB0aGUgREZHLUpJVCBwYXJzZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzIyCisK KyAgICAgICAgSW4gSmF2YVNjcmlwdENvcmUgd2UgdXNlIG1hY3JvcyB0byBqdW1wIHRvIHRoZSBu ZXh0IG9wY29kZQorICAgICAgICAoYm90aCBpbiBpbnRlcnByZXRlciBhbmQgSklUKS4gVGhpcyBt YWNybyBpcyBhZGRlZCB0byB0aGUKKyAgICAgICAgREZHLUpJVCBwYXJzZXIgYXMgd2VsbC4KKwor ICAgICAgICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlKToKKwogMjAxMS0wMy0yNyAgQmVuIFRheWxvciAgPGJlbnRh eWxvci5zb2x4ODZAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9z a3VyeWFrb3YuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVD b2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJz ZXIuY3BwCmluZGV4IDZhZjFkNzQuLjAzZjVkNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCkBAIC00MjAsNiArNDIwLDEwIEBAIHByaXZh dGU6CiAgICAgVW5hcnlPcE1hcCBtX251bWJlclRvSW50MzJOb2RlczsKIH07CiAKKyNkZWZpbmUg TkVYVF9PUENPREUobmFtZSkgXAorICAgIG1fY3VycmVudEluZGV4ICs9IE9QQ09ERV9MRU5HVEgo bmFtZSk7IFwKKyAgICBjb250aW51ZTsKKwogYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2UoKQog ewogICAgIEFsaWFzVHJhY2tlciBhbGlhc2VzKG1fZ3JhcGgpOwpAQCAtNDM2LDE0ICs0NDAsMTIg QEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2UoKQogICAgICAgICBjYXNlIG9wX2VudGVyOgog ICAgICAgICAgICAgLy8gVGhpcyBpcyBhIG5vLW9wIGZvciBub3cgLSBtYXkgbmVlZCB0byBpbml0 aWFsaXplIGxvY2FscywgaWYKICAgICAgICAgICAgIC8vIERDRSBhbmFseXNpcyBjYW5ub3QgZGV0 ZXJtaW5lIHRoYXQgdGhlIHZhbHVlcyBhcmUgbmV2ZXIgcmVhZC4KLSAgICAgICAgICAgIG1fY3Vy cmVudEluZGV4ICs9IE9QQ09ERV9MRU5HVEgob3BfZW50ZXIpOwotICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICBORVhUX09QQ09ERShvcF9lbnRlcik7CiAKICAgICAgICAgY2FzZSBv cF9jb252ZXJ0X3RoaXM6IHsKICAgICAgICAgICAgIE5vZGVJbmRleCBvcDEgPSBnZXRUaGlzKCk7 CiAgICAgICAgICAgICBzZXRUaGlzKGFkZFRvR3JhcGgoQ29udmVydFRoaXMsIG9wMSkpOwotICAg ICAgICAgICAgbV9jdXJyZW50SW5kZXggKz0gT1BDT0RFX0xFTkdUSChvcF9jb252ZXJ0X3RoaXMp OwotICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBORVhUX09QQ09ERShvcF9jb252 ZXJ0X3RoaXMpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gPT09IEJpdHdpc2Ugb3BlcmF0aW9u cyA9PT0KQEAgLTQ1MiwyNCArNDU0LDIxIEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlKCkK ICAgICAgICAgICAgIE5vZGVJbmRleCBvcDEgPSBnZXRUb0ludDMyKGN1cnJlbnRJbnN0cnVjdGlv blsyXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgTm9kZUluZGV4IG9wMiA9IGdldFRvSW50MzIo Y3VycmVudEluc3RydWN0aW9uWzNdLnUub3BlcmFuZCk7CiAgICAgICAgICAgICBzZXQoY3VycmVu dEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCwgYWRkVG9HcmFwaChCaXRBbmQsIG9wMSwgb3AyKSk7 Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX2JpdGFuZCk7 Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX2JpdGFu ZCk7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIG9wX2JpdG9yOiB7CiAgICAgICAgICAgICBO b2RlSW5kZXggb3AxID0gZ2V0VG9JbnQzMihjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5k KTsKICAgICAgICAgICAgIE5vZGVJbmRleCBvcDIgPSBnZXRUb0ludDMyKGN1cnJlbnRJbnN0cnVj dGlvblszXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsx XS51Lm9wZXJhbmQsIGFkZFRvR3JhcGgoQml0T3IsIG9wMSwgb3AyKSk7Ci0gICAgICAgICAgICBt X2N1cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX2JpdG9yKTsKLSAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfYml0b3IpOwogICAgICAgICB9CiAK ICAgICAgICAgY2FzZSBvcF9iaXR4b3I6IHsKICAgICAgICAgICAgIE5vZGVJbmRleCBvcDEgPSBn ZXRUb0ludDMyKGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAg Tm9kZUluZGV4IG9wMiA9IGdldFRvSW50MzIoY3VycmVudEluc3RydWN0aW9uWzNdLnUub3BlcmFu ZCk7CiAgICAgICAgICAgICBzZXQoY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCwgYWRk VG9HcmFwaChCaXRYb3IsIG9wMSwgb3AyKSk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCAr PSBPUENPREVfTEVOR1RIKG9wX2JpdHhvcik7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgIE5FWFRfT1BDT0RFKG9wX2JpdHhvcik7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IG9wX3JzaGlmdDogewpAQCAtNDgyLDggKzQ4MSw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBh cnNlKCkKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICByZXN1bHQgPSBhZGRUb0dy YXBoKEJpdFJTaGlmdCwgb3AxLCBvcDIpOwogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVj dGlvblsxXS51Lm9wZXJhbmQsIHJlc3VsdCk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCAr PSBPUENPREVfTEVOR1RIKG9wX3JzaGlmdCk7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgIE5FWFRfT1BDT0RFKG9wX3JzaGlmdCk7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IG9wX2xzaGlmdDogewpAQCAtNDk2LDggKzQ5NCw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBh cnNlKCkKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICByZXN1bHQgPSBhZGRUb0dy YXBoKEJpdExTaGlmdCwgb3AxLCBvcDIpOwogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVj dGlvblsxXS51Lm9wZXJhbmQsIHJlc3VsdCk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCAr PSBPUENPREVfTEVOR1RIKG9wX2xzaGlmdCk7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgIE5FWFRfT1BDT0RFKG9wX2xzaGlmdCk7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IG9wX3Vyc2hpZnQ6IHsKQEAgLTUyNCw4ICs1MjEsNyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpw YXJzZSgpCiAgICAgICAgICAgICAgICAgcmVzdWx0ID0gYWRkVG9HcmFwaChVSW50MzJUb051bWJl ciwgcmVzdWx0KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1 Y3Rpb25bMV0udS5vcGVyYW5kLCByZXN1bHQpOwotICAgICAgICAgICAgbV9jdXJyZW50SW5kZXgg Kz0gT1BDT0RFX0xFTkdUSChvcF91cnNoaWZ0KTsKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAgTkVYVF9PUENPREUob3BfdXJzaGlmdCk7CiAgICAgICAgIH0KIAogICAgICAgICAv LyA9PT0gSW5jcmVtZW50L0RlY3JlbWVudCBvcGNvZGVzID09PQpAQCAtNTM0LDggKzUzMCw3IEBA IGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlKCkKICAgICAgICAgICAgIHVuc2lnbmVkIHNyY0Rz dCA9IGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBOb2RlSW5k ZXggb3AgPSBnZXRUb051bWJlcihzcmNEc3QpOwogICAgICAgICAgICAgc2V0KHNyY0RzdCwgYWRk VG9HcmFwaChBcml0aEFkZCwgb3AsIG9uZSgpKSk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRl eCArPSBPUENPREVfTEVOR1RIKG9wX3ByZV9pbmMpOwotICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICBORVhUX09QQ09ERShvcF9wcmVfaW5jKTsKICAgICAgICAgfQogCiAgICAgICAg IGNhc2Ugb3BfcG9zdF9pbmM6IHsKQEAgLTU0NCwxNiArNTM5LDE0IEBAIGJvb2wgQnl0ZUNvZGVQ YXJzZXI6OnBhcnNlKCkKICAgICAgICAgICAgIE5vZGVJbmRleCBvcCA9IGdldFRvTnVtYmVyKHNy Y0RzdCk7CiAgICAgICAgICAgICBzZXQocmVzdWx0LCBvcCk7CiAgICAgICAgICAgICBzZXQoc3Jj RHN0LCBhZGRUb0dyYXBoKEFyaXRoQWRkLCBvcCwgb25lKCkpKTsKLSAgICAgICAgICAgIG1fY3Vy cmVudEluZGV4ICs9IE9QQ09ERV9MRU5HVEgob3BfcG9zdF9pbmMpOwotICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICBORVhUX09QQ09ERShvcF9wb3N0X2luYyk7CiAgICAgICAgIH0K IAogICAgICAgICBjYXNlIG9wX3ByZV9kZWM6IHsKICAgICAgICAgICAgIHVuc2lnbmVkIHNyY0Rz dCA9IGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBOb2RlSW5k ZXggb3AgPSBnZXRUb051bWJlcihzcmNEc3QpOwogICAgICAgICAgICAgc2V0KHNyY0RzdCwgYWRk VG9HcmFwaChBcml0aFN1Yiwgb3AsIG9uZSgpKSk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRl eCArPSBPUENPREVfTEVOR1RIKG9wX3ByZV9kZWMpOwotICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICBORVhUX09QQ09ERShvcF9wcmVfZGVjKTsKICAgICAgICAgfQogCiAgICAgICAg IGNhc2Ugb3BfcG9zdF9kZWM6IHsKQEAgLTU2Miw4ICs1NTUsNyBAQCBib29sIEJ5dGVDb2RlUGFy c2VyOjpwYXJzZSgpCiAgICAgICAgICAgICBOb2RlSW5kZXggb3AgPSBnZXRUb051bWJlcihzcmNE c3QpOwogICAgICAgICAgICAgc2V0KHJlc3VsdCwgb3ApOwogICAgICAgICAgICAgc2V0KHNyY0Rz dCwgYWRkVG9HcmFwaChBcml0aFN1Yiwgb3AsIG9uZSgpKSk7Ci0gICAgICAgICAgICBtX2N1cnJl bnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX3Bvc3RfZGVjKTsKLSAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfcG9zdF9kZWMpOwogICAgICAgICB9CiAK ICAgICAgICAgLy8gPT09IEFyaXRobWV0aWMgb3BlcmF0aW9ucyA9PT0KQEAgLTU3OCw4ICs1NzAs NyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZSgpCiAgICAgICAgICAgICAgICAgc2V0KGN1 cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGFkZFRvR3JhcGgoQXJpdGhBZGQsIHRvTnVt YmVyKG9wMSksIHRvTnVtYmVyKG9wMikpKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBzZXQoY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCwgYWRkVG9HcmFwaChWYWx1 ZUFkZCwgb3AxLCBvcDIpKTsKLSAgICAgICAgICAgIG1fY3VycmVudEluZGV4ICs9IE9QQ09ERV9M RU5HVEgob3BfYWRkKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgTkVYVF9P UENPREUob3BfYWRkKTsKICAgICAgICAgfQogCiAgICAgICAgIGNhc2Ugb3Bfc3ViOiB7CkBAIC01 ODcsOCArNTc4LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2UoKQogICAgICAgICAgICAg Tm9kZUluZGV4IG9wMSA9IGdldFRvTnVtYmVyKGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJh bmQpOwogICAgICAgICAgICAgTm9kZUluZGV4IG9wMiA9IGdldFRvTnVtYmVyKGN1cnJlbnRJbnN0 cnVjdGlvblszXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlv blsxXS51Lm9wZXJhbmQsIGFkZFRvR3JhcGgoQXJpdGhTdWIsIG9wMSwgb3AyKSk7Ci0gICAgICAg ICAgICBtX2N1cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX3N1Yik7Ci0gICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3N1Yik7CiAgICAgICAgIH0K IAogICAgICAgICBjYXNlIG9wX211bDogewpAQCAtNTk2LDggKzU4Niw3IEBAIGJvb2wgQnl0ZUNv ZGVQYXJzZXI6OnBhcnNlKCkKICAgICAgICAgICAgIE5vZGVJbmRleCBvcDEgPSBnZXRUb051bWJl cihjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAgIE5vZGVJbmRl eCBvcDIgPSBnZXRUb051bWJlcihjdXJyZW50SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kKTsKICAg ICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCBhZGRUb0dyYXBo KEFyaXRoTXVsLCBvcDEsIG9wMikpOwotICAgICAgICAgICAgbV9jdXJyZW50SW5kZXggKz0gT1BD T0RFX0xFTkdUSChvcF9tdWwpOwotICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBO RVhUX09QQ09ERShvcF9tdWwpOwogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBvcF9tb2Q6IHsK QEAgLTYwNSw4ICs1OTQsNyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZSgpCiAgICAgICAg ICAgICBOb2RlSW5kZXggb3AxID0gZ2V0VG9OdW1iZXIoY3VycmVudEluc3RydWN0aW9uWzJdLnUu b3BlcmFuZCk7CiAgICAgICAgICAgICBOb2RlSW5kZXggb3AyID0gZ2V0VG9OdW1iZXIoY3VycmVu dEluc3RydWN0aW9uWzNdLnUub3BlcmFuZCk7CiAgICAgICAgICAgICBzZXQoY3VycmVudEluc3Ry dWN0aW9uWzFdLnUub3BlcmFuZCwgYWRkVG9HcmFwaChBcml0aE1vZCwgb3AxLCBvcDIpKTsKLSAg ICAgICAgICAgIG1fY3VycmVudEluZGV4ICs9IE9QQ09ERV9MRU5HVEgob3BfbW9kKTsKLSAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfbW9kKTsKICAgICAg ICAgfQogCiAgICAgICAgIGNhc2Ugb3BfZGl2OiB7CkBAIC02MTQsOCArNjAyLDcgQEAgYm9vbCBC eXRlQ29kZVBhcnNlcjo6cGFyc2UoKQogICAgICAgICAgICAgTm9kZUluZGV4IG9wMSA9IGdldFRv TnVtYmVyKGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgTm9k ZUluZGV4IG9wMiA9IGdldFRvTnVtYmVyKGN1cnJlbnRJbnN0cnVjdGlvblszXS51Lm9wZXJhbmQp OwogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGFkZFRv R3JhcGgoQXJpdGhEaXYsIG9wMSwgb3AyKSk7Ci0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCAr PSBPUENPREVfTEVOR1RIKG9wX2Rpdik7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgIE5FWFRfT1BDT0RFKG9wX2Rpdik7CiAgICAgICAgIH0KIAogICAgICAgICAvLyA9PT0gTWlz YyBvcGVyYXRpb25zID09PQpAQCAtNjIzLDggKzYxMCw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6 OnBhcnNlKCkKICAgICAgICAgY2FzZSBvcF9tb3Y6IHsKICAgICAgICAgICAgIE5vZGVJbmRleCBv cCA9IGdldChjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAgIHNl dChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCBvcCk7Ci0gICAgICAgICAgICBtX2N1 cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX21vdik7Ci0gICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX21vdik7CiAgICAgICAgIH0KIAogICAgICAg ICAvLyA9PT0gUHJvcGVydHkgYWNjZXNzIG9wZXJhdGlvbnMgPT09CkBAIC02MzcsOCArNjIzLDcg QEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2UoKQogICAgICAgICAgICAgc2V0KGN1cnJlbnRJ bnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGdldEJ5VmFsKTsKICAgICAgICAgICAgIGFsaWFzZXMu cmVjb3JkR2V0QnlWYWwoZ2V0QnlWYWwpOwogCi0gICAgICAgICAgICBtX2N1cnJlbnRJbmRleCAr PSBPUENPREVfTEVOR1RIKG9wX2dldF9ieV92YWwpOwotICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICBORVhUX09QQ09ERShvcF9nZXRfYnlfdmFsKTsKICAgICAgICAgfTsKIAogICAg ICAgICBjYXNlIG9wX3B1dF9ieV92YWw6IHsKQEAgLTY1MCw4ICs2MzUsNyBAQCBib29sIEJ5dGVD b2RlUGFyc2VyOjpwYXJzZSgpCiAgICAgICAgICAgICBOb2RlSW5kZXggcHV0QnlWYWwgPSBhZGRU b0dyYXBoKGFsaWFzZWRHZXQgIT0gTm9Ob2RlID8gUHV0QnlWYWxBbGlhcyA6IFB1dEJ5VmFsLCBi YXNlLCBwcm9wZXJ0eSwgdmFsdWUpOwogICAgICAgICAgICAgYWxpYXNlcy5yZWNvcmRQdXRCeVZh bChwdXRCeVZhbCk7CiAKLSAgICAgICAgICAgIG1fY3VycmVudEluZGV4ICs9IE9QQ09ERV9MRU5H VEgob3BfcHV0X2J5X3ZhbCk7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIE5F WFRfT1BDT0RFKG9wX3B1dF9ieV92YWwpOwogICAgICAgICB9OwogCiAgICAgICAgIGNhc2Ugb3Bf Z2V0X2J5X2lkOiB7CkBAIC02NjIsOCArNjQ2LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFy c2UoKQogICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGdl dEJ5SWQpOwogICAgICAgICAgICAgYWxpYXNlcy5yZWNvcmRHZXRCeUlkKGdldEJ5SWQpOwogCi0g ICAgICAgICAgICBtX2N1cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX2dldF9ieV9pZCk7 Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX2dldF9i eV9pZCk7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIG9wX3B1dF9ieV9pZDogewpAQCAtNjgw LDIyICs2NjMsMTkgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2UoKQogICAgICAgICAgICAg ICAgIGFsaWFzZXMucmVjb3JkUHV0QnlJZChwdXRCeUlkKTsKICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgbV9jdXJyZW50SW5kZXggKz0gT1BDT0RFX0xFTkdUSChvcF9wdXRfYnlfaWQpOwot ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBORVhUX09QQ09ERShvcF9wdXRfYnlf aWQpOwogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBvcF9nZXRfZ2xvYmFsX3ZhcjogewogICAg ICAgICAgICAgTm9kZUluZGV4IGdldEdsb2JhbFZhciA9IGFkZFRvR3JhcGgoR2V0R2xvYmFsVmFy LCBPcEluZm8oY3VycmVudEluc3RydWN0aW9uWzJdLnUub3BlcmFuZCkpOwogICAgICAgICAgICAg c2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGdldEdsb2JhbFZhcik7Ci0gICAg ICAgICAgICBtX2N1cnJlbnRJbmRleCArPSBPUENPREVfTEVOR1RIKG9wX2dldF9nbG9iYWxfdmFy KTsKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfZ2V0 X2dsb2JhbF92YXIpOwogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBvcF9wdXRfZ2xvYmFsX3Zh cjogewogICAgICAgICAgICAgTm9kZUluZGV4IHZhbHVlID0gZ2V0KGN1cnJlbnRJbnN0cnVjdGlv blsyXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgYWRkVG9HcmFwaChQdXRHbG9iYWxWYXIsIE9w SW5mbyhjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kKSwgdmFsdWUpOwotICAgICAgICAg ICAgbV9jdXJyZW50SW5kZXggKz0gT1BDT0RFX0xFTkdUSChvcF9wdXRfZ2xvYmFsX3Zhcik7Ci0g ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3B1dF9nbG9i YWxfdmFyKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vID09PSBCbG9jayB0ZXJtaW5hdG9ycy4g PT09Ci0tIAoxLjYuNQoK