136118 2014-08-20 13:39:43 -0700 Stop implicitly skipping a function's own activation when walking the scope chain 2014-08-21 16:12:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136123 1 oliver oliver mark.lam ossy oldest_to_newest 1030377 0 oliver 2014-08-20 13:39:43 -0700 Stop implicitly skipping a function's own activation when walking the scope chain 1030379 1 236894 oliver 2014-08-20 13:42:21 -0700 Created attachment 236894 Patch 1030380 2 236894 ggaren 2014-08-20 13:46:03 -0700 Comment on attachment 236894 Patch r=me If the extra pointer dereference is a performance hit, perhaps we need a DFG/FTL optimization to infer that your parent scopes are constants. It seems like, at each level up the scope chain, the odds of a constant scope must increase exponentially. 1030383 3 oliver 2014-08-20 13:54:05 -0700 Committed r172808: <http://trac.webkit.org/changeset/172808> 1030463 4 ossy 2014-08-21 00:46:17 -0700 (In reply to comment #3) > Committed r172808: <http://trac.webkit.org/changeset/172808> It broke 6 different tests on Apple Mac 32 bit: http://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/3692/steps/webkit-32bit-jsc-test/logs/stdio jsc-layout-tests.yaml/js/script-tests/array-filter.js (7 failures) jsc-layout-tests.yaml/js/script-tests/dfg-cse-cfa-discrepancy.js (7 failures) jsc-layout-tests.yaml/js/script-tests/reentrant-caching.js (7 failures) mozilla-tests.yaml/js1_5/Scope/regress-208496-001.js (1 failure) regress/script-tests/Float32Array-matrix-mult.js (8 failures) v8-v6/v8-earley-boyer.js (11 failures) 1030464 5 ossy 2014-08-21 00:48:24 -0700 (In reply to comment #4) > (In reply to comment #3) > > Committed r172808: <http://trac.webkit.org/changeset/172808> > > It broke 6 different tests on Apple Mac 32 bit: > > http://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/3692/steps/webkit-32bit-jsc-test/logs/stdio > > jsc-layout-tests.yaml/js/script-tests/array-filter.js (7 failures) > jsc-layout-tests.yaml/js/script-tests/dfg-cse-cfa-discrepancy.js (7 failures) > jsc-layout-tests.yaml/js/script-tests/reentrant-caching.js (7 failures) > mozilla-tests.yaml/js1_5/Scope/regress-208496-001.js (1 failure) > regress/script-tests/Float32Array-matrix-mult.js (8 failures) > v8-v6/v8-earley-boyer.js (11 failures) It isn't related to x86, the same regression occurs on other 32 bit platforms, ARM Traditional and ARM Thumb2. 1030473 6 ossy 2014-08-21 01:57:51 -0700 new bug report to track this regression: https://bugs.webkit.org/show_bug.cgi?id=136123 1030579 7 mark.lam 2014-08-21 16:12:48 -0700 (In reply to comment #6) > new bug report to track this regression: https://bugs.webkit.org/show_bug.cgi?id=136123 FYI, this has been fixed in r172838: <http://trac.webkit.org/r172838>. 236894 2014-08-20 13:42:21 -0700 2014-08-20 13:46:03 -0700 Patch bug-136118-20140820134212.patch text/plain 18801 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyODAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 MzBlN2RiMDc4NzZmMzMxYzgzNzMyZmNkZTcyZGYyMDhjMTcxM2JjLi5kNjMxODdkZWZiMTlmYzVi MjZlNmZjY2MyMWE4ODJlMzA5MmNiMTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MCBAQAorMjAxNC0wOC0yMCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIFN0b3AgaW1wbGljaXRseSBza2lwcGluZyBhIGZ1bmN0aW9uJ3Mgb3duIGFjdGl2 YXRpb24gd2hlbiB3YWxraW5nIHRoZSBzY29wZSBjaGFpbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2MTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBjdXJyZW50IGxvZ2ljIHRoYXQg aW1wbGljaXRseSBza2lwcyBhIGZ1bmN0aW9uJ3MKKyAgICAgICAgb3duIGFjdGl2YXRpb24gd2hl biB3YWxraW5nIHRoZSBzY29wZSBjaGFpbi4gVGhpcyBpcyBncm91bmQKKyAgICAgICAgd29yayBm b3IgZW5zdXJpbmcgdGhhdCBhbGwgY2xvc2VkIHZhcmlhYmxlIGFjY2VzcyBpcyBtYWRlCisgICAg ICAgIHRocm91Z2ggdGhlIGZ1bmN0aW9uJ3MgYWN0aXZhdGlvbi4gVGhpcyBsZWFkcyB0byBhIGZ1 cnRoZXIKKyAgICAgICAgMTAlIHJlZ3Jlc3Npb24gb24gZWFybGV5LCBidXQgd2UncmUgYWxyZWFk eSB0cmFja2luZyB0aGUKKyAgICAgICAgb3ZlcmFsbCBwZXJmb3JtYW5jZSByZWdyZXNzaW9uLgor CisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJs b2NrOjpDb2RlQmxvY2spOgorICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5s aW5lcy5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RT dGF0ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFy c2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6Z2V0U2NvcGUpOgor ICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKToKKyAgICAgICAg KiBkZmcvREZHQ2xvYmJlcml6ZS5oOgorICAgICAgICAoSlNDOjpERkc6OmNsb2JiZXJpemUpOgor ICAgICAgICAqIGRmZy9ERkdEb2VzR0MuY3BwOgorICAgICAgICAoSlNDOjpERkc6OmRvZXNHQyk6 CisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkZp eHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgICogZGZnL0RGR0hlYXBMb2NhdGlvbi5jcHA6 CisgICAgICAgIChXVEY6OnByaW50SW50ZXJuYWwpOgorICAgICAgICAqIGRmZy9ERkdIZWFwTG9j YXRpb24uaDoKKyAgICAgICAgKiBkZmcvREZHTm9kZVR5cGUuaDoKKyAgICAgICAgKiBkZmcvREZH UHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlByZWRp Y3Rpb25Qcm9wYWdhdGlvblBoYXNlOjpwcm9wYWdhdGUpOgorICAgICAgICAqIGRmZy9ERkdTYWZl VG9FeGVjdXRlLmg6CisgICAgICAgIChKU0M6OkRGRzo6c2FmZVRvRXhlY3V0ZSk6CisgICAgICAg ICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNw ZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2 NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorICAg ICAgICAqIGppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1p dFJlc29sdmVDbG9zdXJlKToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJf NjQuYXNtOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc206CisgICAg ICAgICogcnVudGltZS9KU1Njb3BlLmNwcDoKKyAgICAgICAgKEpTQzo6SlNTY29wZTo6YWJzdHJh Y3RSZXNvbHZlKToKKyAgICAgICAgKiBydW50aW1lL0pTU2NvcGUuaDoKKwogMjAxNC0wOC0yMCAg cGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAgICBbV2luXSBB c3NlcnRpb24gZmFpbHMgd2hlbiBydW5uaW5nIEpTQyBzdHJlc3MgdGVzdHMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDg4MDE4NmY4YWQ3OWQ0 Y2U2NmExNmIxMTc3ZDE1ZmMyN2ZjYzRiYmEuLjViOTVjMjQxOGQyZmY5Y2EzM2U3MWIyZDQ2NDYz MTk4YTUyZjQ1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suY3BwCkBAIC0xOTQ0LDcgKzE5NDQsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3JpcHRF eGVjdXRhYmxlKiBvd25lckV4ZWN1dGFibGUsIFVubGlua2VkQ29kZUJsb2NrKiB1bmxpbgogICAg ICAgICAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnQgPSBpZGVudGlmaWVyKHBjWzJdLnUub3Bl cmFuZCk7CiAgICAgICAgICAgICBSZXNvbHZlVHlwZSB0eXBlID0gc3RhdGljX2Nhc3Q8UmVzb2x2 ZVR5cGU+KHBjWzNdLnUub3BlcmFuZCk7CiAKLSAgICAgICAgICAgIFJlc29sdmVPcCBvcCA9IEpT U2NvcGU6OmFic3RyYWN0UmVzb2x2ZShtX2dsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpLCBzY29w ZSwgaWRlbnQsIEdldCwgdHlwZSk7CisgICAgICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3Bl OjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgbmVlZHNBY3Rp dmF0aW9uKCksIHNjb3BlLCBpZGVudCwgR2V0LCB0eXBlKTsKICAgICAgICAgICAgIGluc3RydWN0 aW9uc1tpICsgM10udS5vcGVyYW5kID0gb3AudHlwZTsKICAgICAgICAgICAgIGluc3RydWN0aW9u c1tpICsgNF0udS5vcGVyYW5kID0gb3AuZGVwdGg7CiAgICAgICAgICAgICBpZiAob3AuYWN0aXZh dGlvbikKQEAgLTE5NjEsNyArMTk2MSw3IEBAIENvZGVCbG9jazo6Q29kZUJsb2NrKFNjcmlwdEV4 ZWN1dGFibGUqIG93bmVyRXhlY3V0YWJsZSwgVW5saW5rZWRDb2RlQmxvY2sqIHVubGluCiAgICAg ICAgICAgICAvLyBnZXRfZnJvbV9zY29wZSBkc3QsIHNjb3BlLCBpZCwgUmVzb2x2ZU1vZGVBbmRU eXBlLCBTdHJ1Y3R1cmUsIE9wZXJhbmQKICAgICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlk ZW50ID0gaWRlbnRpZmllcihwY1szXS51Lm9wZXJhbmQpOwogICAgICAgICAgICAgUmVzb2x2ZU1v ZGVBbmRUeXBlIG1vZGVBbmRUeXBlID0gUmVzb2x2ZU1vZGVBbmRUeXBlKHBjWzRdLnUub3BlcmFu ZCk7Ci0gICAgICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUo bV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgc2NvcGUsIGlkZW50LCBHZXQsIG1vZGVBbmRU eXBlLnR5cGUoKSk7CisgICAgICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3BlOjphYnN0cmFj dFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgbmVlZHNBY3RpdmF0aW9uKCks IHNjb3BlLCBpZGVudCwgR2V0LCBtb2RlQW5kVHlwZS50eXBlKCkpOwogCiAgICAgICAgICAgICBp bnN0cnVjdGlvbnNbaSArIDRdLnUub3BlcmFuZCA9IFJlc29sdmVNb2RlQW5kVHlwZShtb2RlQW5k VHlwZS5tb2RlKCksIG9wLnR5cGUpLm9wZXJhbmQoKTsKICAgICAgICAgICAgIGlmIChvcC50eXBl ID09IEdsb2JhbFZhciB8fCBvcC50eXBlID09IEdsb2JhbFZhcldpdGhWYXJJbmplY3Rpb25DaGVj a3MpCkBAIC0xOTc3LDcgKzE5NzcsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3JpcHRFeGVj dXRhYmxlKiBvd25lckV4ZWN1dGFibGUsIFVubGlua2VkQ29kZUJsb2NrKiB1bmxpbgogICAgICAg ICAgICAgLy8gcHV0X3RvX3Njb3BlIHNjb3BlLCBpZCwgdmFsdWUsIFJlc29sdmVNb2RlQW5kVHlw ZSwgU3RydWN0dXJlLCBPcGVyYW5kCiAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVu dCA9IGlkZW50aWZpZXIocGNbMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAgIFJlc29sdmVNb2Rl QW5kVHlwZSBtb2RlQW5kVHlwZSA9IFJlc29sdmVNb2RlQW5kVHlwZShwY1s0XS51Lm9wZXJhbmQp OwotICAgICAgICAgICAgUmVzb2x2ZU9wIG9wID0gSlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKG1f Z2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIHNjb3BlLCBpZGVudCwgUHV0LCBtb2RlQW5kVHlw ZS50eXBlKCkpOworICAgICAgICAgICAgUmVzb2x2ZU9wIG9wID0gSlNTY29wZTo6YWJzdHJhY3RS ZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIG5lZWRzQWN0aXZhdGlvbigpLCBz Y29wZSwgaWRlbnQsIFB1dCwgbW9kZUFuZFR5cGUudHlwZSgpKTsKIAogICAgICAgICAgICAgaW5z dHJ1Y3Rpb25zW2kgKyA0XS51Lm9wZXJhbmQgPSBSZXNvbHZlTW9kZUFuZFR5cGUobW9kZUFuZFR5 cGUubW9kZSgpLCBvcC50eXBlKS5vcGVyYW5kKCk7CiAgICAgICAgICAgICBpZiAob3AudHlwZSA9 PSBHbG9iYWxWYXIgfHwgb3AudHlwZSA9PSBHbG9iYWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tz KQpAQCAtMjAwOCw3ICsyMDA4LDcgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2soU2NyaXB0RXhlY3V0 YWJsZSogb3duZXJFeGVjdXRhYmxlLCBVbmxpbmtlZENvZGVCbG9jayogdW5saW4KICAgICAgICAg ICAgIGNhc2UgUHJvZmlsZVR5cGVzQnl0ZWNvZGVHZXRGcm9tU2NvcGU6IHsKICAgICAgICAgICAg ICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGlkZW50aWZpZXIocGNbNF0udS5vcGVyYW5k KTsKICAgICAgICAgICAgICAgICBSZXNvbHZlVHlwZSB0eXBlID0gc3RhdGljX2Nhc3Q8UmVzb2x2 ZVR5cGU+KHBjWzVdLnUub3BlcmFuZCk7Ci0gICAgICAgICAgICAgICAgUmVzb2x2ZU9wIG9wID0g SlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIHNj b3BlLCBpZGVudCwgKGZsYWcgPT0gUHJvZmlsZVR5cGVzQnl0ZWNvZGVHZXRGcm9tU2NvcGUgPyBH ZXQgOiBQdXQpLCB0eXBlKTsKKyAgICAgICAgICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3Bl OjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgbmVlZHNBY3Rp dmF0aW9uKCksIHNjb3BlLCBpZGVudCwgKGZsYWcgPT0gUHJvZmlsZVR5cGVzQnl0ZWNvZGVHZXRG cm9tU2NvcGUgPyBHZXQgOiBQdXQpLCB0eXBlKTsKIAogICAgICAgICAgICAgICAgIC8vIEZJWE1F OiBoYW5kbGUgb3RoZXIgdmFsdWVzIGZvciBvcC50eXBlIGhlcmUsIGFuZCBhbHNvIGNvbnNpZGVy IHdoYXQgdG8gZG8gd2hlbiB3ZSBjYW4ndCBzdGF0aWNhbGx5IGRldGVybWluZSB0aGUgZ2xvYmFs SUQKICAgICAgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM1MTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fi c3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgKaW5kZXggMjVkZTRkODAwYzE1N2NlNjFiMDM1 NTk1OWYyZTllMmY3NTc5OTRjZS4uMmNkOGY2ODM1YTdkYmUxNDhiZjBlNTI0N2UzMzI2MWY1NjNh OTVkOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdElu dGVycHJldGVySW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RJbnRlcnByZXRlcklubGluZXMuaApAQCAtMTM4Niw3ICsxMzg2LDYgQEAgYm9vbCBBYnN0 cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6ZXhlY3V0ZUVmZmVjdHModW5zaWdu ZWQgY2xvYmJlckxpbWkKICAgICAgICAgCiAgICAgY2FzZSBHZXRTY29wZTogLy8gRklYTUU6IFdl IGNvdWxkIGdldCByaWQgb2YgdGhlc2UgaWYgd2Uga25vdyB0aGF0IHRoZSBKU0Z1bmN0aW9uIGlz IGEgY29uc3RhbnQuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDYy MDIKICAgICBjYXNlIEdldE15U2NvcGU6Ci0gICAgY2FzZSBTa2lwVG9wU2NvcGU6CiAgICAgICAg IGZvck5vZGUobm9kZSkuc2V0VHlwZShTcGVjT2JqZWN0T3RoZXIpOwogICAgICAgICBicmVhazsK IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNl ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApp bmRleCAxMTBlMjA2NzA3MWRlYjhhYzNjZGNlYWY3OGQ1NjQ4OTUxZTIzNDQ3Li5jNzFkNTQ4MjE3 OWJjMjVkMzlkZjE2YTMxOTg0Nzk5ZGJhNjk3MDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApAQCAtMTk4LDcgKzE5OCw3IEBAIHByaXZh dGU6CiAgICAgICAgIGJvb2wgaXNEaXJlY3QpOwogICAgIHZvaWQgZW1pdENoZWNrcyhjb25zdCBD b25zdGFudFN0cnVjdHVyZUNoZWNrVmVjdG9yJik7CiAKLSAgICBOb2RlKiBnZXRTY29wZShib29s IHNraXBUb3AsIHVuc2lnbmVkIHNraXBDb3VudCk7CisgICAgTm9kZSogZ2V0U2NvcGUodW5zaWdu ZWQgc2tpcENvdW50KTsKICAgICAKICAgICAvLyBQcmVwYXJlIHRvIHBhcnNlIGEgYmxvY2suCiAg ICAgdm9pZCBwcmVwYXJlVG9QYXJzZUJsb2NrKCk7CkBAIC0yMDIzLDEzICsyMDIzLDkgQEAgdm9p ZCBCeXRlQ29kZVBhcnNlcjo6cHJlcGFyZVRvUGFyc2VCbG9jaygpCiAgICAgbV9jb25zdGFudHMu cmVzaXplKDApOwogfQogCi1Ob2RlKiBCeXRlQ29kZVBhcnNlcjo6Z2V0U2NvcGUoYm9vbCBza2lw VG9wLCB1bnNpZ25lZCBza2lwQ291bnQpCitOb2RlKiBCeXRlQ29kZVBhcnNlcjo6Z2V0U2NvcGUo dW5zaWduZWQgc2tpcENvdW50KQogewogICAgIE5vZGUqIGxvY2FsQmFzZSA9IGdldChWaXJ0dWFs UmVnaXN0ZXIoSlNTdGFjazo6U2NvcGVDaGFpbikpOwotICAgIGlmIChza2lwVG9wKSB7Ci0gICAg ICAgIEFTU0VSVCghaW5saW5lQ2FsbEZyYW1lKCkpOwotICAgICAgICBsb2NhbEJhc2UgPSBhZGRU b0dyYXBoKFNraXBUb3BTY29wZSwgbG9jYWxCYXNlKTsKLSAgICB9CiAgICAgZm9yICh1bnNpZ25l ZCBuID0gc2tpcENvdW50OyBuLS07KQogICAgICAgICBsb2NhbEJhc2UgPSBhZGRUb0dyYXBoKFNr aXBTY29wZSwgbG9jYWxCYXNlKTsKICAgICByZXR1cm4gbG9jYWxCYXNlOwpAQCAtMjkyOSw4ICsy OTI1LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZCBsaW1pdCkK ICAgICAgICAgICAgICAgICAgICAgc2V0KFZpcnR1YWxSZWdpc3Rlcihkc3QpLCB3ZWFrSlNDb25z dGFudChhY3RpdmF0aW9uKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgICAgICBzZXQoVmlydHVhbFJlZ2lzdGVyKGRzdCksCi0gICAg ICAgICAgICAgICAgICAgIGdldFNjb3BlKG1faW5saW5lU3RhY2tUb3AtPm1fY29kZUJsb2NrLT5u ZWVkc0FjdGl2YXRpb24oKSwgZGVwdGgpKTsKKyAgICAgICAgICAgICAgICBzZXQoVmlydHVhbFJl Z2lzdGVyKGRzdCksIGdldFNjb3BlKGRlcHRoKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICBjYXNlIER5bmFtaWM6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCmluZGV4IDY4MjMwMWUwNmU1MWU3MmJlZjYzMDg4ZDAw NzQ4MTRlY2U3ODMxN2QuLmZiNzIzZDM1ZjkzMGE1ZGJjYjJlZGI4NTZjMDE1YTA0ZDYyNTc4MTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCkBAIC03NDgsMTEg Kzc0OCw2IEBAIHZvaWQgY2xvYmJlcml6ZShHcmFwaCYgZ3JhcGgsIE5vZGUqIG5vZGUsIFJlYWRG dW5jdG9yJiByZWFkLCBXcml0ZUZ1bmN0b3ImIHdyaXRlCiAgICAgICAgICAgICBkZWYoUHVyZVZh bHVlKG5vZGUpKTsKICAgICAgICAgcmV0dXJuOwogICAgICAgICAKLSAgICBjYXNlIFNraXBUb3BT Y29wZToKLSAgICAgICAgcmVhZChBYnN0cmFjdEhlYXAoVmFyaWFibGVzLCBncmFwaC5hY3RpdmF0 aW9uUmVnaXN0ZXIoKSkpOwotICAgICAgICBkZWYoSGVhcExvY2F0aW9uKFNraXBUb3BTY29wZUxv YywgQWJzdHJhY3RIZWFwKFZhcmlhYmxlcywgZ3JhcGguYWN0aXZhdGlvblJlZ2lzdGVyKCkpLCBu b2RlLT5jaGlsZDEoKSksIG5vZGUpOwotICAgICAgICByZXR1cm47Ci0gICAgICAgIAogICAgIGNh c2UgR2V0Q2xvc3VyZVJlZ2lzdGVyczoKICAgICAgICAgcmVhZChKU1ZhcmlhYmxlT2JqZWN0X3Jl Z2lzdGVycyk7CiAgICAgICAgIGRlZihIZWFwTG9jYXRpb24oQ2xvc3VyZVJlZ2lzdGVyc0xvYywg SlNWYXJpYWJsZU9iamVjdF9yZWdpc3RlcnMsIG5vZGUtPmNoaWxkMSgpKSwgbm9kZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0RvZXNHQy5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0RvZXNHQy5jcHAKaW5kZXggMDA2YmU4MjZlMDdkYjY0MjVl ZjgxNDFjM2I2YjY3MjhhNTNjMWYyOS4uMzExNGY2YWY3NjdjNTA2MTAyYjQ5Y2NjYjYxNTU3ODU1 Y2U2MmFlZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdEb2VzR0Mu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRG9lc0dDLmNwcApAQCAtOTYs NyArOTYsNiBAQCBib29sIGRvZXNHQyhHcmFwaCYgZ3JhcGgsIE5vZGUqIG5vZGUpCiAgICAgY2Fz ZSBDaGVja0FycmF5OgogICAgIGNhc2UgR2V0U2NvcGU6CiAgICAgY2FzZSBHZXRNeVNjb3BlOgot ICAgIGNhc2UgU2tpcFRvcFNjb3BlOgogICAgIGNhc2UgU2tpcFNjb3BlOgogICAgIGNhc2UgR2V0 Q2xvc3VyZVJlZ2lzdGVyczoKICAgICBjYXNlIEdldENsb3N1cmVWYXI6CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAppbmRleCAyZjc0OGY4NmVmMzYyMzgwNGZl MDFjYjgyMGY2ZjRhZDAxOThhYmQxLi42YmIzNWU2NjgzYjdmMWYzMGRhYWRmZjdmMjEzMGQ2MTNj OTcwNDgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhh c2UuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAK QEAgLTg1Myw3ICs4NTMsNiBAQCBwcml2YXRlOgogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBH ZXRDbG9zdXJlUmVnaXN0ZXJzOgotICAgICAgICBjYXNlIFNraXBUb3BTY29wZToKICAgICAgICAg Y2FzZSBTa2lwU2NvcGU6CiAgICAgICAgIGNhc2UgR2V0U2NvcGU6CiAgICAgICAgIGNhc2UgR2V0 R2V0dGVyOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdIZWFwTG9j YXRpb24uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdIZWFwTG9jYXRpb24uY3Bw CmluZGV4IDYwZjFhYTc2YTkxYTY4MGQ5MDMxYWUzYjBlMWZjOTZhMGFkNGQwNzguLmRlZTIxMzc1 Y2Q4MmZjOTdiYTI0MDg5NzQ1ZjQ2YzNmY2IyZmJiODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHSGVhcExvY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0hlYXBMb2NhdGlvbi5jcHAKQEAgLTEzNiwxMCArMTM2LDYgQEAgdm9pZCBw cmludEludGVybmFsKFByaW50U3RyZWFtJiBvdXQsIExvY2F0aW9uS2luZCBraW5kKQogICAgICAg ICBvdXQucHJpbnQoIk5hbWVkUHJvcGVydHlMb2MiKTsKICAgICAgICAgcmV0dXJuOwogICAgICAg ICAKLSAgICBjYXNlIFNraXBUb3BTY29wZUxvYzoKLSAgICAgICAgb3V0LnByaW50KCJTa2lwVG9w U2NvcGVMb2MiKTsKLSAgICAgICAgcmV0dXJuOwotICAgICAgICAKICAgICBjYXNlIFR5cGVkQXJy YXlCeXRlT2Zmc2V0TG9jOgogICAgICAgICBvdXQucHJpbnQoIlR5cGVkQXJyYXlCeXRlT2Zmc2V0 TG9jIik7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHSGVhcExvY2F0aW9uLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0hl YXBMb2NhdGlvbi5oCmluZGV4IGNlZjBhYjJiNzVjZjhkZDYwMjFiZTNjOGQwOWJhYjZlMWQzZTEy MmEuLjEwYjc4YzIzMzY1YTQyZWNkNDE1YmJiY2M3MmY2YzU1N2Q5YmI3ZWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSGVhcExvY2F0aW9uLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdIZWFwTG9jYXRpb24uaApAQCAtNTUsNyArNTUsNiBAQCBl bnVtIExvY2F0aW9uS2luZCB7CiAgICAgTXlBcmd1bWVudHNMZW5ndGhMb2MsCiAgICAgTmFtZWRQ cm9wZXJ0eUxvYywKICAgICBTZXR0ZXJMb2MsCi0gICAgU2tpcFRvcFNjb3BlTG9jLAogICAgIFR5 cGVPZkxvYywKICAgICBUeXBlZEFycmF5Qnl0ZU9mZnNldExvYywKICAgICBWYXJJbmplY3Rpb25X YXRjaHBvaW50TG9jLApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdO b2RlVHlwZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlVHlwZS5oCmluZGV4 IDM1OTFjMTkyMDIyODFmNzdlM2IzYzRhZWUwMWI5OWRkNzZjODc0MTEuLmZlZGU4YjU5OThjOTlm NWNmZTRlMmRhZTVlYTRhOWRjMmNmYWQ4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHTm9kZVR5cGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R05vZGVUeXBlLmgKQEAgLTE3NSw3ICsxNzUsNiBAQCBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNl IERGRyB7CiAgICAgbWFjcm8oR2V0VHlwZWRBcnJheUJ5dGVPZmZzZXQsIE5vZGVSZXN1bHRJbnQz MikgXAogICAgIG1hY3JvKEdldFNjb3BlLCBOb2RlUmVzdWx0SlMpIFwKICAgICBtYWNybyhHZXRN eVNjb3BlLCBOb2RlUmVzdWx0SlMpIFwKLSAgICBtYWNybyhTa2lwVG9wU2NvcGUsIE5vZGVSZXN1 bHRKUykgXAogICAgIG1hY3JvKFNraXBTY29wZSwgTm9kZVJlc3VsdEpTKSBcCiAgICAgbWFjcm8o R2V0Q2xvc3VyZVJlZ2lzdGVycywgTm9kZVJlc3VsdFN0b3JhZ2UpIFwKICAgICBtYWNybyhHZXRD bG9zdXJlVmFyLCBOb2RlUmVzdWx0SlMpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKaW5kZXggNWZh OGE5MmNjYzEwMzk2OGViODc0Yzc4NWEwYTUwY2JjOWE4Y2ViYi4uMTllMTczMzYzNzdhMGU3YmUx OTlmNTI1ZjQ1NjhjZDZlMGMxYTYyYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKQEAgLTQ2MCw3 ICs0NjAsNiBAQCBwcml2YXRlOgogICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAgY2Fz ZSBHZXRNeVNjb3BlOgotICAgICAgICBjYXNlIFNraXBUb3BTY29wZToKICAgICAgICAgY2FzZSBT a2lwU2NvcGU6IHsKICAgICAgICAgICAgIGNoYW5nZWQgfD0gc2V0UHJlZGljdGlvbihTcGVjT2Jq ZWN0T3RoZXIpOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU2FmZVRvRXhlY3V0ZS5oCmluZGV4IDNmNzgyZGRmZGYzNWUyODZhYzM0OWQ0Nzc4M2Jm ZWRiYTU2NWMzZDEuLmM5ZjBlMWRkNmQ0Y2YwOGM3ZTNmNzAxMzFhMWM5M2Q4NTM1Njk4M2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZVRvRXhlY3V0ZS5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZVRvRXhlY3V0ZS5oCkBAIC0xNjYs NyArMTY2LDYgQEAgYm9vbCBzYWZlVG9FeGVjdXRlKEFic3RyYWN0U3RhdGVUeXBlJiBzdGF0ZSwg R3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAgIGNhc2UgQXJyYXlpZnlUb1N0cnVjdHVyZToK ICAgICBjYXNlIEdldFNjb3BlOgogICAgIGNhc2UgR2V0TXlTY29wZToKLSAgICBjYXNlIFNraXBU b3BTY29wZToKICAgICBjYXNlIFNraXBTY29wZToKICAgICBjYXNlIEdldENsb3N1cmVSZWdpc3Rl cnM6CiAgICAgY2FzZSBHZXRDbG9zdXJlVmFyOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKaW5kZXggZTBhMDkwM2I3ZjA1Y2Q0 MzgwMzc2ODQwOGYwNTI4NTgyYmEzY2E5MS4uYzY5MjkzZmYxYjBmOWVkZjY1ZTFmMDViM2YzODFj NGVjMDkzYjI3NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVDMyXzY0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklUMzJfNjQuY3BwCkBAIC0zNTEyLDE2ICszNTEyLDYgQEAgdm9pZCBTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICBicmVhazsKICAgICB9CiAgICAg ICAgIAotICAgIGNhc2UgU2tpcFRvcFNjb3BlOiB7Ci0gICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVy YW5kIHNjb3BlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgR1BSVGVtcG9yYXJ5IHJl c3VsdCh0aGlzLCBSZXVzZSwgc2NvcGUpOwotICAgICAgICBHUFJSZWcgcmVzdWx0R1BSID0gcmVz dWx0LmdwcigpOwotICAgICAgICBtX2ppdC5tb3ZlKHNjb3BlLmdwcigpLCByZXN1bHRHUFIpOwot ICAgICAgICBtX2ppdC5sb2FkUHRyKEpJVENvbXBpbGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwgSlNT Y29wZTo6b2Zmc2V0T2ZOZXh0KCkpLCByZXN1bHRHUFIpOwotICAgICAgICBjZWxsUmVzdWx0KHJl c3VsdEdQUiwgbm9kZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLSAgICAgICAgCiAgICAgY2Fz ZSBTa2lwU2NvcGU6IHsKICAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgc2NvcGUodGhpcywg bm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMsIFJldXNl LCBzY29wZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklUNjQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVDY0LmNwcAppbmRleCBlZGYyMjQ1OWEwMjJhNDcwMjY0NzRkMmY0YzFhZGExNDdiZjZlN2I4 Li43MTU4Mzg1MmMwYzhjMGZmNmNhOTRhZGVlYjUzM2M3ZDdmOWVhNmFjIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKQEAgLTM2MjIs MTYgKzM2MjIsNiBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAg ICAgICAgIGJyZWFrOwogICAgIH0KICAgICAgICAgCi0gICAgY2FzZSBTa2lwVG9wU2NvcGU6IHsK LSAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgc2NvcGUodGhpcywgbm9kZS0+Y2hpbGQxKCkp OwotICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMsIFJldXNlLCBzY29wZSk7Ci0gICAg ICAgIEdQUlJlZyByZXN1bHRHUFIgPSByZXN1bHQuZ3ByKCk7Ci0gICAgICAgIG1faml0Lm1vdmUo c2NvcGUuZ3ByKCksIHJlc3VsdEdQUik7Ci0gICAgICAgIG1faml0LmxvYWRQdHIoSklUQ29tcGls ZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBKU1Njb3BlOjpvZmZzZXRPZk5leHQoKSksIHJlc3VsdEdQ Uik7Ci0gICAgICAgIGNlbGxSZXN1bHQocmVzdWx0R1BSLCBub2RlKTsKLSAgICAgICAgYnJlYWs7 Ci0gICAgfQotICAgICAgICAKICAgICBjYXNlIFNraXBTY29wZTogewogICAgICAgICBTcGVjdWxh dGVDZWxsT3BlcmFuZCBzY29wZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgIEdQUlRl bXBvcmFyeSByZXN1bHQodGhpcywgUmV1c2UsIHNjb3BlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKaW5kZXggODNlYzA1NWM4YWU1MmNiZmNl Yjc3NWUxMDQ5YjE5ZDU2MTJlNGU1YS4uYzkzODdkMzFkZWMxNjMzMzc3ZjBkZGI2YmY5MjU3NWRm ODNmZjk3NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0 eUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFj Y2Vzcy5jcHAKQEAgLTU5NCwxMCArNTk0LDYgQEAgdm9pZCBKSVQ6OmVtaXRSZXNvbHZlQ2xvc3Vy ZShpbnQgZHN0LCBib29sIG5lZWRzVmFySW5qZWN0aW9uQ2hlY2tzLCB1bnNpZ25lZCBkZXAKIHsK ICAgICBlbWl0VmFySW5qZWN0aW9uQ2hlY2sobmVlZHNWYXJJbmplY3Rpb25DaGVja3MpOwogICAg IGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIoSlNTdGFjazo6U2NvcGVDaGFpbiwgcmVnVDApOwotICAg IGlmIChtX2NvZGVCbG9jay0+bmVlZHNBY3RpdmF0aW9uKCkpIHsKLSAgICAgICAgZW1pdEdldFZp cnR1YWxSZWdpc3RlcihtX2NvZGVCbG9jay0+YWN0aXZhdGlvblJlZ2lzdGVyKCksIHJlZ1QxKTsK LSAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBKU1Njb3BlOjpvZmZzZXRPZk5leHQoKSks IHJlZ1QwKTsKLSAgICB9CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGRlcHRoOyArK2kp CiAgICAgICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwgSlNTY29wZTo6b2Zmc2V0T2ZOZXh0KCkp LCByZWdUMCk7CiAgICAgZW1pdFB1dFZpcnR1YWxSZWdpc3Rlcihkc3QpOwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82NC5hc20g Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFz bQppbmRleCA5NTAyOGVlODc4ZDMzMjBiN2RhOTJhZDI4MjU5ZTBhMGY4OWU2OTA2Li41ZWZjZGJl YmY5ZGM4YmExZjhmMmE2Yzg5YjU5NTIxNmNjNjk0NjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQpAQCAt MjIwMSwxMSArMjIwMSw3IEBAIGVuZAogbWFjcm8gcmVzb2x2ZVNjb3BlKCkKICAgICBsb2FkcCBD b2RlQmxvY2tbY2ZyXSwgdDAKICAgICBsb2FkaXNGcm9tSW5zdHJ1Y3Rpb24oNCwgdDIpCi0gICAg YnRieiBDb2RlQmxvY2s6Om1fbmVlZHNBY3RpdmF0aW9uW3QwXSwgLnJlc29sdmVTY29wZUFmdGVy QWN0aXZhdGlvbkNoZWNrCi0gICAgbG9hZGlzIENvZGVCbG9jazo6bV9hY3RpdmF0aW9uUmVnaXN0 ZXJbdDBdLCB0MQotICAgIGFkZGkgMSwgdDIKIAotLnJlc29sdmVTY29wZUFmdGVyQWN0aXZhdGlv bkNoZWNrOgogICAgIGxvYWRwIFNjb3BlQ2hhaW5bY2ZyXSwgdDAKICAgICBidGl6IHQyLCAucmVz b2x2ZVNjb3BlTG9vcEVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCmluZGV4IDg2ZjBmYTEwYThkZTdlNzRhMDQ3OTE2 NTgwYTZhM2UzNTA3YmQxYzYuLjk4M2YyN2IyNTI5YWRmN2E2MzgzMGM5NDg0MDg4NzEwOGU5NDJj MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVy cHJldGVyNjQuYXNtCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbElu dGVycHJldGVyNjQuYXNtCkBAIC0yMDM0LDExICsyMDM0LDYgQEAgZW5kCiBtYWNybyByZXNvbHZl U2NvcGUoKQogICAgIGxvYWRwIENvZGVCbG9ja1tjZnJdLCB0MAogICAgIGxvYWRpc0Zyb21JbnN0 cnVjdGlvbig0LCB0MikKLSAgICBidGJ6IENvZGVCbG9jazo6bV9uZWVkc0FjdGl2YXRpb25bdDBd LCAucmVzb2x2ZVNjb3BlQWZ0ZXJBY3RpdmF0aW9uQ2hlY2sKLSAgICBsb2FkaXMgQ29kZUJsb2Nr OjptX2FjdGl2YXRpb25SZWdpc3Rlclt0MF0sIHQxCi0gICAgYWRkaSAxLCB0MgotCi0ucmVzb2x2 ZVNjb3BlQWZ0ZXJBY3RpdmF0aW9uQ2hlY2s6CiAgICAgbG9hZHAgU2NvcGVDaGFpbltjZnJdLCB0 MAogICAgIGJ0aXogdDIsIC5yZXNvbHZlU2NvcGVMb29wRW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU2NvcGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNTY29wZS5jcHAKaW5kZXggYjI1NDdlZGQ0ZThiMmJmNmNlNDFmNmE2ZDY0 ODdjODA0NmQyYTkzZS4uN2RkNTI0MjRlMDZlOGRjY2RhZjhjNGZhNzA2YWU3NWVkZTAyMmY4YyAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAKQEAgLTE0OCwxMyAr MTQ4LDEzIEBAIEpTVmFsdWUgSlNTY29wZTo6cmVzb2x2ZShFeGVjU3RhdGUqIGV4ZWMsIEpTU2Nv cGUqIHNjb3BlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVuCiAgICAgfQogfQogCi1SZXNvbHZlT3Ag SlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKEV4ZWNTdGF0ZSogZXhlYywgSlNTY29wZSogc2NvcGUs IGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBHZXRPclB1dCBnZXRPclB1dCwgUmVzb2x2ZVR5cGUg dW5saW5rZWRUeXBlKQorUmVzb2x2ZU9wIEpTU2NvcGU6OmFic3RyYWN0UmVzb2x2ZShFeGVjU3Rh dGUqIGV4ZWMsIGJvb2wgaGFzVG9wQWN0aXZhdGlvbiwgSlNTY29wZSogc2NvcGUsIGNvbnN0IElk ZW50aWZpZXImIGlkZW50LCBHZXRPclB1dCBnZXRPclB1dCwgUmVzb2x2ZVR5cGUgdW5saW5rZWRU eXBlKQogewogICAgIFJlc29sdmVPcCBvcChEeW5hbWljLCAwLCAwLCAwLCAwLCAwKTsKICAgICBp ZiAodW5saW5rZWRUeXBlID09IER5bmFtaWMpCiAgICAgICAgIHJldHVybiBvcDsKIAotICAgIHNp emVfdCBkZXB0aCA9IDA7CisgICAgc2l6ZV90IGRlcHRoID0gaGFzVG9wQWN0aXZhdGlvbiA/IDEg OiAwOwogICAgIGJvb2wgbmVlZHNWYXJJbmplY3Rpb25DaGVja3MgPSBKU0M6Om5lZWRzVmFySW5q ZWN0aW9uQ2hlY2tzKHVubGlua2VkVHlwZSk7CiAgICAgZm9yICg7IHNjb3BlOyBzY29wZSA9IHNj b3BlLT5uZXh0KCkpIHsKICAgICAgICAgaWYgKGFic3RyYWN0QWNjZXNzKGV4ZWMsIHNjb3BlLCBp ZGVudCwgZ2V0T3JQdXQsIGRlcHRoLCBuZWVkc1ZhckluamVjdGlvbkNoZWNrcywgb3ApKQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5oCmluZGV4IGUwNjg1MGJhMTAwODAxNDc0 YzdkNTUzOWRmYzIxMzIxM2Y2ODI3YzUuLjVlYTRlZTdiYWRlZjE1ZjA1ZDM1MWJhMzU5ODE0NmEx M2NkODkzYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU2Nv cGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Njb3BlLmgKQEAgLTE1 Myw3ICsxNTMsNyBAQCBwdWJsaWM6CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIEpTT2Jq ZWN0KiBvYmplY3RBdFNjb3BlKEpTU2NvcGUqKTsKIAogICAgIHN0YXRpYyBKU1ZhbHVlIHJlc29s dmUoRXhlY1N0YXRlKiwgSlNTY29wZSosIGNvbnN0IElkZW50aWZpZXImKTsKLSAgICBzdGF0aWMg UmVzb2x2ZU9wIGFic3RyYWN0UmVzb2x2ZShFeGVjU3RhdGUqLCBKU1Njb3BlKiwgY29uc3QgSWRl bnRpZmllciYsIEdldE9yUHV0LCBSZXNvbHZlVHlwZSk7CisgICAgc3RhdGljIFJlc29sdmVPcCBh YnN0cmFjdFJlc29sdmUoRXhlY1N0YXRlKiwgYm9vbCBoYXNUb3BBY3RpdmF0aW9uLCBKU1Njb3Bl KiwgY29uc3QgSWRlbnRpZmllciYsIEdldE9yUHV0LCBSZXNvbHZlVHlwZSk7CiAKICAgICBzdGF0 aWMgdm9pZCB2aXNpdENoaWxkcmVuKEpTQ2VsbCosIFNsb3RWaXNpdG9yJik7CiAK