74628 2011-12-15 10:48:26 -0800 Avoid double-lookup when setting static-scoped vars in strict mode 2013-11-05 08:40:16 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 0 wingo wingo barraclough fpizlo oliver webkit.review.bot oldest_to_newest 522048 0 wingo 2011-12-15 10:48:26 -0800 The patch to be attached avoids a double-lookup when setting variables bound in a static scope. 522051 1 119462 wingo 2011-12-15 10:50:51 -0800 Created attachment 119462 Patch 522056 2 119462 wingo 2011-12-15 10:51:48 -0800 Comment on attachment 119462 Patch I'm looking to use this object for implementing heap-allocated block-scoped variables in the future, and this double-lookup would be more egregious in that case. 522058 3 119463 wingo 2011-12-15 10:53:20 -0800 Created attachment 119463 Patch 522059 4 119463 wingo 2011-12-15 10:53:53 -0800 Comment on attachment 119463 Patch Fixed a style issue in the log. 522061 5 webkit.review.bot 2011-12-15 10:54:08 -0800 Attachment 119462 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/ChangeLog:8: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 537975 6 122958 wingo 2012-01-18 10:29:15 -0800 Created attachment 122958 Patch 537991 7 barraclough 2012-01-18 10:44:14 -0800 Hi Andy, You really need to address my comments in https://bugs.webkit.org/show_bug.cgi?id=74633. If the route we want to pursue to implement let & const is based on activations, then increasing coupling between the JSStaticScopeObject and JSVariableObject classes doesn't make sense. 538009 8 wingo 2012-01-18 11:11:55 -0800 (In reply to comment #7) > Hi Andy, > > You really need to address my comments in https://bugs.webkit.org/show_bug.cgi?id=74633. > > If the route we want to pursue to implement let & const is based on activations, then increasing coupling between the JSStaticScopeObject and JSVariableObject classes doesn't make sense. Is squirrelfish-dev a suitable venue for you? I thought we might need a central location, given the proliferation of these bugs... 945603 9 122958 fpizlo 2013-10-31 11:33:30 -0700 Comment on attachment 122958 Patch Is this still relevant? Looks like this would need a fairly big rebase. 946636 10 wingo 2013-11-04 04:50:43 -0800 (In reply to comment #9) > (From update of attachment 122958 [details]) > Is this still relevant? Looks like this would need a fairly big rebase. No idea. I reckon anyone working in this area in the future would catch whatever bugs need to be fixed, so holding this open doesn't do anyone any good; closing. 947186 11 122958 ossy 2013-11-05 08:40:16 -0800 Comment on attachment 122958 Patch Cleared review? from attachment 122958 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 119462 2011-12-15 10:50:51 -0800 2011-12-15 10:53:12 -0800 Patch bug-74628-20111215195049.patch text/plain 3151 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTNlYjI3ZWZiNTkyNzUyMTViYzRkMDFkMjg5MzY2MTQyMjNhMTFiLi5jOTUyNTc1OGQ3OGI5Mzkx NzAwMTE2MDUzMjViOThhYmI3MTI0OTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxMS0xMi0xNSAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CiAK KyAgICAgICAgQXZvaWQgZG91YmxlLWxvb2t1cCB3aGVuIHNldHRpbmcgc3RhdGljLXNjb3BlZCB2 YXJzIGluIHN0cmljdCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDYyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcnVudGltZS9KU1N0YXRpY1Njb3BlT2JqZWN0LmNwcAorICAgICAgICAoSlND OjpKU1N0YXRpY1Njb3BlT2JqZWN0OjpwdXQpOiBJbmxpbmUgdGhlIHN5bWJvbCB0YWJsZQorICAg ICAgICBvcGVyYXRpb25zIGhlcmUsIHRvIGF2b2lkIGEgZG91YmxlLWxvb2t1cCBhbmQgc2ltcGxp ZnkgdGhlIGNvZGUuCisKKzIwMTEtMTItMTUgIEFuZHkgV2luZ28gIDx3aW5nb0BpZ2FsaWEuY29t PgorCiAgICAgICAgIFdhcm5pbmdzIGZpeGVzIGluIEludGVycHJldGVyLmNwcCBhbmQgUHJpdmF0 ZUV4ZWN1dGUuY3BwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NDYyNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U1N0YXRpY1Njb3BlT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT U3RhdGljU2NvcGVPYmplY3QuY3BwCmluZGV4IGQ5MGM2OGM4MDFiNjNlMWU5OTc2NTY4NjQ2NzQ4 ZDc1Y2ZiMDk0ZDcuLjg3N2FlNWI4NWNlNjRhNWNjYjdhNmRlNzdiZGQ4MmM1ODJkYmEzODQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RhdGljU2NvcGVPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RhdGljU2NvcGVP YmplY3QuY3BwCkBAIC01MSwyNiArNTEsMjUgQEAgSlNPYmplY3QqIEpTU3RhdGljU2NvcGVPYmpl Y3Q6OnRvVGhpc09iamVjdChKU0NlbGwqLCBFeGVjU3RhdGUqIGV4ZWMpCiAKIHZvaWQgSlNTdGF0 aWNTY29wZU9iamVjdDo6cHV0KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJ ZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFByb3BlcnR5U2xvdCYg c2xvdCkKIHsKKyAgICAvLyBXZSBpbmxpbmUgcGFydCBvZiBKU1ZhcmlhYmxlT2JqZWN0OjpzeW1i b2xUYWJsZVB1dCBoZXJlIHRvIGF2b2lkCisgICAgLy8gZG91YmxlLWxvb2t1cCBpbiBzdHJpY3Qg bW9kZS4KKwogICAgIEpTU3RhdGljU2NvcGVPYmplY3QqIHRoaXNPYmplY3QgPSBqc0Nhc3Q8SlNT dGF0aWNTY29wZU9iamVjdCo+KGNlbGwpOwotICAgIGlmIChzbG90LmlzU3RyaWN0TW9kZSgpKSB7 Ci0gICAgICAgIC8vIERvdWJsZSBsb29rdXAgaW4gc3RyaWN0IG1vZGUsIGJ1dCB0aGlzIG9ubHkg b2NjdXJzIHdoZW4KLSAgICAgICAgLy8gYSkgaW5kaXJlY3RseSB3cml0aW5nIHRvIGFuIGV4Y2Vw dGlvbiBzbG90Ci0gICAgICAgIC8vIGIpIHdyaXRpbmcgdG8gYSBmdW5jdGlvbiBleHByZXNzaW9u IG5hbWUKLSAgICAgICAgLy8gKGEpIGlzIHVubGlrZWx5LCBhbmQgKGIpIGlzIGFuIGVycm9yLgot ICAgICAgICAvLyBBbHNvIHdpdGggYSBzaW5nbGUgZW50cnkgdGhlIHN5bWJvbCB0YWJsZSBsb29r dXAgc2hvdWxkIHNpbXBseSBiZQotICAgICAgICAvLyBhIHBvaW50ZXIgY29tcGFyZS4KLSAgICAg ICAgUHJvcGVydHlTbG90IHNsb3Q7Ci0gICAgICAgIGJvb2wgaXNXcml0YWJsZSA9IHRydWU7Ci0g ICAgICAgIHRoaXNPYmplY3QtPnN5bWJvbFRhYmxlR2V0KHByb3BlcnR5TmFtZSwgc2xvdCwgaXNX cml0YWJsZSk7Ci0gICAgICAgIGlmICghaXNXcml0YWJsZSkgewotICAgICAgICAgICAgdGhyb3dF cnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVy dHlXcml0ZUVycm9yKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBTeW1i b2xUYWJsZUVudHJ5IGVudHJ5ID0gdGhpc09iamVjdC0+c3ltYm9sVGFibGUoKS5pbmxpbmVHZXQo cHJvcGVydHlOYW1lLmltcGwoKSk7CisgICAgaWYgKGVudHJ5LmlzTnVsbCgpKSB7CisgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmICh0 aGlzT2JqZWN0LT5zeW1ib2xUYWJsZVB1dChleGVjLT5nbG9iYWxEYXRhKCksIHByb3BlcnR5TmFt ZSwgdmFsdWUpKQorCisgICAgaWYgKGVudHJ5LmlzUmVhZE9ubHkoKSkgeworICAgICAgICBpZiAo c2xvdC5pc1N0cmljdE1vZGUoKSkKKyAgICAgICAgICAgIC8vIFRoaXMgY2FuIGhhcHBlbiBpZiB5 b3Ugd3JpdGUgdG8gYSBmdW5jdGlvbiBleHByZXNzaW9uIG5hbWUgaW4gc3RyaWN0IG1vZGUuCisg ICAgICAgICAgICB0aHJvd0Vycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVjLCBTdHJpY3RN b2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpKTsKICAgICAgICAgcmV0dXJuOwotICAgIAot ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKworICAgIEFTU0VSVCghSGVhcDo6aGVh cCh2YWx1ZSkgfHwgSGVhcDo6aGVhcCh2YWx1ZSkgPT0gSGVhcDo6aGVhcCh0aGlzT2JqZWN0KSk7 CisgICAgdGhpc09iamVjdC0+cmVnaXN0ZXJBdChlbnRyeS5nZXRJbmRleCgpKS5zZXQoZXhlYy0+ Z2xvYmFsRGF0YSgpLCB0aGlzT2JqZWN0LCB2YWx1ZSk7CiB9CiAKIHZvaWQgSlNTdGF0aWNTY29w ZU9iamVjdDo6cHV0V2l0aEF0dHJpYnV0ZXMoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBl eGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIHVuc2ln bmVkIGF0dHJpYnV0ZXMpCg== 119463 2011-12-15 10:53:20 -0800 2012-01-18 10:29:03 -0800 Patch bug-74628-20111215195318.patch text/plain 3152 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTNlYjI3ZWZiNTkyNzUyMTViYzRkMDFkMjg5MzY2MTQyMjNhMTFiLi45ZjhlOTEzMDJkYjQ5NDc5 NDJmYmFmOGIyMjNmZDI3NDc0OGJiZTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxMS0xMi0xNSAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CiAK KyAgICAgICAgQXZvaWQgZG91YmxlLWxvb2t1cCB3aGVuIHNldHRpbmcgc3RhdGljLXNjb3BlZCB2 YXJzIGluIHN0cmljdCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDYyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcnVudGltZS9KU1N0YXRpY1Njb3BlT2JqZWN0LmNwcDoKKyAgICAgICAgKEpT Qzo6SlNTdGF0aWNTY29wZU9iamVjdDo6cHV0KTogSW5saW5lIHRoZSBzeW1ib2wgdGFibGUKKyAg ICAgICAgb3BlcmF0aW9ucyBoZXJlLCB0byBhdm9pZCBhIGRvdWJsZS1sb29rdXAgYW5kIHNpbXBs aWZ5IHRoZSBjb2RlLgorCisyMDExLTEyLTE1ICBBbmR5IFdpbmdvICA8d2luZ29AaWdhbGlhLmNv bT4KKwogICAgICAgICBXYXJuaW5ncyBmaXhlcyBpbiBJbnRlcnByZXRlci5jcHAgYW5kIFByaXZh dGVFeGVjdXRlLmNwcAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzQ2MjQKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNTdGF0aWNTY29wZU9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U1N0YXRpY1Njb3BlT2JqZWN0LmNwcAppbmRleCBkOTBjNjhjODAxYjYzZTFlOTk3NjU2ODY0Njc0 OGQ3NWNmYjA5NGQ3Li44NzdhZTViODVjZTY0YTVjY2I3YTZkZTc3YmRkODJjNTgyZGJhMzg0IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0YXRpY1Njb3BlT2Jq ZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0YXRpY1Njb3Bl T2JqZWN0LmNwcApAQCAtNTEsMjYgKzUxLDI1IEBAIEpTT2JqZWN0KiBKU1N0YXRpY1Njb3BlT2Jq ZWN0Ojp0b1RoaXNPYmplY3QoSlNDZWxsKiwgRXhlY1N0YXRlKiBleGVjKQogCiB2b2lkIEpTU3Rh dGljU2NvcGVPYmplY3Q6OnB1dChKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg SWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9wZXJ0eVNsb3Qm IHNsb3QpCiB7CisgICAgLy8gV2UgaW5saW5lIHBhcnQgb2YgSlNWYXJpYWJsZU9iamVjdDo6c3lt Ym9sVGFibGVQdXQgaGVyZSB0byBhdm9pZAorICAgIC8vIGRvdWJsZS1sb29rdXAgaW4gc3RyaWN0 IG1vZGUuCisKICAgICBKU1N0YXRpY1Njb3BlT2JqZWN0KiB0aGlzT2JqZWN0ID0ganNDYXN0PEpT U3RhdGljU2NvcGVPYmplY3QqPihjZWxsKTsKLSAgICBpZiAoc2xvdC5pc1N0cmljdE1vZGUoKSkg ewotICAgICAgICAvLyBEb3VibGUgbG9va3VwIGluIHN0cmljdCBtb2RlLCBidXQgdGhpcyBvbmx5 IG9jY3VycyB3aGVuCi0gICAgICAgIC8vIGEpIGluZGlyZWN0bHkgd3JpdGluZyB0byBhbiBleGNl cHRpb24gc2xvdAotICAgICAgICAvLyBiKSB3cml0aW5nIHRvIGEgZnVuY3Rpb24gZXhwcmVzc2lv biBuYW1lCi0gICAgICAgIC8vIChhKSBpcyB1bmxpa2VseSwgYW5kIChiKSBpcyBhbiBlcnJvci4K LSAgICAgICAgLy8gQWxzbyB3aXRoIGEgc2luZ2xlIGVudHJ5IHRoZSBzeW1ib2wgdGFibGUgbG9v a3VwIHNob3VsZCBzaW1wbHkgYmUKLSAgICAgICAgLy8gYSBwb2ludGVyIGNvbXBhcmUuCi0gICAg ICAgIFByb3BlcnR5U2xvdCBzbG90OwotICAgICAgICBib29sIGlzV3JpdGFibGUgPSB0cnVlOwot ICAgICAgICB0aGlzT2JqZWN0LT5zeW1ib2xUYWJsZUdldChwcm9wZXJ0eU5hbWUsIHNsb3QsIGlz V3JpdGFibGUpOwotICAgICAgICBpZiAoIWlzV3JpdGFibGUpIHsKLSAgICAgICAgICAgIHRocm93 RXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsIFN0cmljdE1vZGVSZWFkb25seVByb3Bl cnR5V3JpdGVFcnJvcikpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgU3lt Ym9sVGFibGVFbnRyeSBlbnRyeSA9IHRoaXNPYmplY3QtPnN5bWJvbFRhYmxlKCkuaW5saW5lR2V0 KHByb3BlcnR5TmFtZS5pbXBsKCkpOworICAgIGlmIChlbnRyeS5pc051bGwoKSkgeworICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBpZiAo dGhpc09iamVjdC0+c3ltYm9sVGFibGVQdXQoZXhlYy0+Z2xvYmFsRGF0YSgpLCBwcm9wZXJ0eU5h bWUsIHZhbHVlKSkKKworICAgIGlmIChlbnRyeS5pc1JlYWRPbmx5KCkpIHsKKyAgICAgICAgaWYg KHNsb3QuaXNTdHJpY3RNb2RlKCkpCisgICAgICAgICAgICAvLyBUaGlzIGNhbiBoYXBwZW4gaWYg eW91IHdyaXRlIHRvIGEgZnVuY3Rpb24gZXhwcmVzc2lvbiBuYW1lIGluIHN0cmljdCBtb2RlLgor ICAgICAgICAgICAgdGhyb3dFcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgU3RyaWN0 TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKSk7CiAgICAgICAgIHJldHVybjsKLSAgICAK LSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CisKKyAgICBBU1NFUlQoIUhlYXA6Omhl YXAodmFsdWUpIHx8IEhlYXA6OmhlYXAodmFsdWUpID09IEhlYXA6OmhlYXAodGhpc09iamVjdCkp OworICAgIHRoaXNPYmplY3QtPnJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSkuc2V0KGV4ZWMt Pmdsb2JhbERhdGEoKSwgdGhpc09iamVjdCwgdmFsdWUpOwogfQogCiB2b2lkIEpTU3RhdGljU2Nv cGVPYmplY3Q6OnB1dFdpdGhBdHRyaWJ1dGVzKEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSog ZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCB1bnNp Z25lZCBhdHRyaWJ1dGVzKQo= 122958 2012-01-18 10:29:15 -0800 2013-11-05 08:40:16 -0800 Patch bug-74628-20120118192913.patch text/plain 3103 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw YzFiNWVkNjU2YzIzYTUyYjBiNThmNDMyOWNiNzNhZGExZGVhZGMxLi5iYjkwMzk2ZGRkNTk3NmI2 ZWZiMGQ2MDA1OTZlZjg0MTk4NGY2YzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMS0xMi0xNSAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CisK KyAgICAgICAgQXZvaWQgZG91YmxlLWxvb2t1cCB3aGVuIHNldHRpbmcgc3RhdGljLXNjb3BlZCB2 YXJzIGluIHN0cmljdCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDYyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcnVudGltZS9KU1N0YXRpY1Njb3BlT2JqZWN0LmNwcDoKKyAgICAgICAgKEpT Qzo6SlNTdGF0aWNTY29wZU9iamVjdDo6cHV0KTogSW5saW5lIHRoZSBzeW1ib2wgdGFibGUKKyAg ICAgICAgb3BlcmF0aW9ucyBoZXJlLCB0byBhdm9pZCBhIGRvdWJsZS1sb29rdXAgYW5kIHNpbXBs aWZ5IHRoZSBjb2RlLgorCiAyMDExLTEyLTE0ICBBbmR5IFdpbmdvICA8d2luZ29AaWdhbGlhLmNv bT4KIAogICAgICAgICBJbnRlcnBvc2UgQ29kZU5vZGUgYmV0d2VlbiBTY29wZU5vZGUgYW5kIFBy b2dyYW1Ob2RlIGV0IGFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU1N0YXRpY1Njb3BlT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTU3RhdGljU2NvcGVPYmplY3QuY3BwCmluZGV4IGY4OTQyYjVmODY1ZGI1OWUxNTQyZGM0ZTNi NWM3Y2YyNzljMTcxNjMuLmU4NzA1YTRmYjMyM2Q3N2EwMGM4M2FmZDQxZGI5Y2FjNzM4Y2EwYmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RhdGljU2NvcGVP YmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RhdGljU2Nv cGVPYmplY3QuY3BwCkBAIC01NiwyNiArNTYsMjUgQEAgSlNPYmplY3QqIEpTU3RhdGljU2NvcGVP YmplY3Q6OnRvVGhpc09iamVjdChKU0NlbGwqLCBFeGVjU3RhdGUqIGV4ZWMpCiAKIHZvaWQgSlNT dGF0aWNTY29wZU9iamVjdDo6cHV0KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCBjb25z dCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFByb3BlcnR5U2xv dCYgc2xvdCkKIHsKKyAgICAvLyBXZSBpbmxpbmUgcGFydCBvZiBKU1ZhcmlhYmxlT2JqZWN0Ojpz eW1ib2xUYWJsZVB1dCBoZXJlIHRvIGF2b2lkCisgICAgLy8gZG91YmxlLWxvb2t1cCBpbiBzdHJp Y3QgbW9kZS4KKwogICAgIEpTU3RhdGljU2NvcGVPYmplY3QqIHRoaXNPYmplY3QgPSBqc0Nhc3Q8 SlNTdGF0aWNTY29wZU9iamVjdCo+KGNlbGwpOwotICAgIGlmIChzbG90LmlzU3RyaWN0TW9kZSgp KSB7Ci0gICAgICAgIC8vIERvdWJsZSBsb29rdXAgaW4gc3RyaWN0IG1vZGUsIGJ1dCB0aGlzIG9u bHkgb2NjdXJzIHdoZW4KLSAgICAgICAgLy8gYSkgaW5kaXJlY3RseSB3cml0aW5nIHRvIGFuIGV4 Y2VwdGlvbiBzbG90Ci0gICAgICAgIC8vIGIpIHdyaXRpbmcgdG8gYSBmdW5jdGlvbiBleHByZXNz aW9uIG5hbWUKLSAgICAgICAgLy8gKGEpIGlzIHVubGlrZWx5LCBhbmQgKGIpIGlzIGFuIGVycm9y LgotICAgICAgICAvLyBBbHNvIHdpdGggYSBzaW5nbGUgZW50cnkgdGhlIHN5bWJvbCB0YWJsZSBs b29rdXAgc2hvdWxkIHNpbXBseSBiZQotICAgICAgICAvLyBhIHBvaW50ZXIgY29tcGFyZS4KLSAg ICAgICAgUHJvcGVydHlTbG90IHNsb3Q7Ci0gICAgICAgIGJvb2wgaXNXcml0YWJsZSA9IHRydWU7 Ci0gICAgICAgIHRoaXNPYmplY3QtPnN5bWJvbFRhYmxlR2V0KHByb3BlcnR5TmFtZSwgc2xvdCwg aXNXcml0YWJsZSk7Ci0gICAgICAgIGlmICghaXNXcml0YWJsZSkgewotICAgICAgICAgICAgdGhy b3dFcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgU3RyaWN0TW9kZVJlYWRvbmx5UHJv cGVydHlXcml0ZUVycm9yKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBT eW1ib2xUYWJsZUVudHJ5IGVudHJ5ID0gdGhpc09iamVjdC0+c3ltYm9sVGFibGUoKS5pbmxpbmVH ZXQocHJvcGVydHlOYW1lLmltcGwoKSk7CisgICAgaWYgKGVudHJ5LmlzTnVsbCgpKSB7CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlm ICh0aGlzT2JqZWN0LT5zeW1ib2xUYWJsZVB1dChleGVjLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBz bG90LmlzU3RyaWN0TW9kZSgpKSkKKworICAgIGlmIChlbnRyeS5pc1JlYWRPbmx5KCkpIHsKKyAg ICAgICAgaWYgKHNsb3QuaXNTdHJpY3RNb2RlKCkpCisgICAgICAgICAgICAvLyBUaGlzIGNhbiBo YXBwZW4gaWYgeW91IHdyaXRlIHRvIGEgZnVuY3Rpb24gZXhwcmVzc2lvbiBuYW1lIGluIHN0cmlj dCBtb2RlLgorICAgICAgICAgICAgdGhyb3dFcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhl YywgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKSk7CiAgICAgICAgIHJldHVy bjsKLSAgICAKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CisKKyAgICBBU1NFUlQo IUhlYXA6OmhlYXAodmFsdWUpIHx8IEhlYXA6OmhlYXAodmFsdWUpID09IEhlYXA6OmhlYXAodGhp c09iamVjdCkpOworICAgIHRoaXNPYmplY3QtPnJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSku c2V0KGV4ZWMtPmdsb2JhbERhdGEoKSwgdGhpc09iamVjdCwgdmFsdWUpOwogfQogCiB2b2lkIEpT U3RhdGljU2NvcGVPYmplY3Q6OnB1dERpcmVjdFZpcnR1YWwoSlNPYmplY3QqIG9iamVjdCwgRXhl Y1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFs dWUsIHVuc2lnbmVkIGF0dHJpYnV0ZXMpCg==