129554 2014-03-01 13:32:23 -0800 Avoid going through ExecState for VM when we already have it (in some places.) 2014-03-01 14:16:12 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue glenn oldest_to_newest 985963 0 kling 2014-03-01 13:32:23 -0800 Avoid going through ExecState for VM when we already have it (in some places.) 985964 1 225560 kling 2014-03-01 13:32:44 -0800 Created attachment 225560 Patch 985965 2 225560 sam 2014-03-01 13:33:31 -0800 Comment on attachment 225560 Patch Other than the tools change, r=me. 985968 3 225561 kling 2014-03-01 13:36:46 -0800 Created attachment 225561 Lander 985978 4 225561 commit-queue 2014-03-01 14:16:10 -0800 Comment on attachment 225561 Lander Clearing flags on attachment: 225561 Committed r164925: <http://trac.webkit.org/changeset/164925> 985979 5 commit-queue 2014-03-01 14:16:12 -0800 All reviewed patches have been landed. Closing bug. 225560 2014-03-01 13:32:44 -0800 2014-03-01 13:36:46 -0800 Patch bug-129554.diff text/plain 4922 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAwNWJlMWEuLmRmNGViOTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBBdm9pZCBnb2luZyB0aHJvdWdoIEV4ZWNT dGF0ZSBmb3IgVk0gd2hlbiB3ZSBhbHJlYWR5IGhhdmUgaXQgKGluIHNvbWUgcGxhY2VzLikKKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTU1ND4KKworICAgICAgICBUd2VhayBzb21l IHBsYWNlcyB0aGF0IGp1bXAgdGhyb3VnaCB1bm5lY2Vzc2FyeSBob29wcyB0byBnZXQgdGhlIFZN LgorICAgICAgICBUaGVyZSBhcmUgbWFueSBtb3JlIGxpa2UgdGhpcy4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3Bw OgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0QnlJbmRleEJleW9uZFZlY3Rvckxlbmd0aCk6 CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbmRleEJleW9uZFZlY3Rvckxlbmd0 aCk6CisgICAgICAgICogcnVudGltZS9PYmplY3RQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlND OjpvYmplY3RQcm90b0Z1bmNUb1N0cmluZyk6CisKKzIwMTQtMDItMjggIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgorCiAgICAgICAgIEpTT2JqZWN0OjpmaW5kUHJvcGVydHlIYXNo RW50cnkoKSBzaG91bGQgdGFrZSBWTSBpbnN0ZWFkIG9mIEV4ZWNTdGF0ZS4KICAgICAgICAgPGh0 dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUyOT4KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuY3BwCmluZGV4IGIwYTcwNmUuLjFmNDlmMGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKQEAgLTIwMjAsNyArMjAyMCw3IEBAIHZvaWQg SlNPYmplY3Q6OnB1dEJ5SW5kZXhCZXlvbmRWZWN0b3JMZW5ndGgoRXhlY1N0YXRlKiBleGVjLCB1 bnNpZ25lZCBpLCBKU1ZhbHVlCiAgICAgICAgICAgICAgICAgZXhlYywgaSwgdmFsdWUsIHNob3Vs ZFRocm93LCBjcmVhdGVBcnJheVN0b3JhZ2Uodm0sIDAsIDApKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9Ci0gICAgICAgIGlmIChzdHJ1Y3R1cmUoZXhlYy0+dm0oKSktPm5lZWRzU2xv d1B1dEluZGV4aW5nKCkpIHsKKyAgICAgICAgaWYgKHN0cnVjdHVyZSh2bSktPm5lZWRzU2xvd1B1 dEluZGV4aW5nKCkpIHsKICAgICAgICAgICAgIEFycmF5U3RvcmFnZSogc3RvcmFnZSA9IGNyZWF0 ZUFycmF5U3RvcmFnZSh2bSwgaSArIDEsIGdldE5ld1ZlY3Rvckxlbmd0aCgwLCAwLCBpICsgMSkp OwogICAgICAgICAgICAgc3RvcmFnZS0+bV92ZWN0b3JbaV0uc2V0KHZtLCB0aGlzLCB2YWx1ZSk7 CiAgICAgICAgICAgICBzdG9yYWdlLT5tX251bVZhbHVlc0luVmVjdG9yKys7CkBAIC0yMTY4LDcg KzIxNjgsNyBAQCBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbmRleEJleW9uZFZlY3Rvckxlbmd0 aChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIGksIEpTVgogICAgICAgICAgICAgcmV0dXJuIHB1 dERpcmVjdEluZGV4QmV5b25kVmVjdG9yTGVuZ3RoV2l0aEFycmF5U3RvcmFnZSgKICAgICAgICAg ICAgICAgICBleGVjLCBpLCB2YWx1ZSwgYXR0cmlidXRlcywgbW9kZSwgY3JlYXRlQXJyYXlTdG9y YWdlKHZtLCAwLCAwKSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKHN0cnVjdHVyZShleGVjLT52 bSgpKS0+bmVlZHNTbG93UHV0SW5kZXhpbmcoKSkgeworICAgICAgICBpZiAoc3RydWN0dXJlKHZt KS0+bmVlZHNTbG93UHV0SW5kZXhpbmcoKSkgewogICAgICAgICAgICAgQXJyYXlTdG9yYWdlKiBz dG9yYWdlID0gY3JlYXRlQXJyYXlTdG9yYWdlKHZtLCBpICsgMSwgZ2V0TmV3VmVjdG9yTGVuZ3Ro KDAsIDAsIGkgKyAxKSk7CiAgICAgICAgICAgICBzdG9yYWdlLT5tX3ZlY3RvcltpXS5zZXQodm0s IHRoaXMsIHZhbHVlKTsKICAgICAgICAgICAgIHN0b3JhZ2UtPm1fbnVtVmFsdWVzSW5WZWN0b3Ir KzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdFByb3Rv dHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PYmplY3RQcm90b3R5cGUu Y3BwCmluZGV4IDVkZjUyNmQuLjJjYWU5ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL09iamVjdFByb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvT2JqZWN0UHJvdG90eXBlLmNwcApAQCAtMjA5LDE5ICsyMDksMjAgQEAgRW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBvYmplY3RQcm90b0Z1bmNUb0xvY2FsZVN0cmluZyhF eGVjU3RhdGUqIGV4ZWMpCiAKIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgb2JqZWN0UHJv dG9GdW5jVG9TdHJpbmcoRXhlY1N0YXRlKiBleGVjKQogeworICAgIFZNJiB2bSA9IGV4ZWMtPnZt KCk7CiAgICAgSlNWYWx1ZSB0aGlzVmFsdWUgPSBleGVjLT5ob3N0VGhpc1ZhbHVlKCkudG9UaGlz KGV4ZWMsIFN0cmljdE1vZGUpOwogICAgIGlmICh0aGlzVmFsdWUuaXNVbmRlZmluZWRPck51bGwo KSkKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc05vbnRyaXZpYWxTdHJpbmcoZXhl YywgU3RyaW5nKHRoaXNWYWx1ZS5pc1VuZGVmaW5lZCgpID8gQVNDSUlMaXRlcmFsKCJbb2JqZWN0 IFVuZGVmaW5lZF0iKSA6IEFTQ0lJTGl0ZXJhbCgiW29iamVjdCBOdWxsXSIpKSkpOworICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTm9udHJpdmlhbFN0cmluZygmdm0sIFN0cmluZyh0 aGlzVmFsdWUuaXNVbmRlZmluZWQoKSA/IEFTQ0lJTGl0ZXJhbCgiW29iamVjdCBVbmRlZmluZWRd IikgOiBBU0NJSUxpdGVyYWwoIltvYmplY3QgTnVsbF0iKSkpKTsKICAgICBKU09iamVjdCogdGhp c09iamVjdCA9IHRoaXNWYWx1ZS50b09iamVjdChleGVjKTsKIAotICAgIEpTU3RyaW5nKiByZXN1 bHQgPSB0aGlzT2JqZWN0LT5zdHJ1Y3R1cmUoZXhlYy0+dm0oKSktPm9iamVjdFRvU3RyaW5nVmFs dWUoKTsKKyAgICBKU1N0cmluZyogcmVzdWx0ID0gdGhpc09iamVjdC0+c3RydWN0dXJlKHZtKS0+ b2JqZWN0VG9TdHJpbmdWYWx1ZSgpOwogICAgIGlmICghcmVzdWx0KSB7CiAgICAgICAgIFJlZlB0 cjxTdHJpbmdJbXBsPiBuZXdTdHJpbmcgPSBXVEY6OnRyeU1ha2VTdHJpbmcoIltvYmplY3QgIiwg dGhpc09iamVjdC0+bWV0aG9kVGFibGUoZXhlYy0+dm0oKSktPmNsYXNzTmFtZSh0aGlzT2JqZWN0 KSwgIl0iKTsKICAgICAgICAgaWYgKCFuZXdTdHJpbmcpCiAgICAgICAgICAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjKSk7CiAKLSAgICAgICAgcmVz dWx0ID0ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIG5ld1N0cmluZy5yZWxlYXNlKCkpOwotICAg ICAgICB0aGlzT2JqZWN0LT5zdHJ1Y3R1cmUoZXhlYy0+dm0oKSktPnNldE9iamVjdFRvU3RyaW5n VmFsdWUoZXhlYy0+dm0oKSwgdGhpc09iamVjdCwgcmVzdWx0KTsKKyAgICAgICAgcmVzdWx0ID0g anNOb250cml2aWFsU3RyaW5nKCZ2bSwgbmV3U3RyaW5nLnJlbGVhc2UoKSk7CisgICAgICAgIHRo aXNPYmplY3QtPnN0cnVjdHVyZSh2bSktPnNldE9iamVjdFRvU3RyaW5nVmFsdWUodm0sIHRoaXNP YmplY3QsIHJlc3VsdCk7CiAgICAgfQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0 KTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9w cm9maWxlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxl ci5weQppbmRleCA5YzA5ZjA3Li4yMjJkNjc2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcHJvZmlsZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL3Byb2ZpbGVyLnB5CkBAIC0yMTQsNyArMjE0LDcgQEAgY2xhc3Mg SVByb2ZpbGVyKFNpbmdsZUZpbGVPdXRwdXRQcm9maWxlcik6CiAgICAgICAgICMgRklYTUU6IGlw cm9maWxlciByZXF1aXJlcyB1cyB0byBwYXNzIHRoZSBkaXJlY3Rvcnkgc2VwYXJhdGVseQogICAg ICAgICAjIGZyb20gdGhlIGJhc2VuYW1lIG9mIHRoZSBmaWxlLCB3aXRoIG5vIGNvbnRyb2wgb3Zl ciB0aGUgZXh0ZW5zaW9uLgogICAgICAgICBmcyA9IHNlbGYuX2hvc3QuZmlsZXN5c3RlbQotICAg ICAgICBjbWQgPSBbImlwcm9maWxlciIsICItVCIsICIwIiwgIi10aW1lcHJvZmlsZXIiLCAiLWEi LCBwaWQsCisgICAgICAgIGNtZCA9IFsiaXByb2ZpbGVyIiwgIi1UIiwgIjAiLCAiLXRpbWVwcm9m aWxlciIsICItYWxsdGhyZWFkc3RhdGVzIiwgIi1hIiwgcGlkLAogICAgICAgICAgICAgICAgICIt ZCIsIGZzLmRpcm5hbWUoc2VsZi5fb3V0cHV0X3BhdGgpLCAiLW8iLCBmcy5zcGxpdGV4dChmcy5i YXNlbmFtZShzZWxmLl9vdXRwdXRfcGF0aCkpWzBdXQogICAgICAgICAjIEZJWE1FOiBDb25zaWRl ciBjYXB0dXJpbmcgaW5zdGVhZCBvZiBsZXR0aW5nIGluc3RydW1lbnRzIHNwYW0gdG8gc3RkZXJy IGRpcmVjdGx5LgogICAgICAgICBzZWxmLl9wcm9maWxlcl9wcm9jZXNzID0gc2VsZi5faG9zdC5l eGVjdXRpdmUucG9wZW4oY21kKQo= 225561 2014-03-01 13:36:46 -0800 2014-03-01 14:16:10 -0800 Lander land-129554.diff text/plain 3992 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAwNWJlMWEuLmZmZGY5MDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBBdm9pZCBnb2luZyB0aHJvdWdoIEV4ZWNT dGF0ZSBmb3IgVk0gd2hlbiB3ZSBhbHJlYWR5IGhhdmUgaXQgKGluIHNvbWUgcGxhY2VzLikKKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTU1ND4KKworICAgICAgICBUd2VhayBzb21l IHBsYWNlcyB0aGF0IGp1bXAgdGhyb3VnaCB1bm5lY2Vzc2FyeSBob29wcyB0byBnZXQgdGhlIFZN LgorICAgICAgICBUaGVyZSBhcmUgbWFueSBtb3JlIGxpa2UgdGhpcy4KKworICAgICAgICBSZXZp ZXdlZCBieSBTYW0gV2VpbmlnLgorCisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXRCeUluZGV4QmV5b25kVmVjdG9yTGVuZ3RoKToKKyAg ICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1dERpcmVjdEluZGV4QmV5b25kVmVjdG9yTGVuZ3RoKToK KyAgICAgICAgKiBydW50aW1lL09iamVjdFByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6Om9i amVjdFByb3RvRnVuY1RvU3RyaW5nKToKKworMjAxNC0wMi0yOCAgQW5kcmVhcyBLbGluZyAgPGFr bGluZ0BhcHBsZS5jb20+CisKICAgICAgICAgSlNPYmplY3Q6OmZpbmRQcm9wZXJ0eUhhc2hFbnRy eSgpIHNob3VsZCB0YWtlIFZNIGluc3RlYWQgb2YgRXhlY1N0YXRlLgogICAgICAgICA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMTI5NTI5PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U09iamVjdC5jcHAKaW5kZXggYjBhNzA2ZS4uMWY0OWYwYSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcApAQCAtMjAyMCw3ICsyMDIwLDcgQEAgdm9pZCBKU09i amVjdDo6cHV0QnlJbmRleEJleW9uZFZlY3Rvckxlbmd0aChFeGVjU3RhdGUqIGV4ZWMsIHVuc2ln bmVkIGksIEpTVmFsdWUKICAgICAgICAgICAgICAgICBleGVjLCBpLCB2YWx1ZSwgc2hvdWxkVGhy b3csIGNyZWF0ZUFycmF5U3RvcmFnZSh2bSwgMCwgMCkpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KLSAgICAgICAgaWYgKHN0cnVjdHVyZShleGVjLT52bSgpKS0+bmVlZHNTbG93UHV0 SW5kZXhpbmcoKSkgeworICAgICAgICBpZiAoc3RydWN0dXJlKHZtKS0+bmVlZHNTbG93UHV0SW5k ZXhpbmcoKSkgewogICAgICAgICAgICAgQXJyYXlTdG9yYWdlKiBzdG9yYWdlID0gY3JlYXRlQXJy YXlTdG9yYWdlKHZtLCBpICsgMSwgZ2V0TmV3VmVjdG9yTGVuZ3RoKDAsIDAsIGkgKyAxKSk7CiAg ICAgICAgICAgICBzdG9yYWdlLT5tX3ZlY3RvcltpXS5zZXQodm0sIHRoaXMsIHZhbHVlKTsKICAg ICAgICAgICAgIHN0b3JhZ2UtPm1fbnVtVmFsdWVzSW5WZWN0b3IrKzsKQEAgLTIxNjgsNyArMjE2 OCw3IEBAIGJvb2wgSlNPYmplY3Q6OnB1dERpcmVjdEluZGV4QmV5b25kVmVjdG9yTGVuZ3RoKEV4 ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgaSwgSlNWCiAgICAgICAgICAgICByZXR1cm4gcHV0RGly ZWN0SW5kZXhCZXlvbmRWZWN0b3JMZW5ndGhXaXRoQXJyYXlTdG9yYWdlKAogICAgICAgICAgICAg ICAgIGV4ZWMsIGksIHZhbHVlLCBhdHRyaWJ1dGVzLCBtb2RlLCBjcmVhdGVBcnJheVN0b3JhZ2Uo dm0sIDAsIDApKTsKICAgICAgICAgfQotICAgICAgICBpZiAoc3RydWN0dXJlKGV4ZWMtPnZtKCkp LT5uZWVkc1Nsb3dQdXRJbmRleGluZygpKSB7CisgICAgICAgIGlmIChzdHJ1Y3R1cmUodm0pLT5u ZWVkc1Nsb3dQdXRJbmRleGluZygpKSB7CiAgICAgICAgICAgICBBcnJheVN0b3JhZ2UqIHN0b3Jh Z2UgPSBjcmVhdGVBcnJheVN0b3JhZ2Uodm0sIGkgKyAxLCBnZXROZXdWZWN0b3JMZW5ndGgoMCwg MCwgaSArIDEpKTsKICAgICAgICAgICAgIHN0b3JhZ2UtPm1fdmVjdG9yW2ldLnNldCh2bSwgdGhp cywgdmFsdWUpOwogICAgICAgICAgICAgc3RvcmFnZS0+bV9udW1WYWx1ZXNJblZlY3RvcisrOwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0UHJvdG90eXBl LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdFByb3RvdHlwZS5jcHAK aW5kZXggNWRmNTI2ZC4uMmNhZTlkMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvT2JqZWN0UHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9PYmplY3RQcm90b3R5cGUuY3BwCkBAIC0yMDksMTkgKzIwOSwyMCBAQCBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG9iamVjdFByb3RvRnVuY1RvTG9jYWxlU3RyaW5nKEV4ZWNT dGF0ZSogZXhlYykKIAogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBvYmplY3RQcm90b0Z1 bmNUb1N0cmluZyhFeGVjU3RhdGUqIGV4ZWMpCiB7CisgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsK ICAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4ZWMtPmhvc3RUaGlzVmFsdWUoKS50b1RoaXMoZXhl YywgU3RyaWN0TW9kZSk7CiAgICAgaWYgKHRoaXNWYWx1ZS5pc1VuZGVmaW5lZE9yTnVsbCgpKQot ICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBT dHJpbmcodGhpc1ZhbHVlLmlzVW5kZWZpbmVkKCkgPyBBU0NJSUxpdGVyYWwoIltvYmplY3QgVW5k ZWZpbmVkXSIpIDogQVNDSUlMaXRlcmFsKCJbb2JqZWN0IE51bGxdIikpKSk7CisgICAgICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUoanNOb250cml2aWFsU3RyaW5nKCZ2bSwgU3RyaW5nKHRoaXNW YWx1ZS5pc1VuZGVmaW5lZCgpID8gQVNDSUlMaXRlcmFsKCJbb2JqZWN0IFVuZGVmaW5lZF0iKSA6 IEFTQ0lJTGl0ZXJhbCgiW29iamVjdCBOdWxsXSIpKSkpOwogICAgIEpTT2JqZWN0KiB0aGlzT2Jq ZWN0ID0gdGhpc1ZhbHVlLnRvT2JqZWN0KGV4ZWMpOwogCi0gICAgSlNTdHJpbmcqIHJlc3VsdCA9 IHRoaXNPYmplY3QtPnN0cnVjdHVyZShleGVjLT52bSgpKS0+b2JqZWN0VG9TdHJpbmdWYWx1ZSgp OworICAgIEpTU3RyaW5nKiByZXN1bHQgPSB0aGlzT2JqZWN0LT5zdHJ1Y3R1cmUodm0pLT5vYmpl Y3RUb1N0cmluZ1ZhbHVlKCk7CiAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgUmVmUHRyPFN0 cmluZ0ltcGw+IG5ld1N0cmluZyA9IFdURjo6dHJ5TWFrZVN0cmluZygiW29iamVjdCAiLCB0aGlz T2JqZWN0LT5tZXRob2RUYWJsZShleGVjLT52bSgpKS0+Y2xhc3NOYW1lKHRoaXNPYmplY3QpLCAi XSIpOwogICAgICAgICBpZiAoIW5ld1N0cmluZykKICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUodGhyb3dPdXRPZk1lbW9yeUVycm9yKGV4ZWMpKTsKIAotICAgICAgICByZXN1bHQg PSBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgbmV3U3RyaW5nLnJlbGVhc2UoKSk7Ci0gICAgICAg IHRoaXNPYmplY3QtPnN0cnVjdHVyZShleGVjLT52bSgpKS0+c2V0T2JqZWN0VG9TdHJpbmdWYWx1 ZShleGVjLT52bSgpLCB0aGlzT2JqZWN0LCByZXN1bHQpOworICAgICAgICByZXN1bHQgPSBqc05v bnRyaXZpYWxTdHJpbmcoJnZtLCBuZXdTdHJpbmcucmVsZWFzZSgpKTsKKyAgICAgICAgdGhpc09i amVjdC0+c3RydWN0dXJlKHZtKS0+c2V0T2JqZWN0VG9TdHJpbmdWYWx1ZSh2bSwgdGhpc09iamVj dCwgcmVzdWx0KTsKICAgICB9CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShyZXN1bHQpOwog fQo=