100825 2012-10-31 01:06:30 -0700 DFG optimized string access code should be enabled 2012-11-01 00:42:45 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo oliver oldest_to_newest 755033 0 fpizlo 2012-10-31 01:06:30 -0700 The DFG string access code kicks in only when the 'this' operand has a string prediction during parsing. That will never happen. No operand has any predictions during parsing. Parsing doesn't have predictions. Predictions don't exist until after prediction propagation runs. Prediction propagation runs only after parsing completely finishes. So, we should remove prediction checks from the code in the parser that recognizes string intrinsics. 755035 1 171593 fpizlo 2012-10-31 01:13:29 -0700 Created attachment 171593 the patch 755966 2 fpizlo 2012-11-01 00:42:45 -0700 Landed in http://trac.webkit.org/changeset/133135 171593 2012-10-31 01:13:29 -0700 2012-10-31 12:04:57 -0700 the patch string_1.patch text/plain 8700 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMyOTkzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDEyLTEwLTMxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIG9wdGltaXplZCBzdHJpbmcgYWNjZXNzIGNvZGUgc2hvdWxkIGJlIGVuYWJsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDgyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gUmVtb3ZlcyBwcmVk aWN0aW9uIGNoZWNrcyBmcm9tIHRoZSBwYXJzZXIuCisgICAgICAgIAorICAgICAgICAtIEZpeGVz IHRoZSBoYW5kbGluZyBvZiBhcnJheSBtb2RlIHJlZmluZW1lbnQgZm9yIHN0cmluZ3MuIEkuZS4g d2UgZG9uJ3QgZG8KKyAgICAgICAgICBhbnkgcmVmaW5lbWVudCAtIHdlIGFscmVhZHkga25vdyBp dCdzIGdvaW5nIHRvIGJlIGEgc3RyaW5nLiBXZSBjb3VsZAorICAgICAgICAgIHJldmlzaXQgdGhp cyBpbiB0aGUgZnV0dXJlLCBidXQgZm9yIG5vdyB0aGUgREZHIGxhY2tzIHRoZSBhYmlsaXR5IHRv CisgICAgICAgICAgaGFuZGxlIGFueSBhcnJheSBtb2RlcyBvdGhlciB0aGFuIEFycmF5OjpTdHJp bmcgZm9yIHN0cmluZyBpbnRyaW5zaWNzLCBzbworICAgICAgICAgIHRoaXMgaXMgYXMgZ29vZCBh cyBpdCBnZXRzLgorICAgICAgICAKKyAgICAgICAgLSBSZW1vdmVzIHVzZXMgb2YgaXNCbGFoU3Bl Y3VsYXRpb24gZm9yIGNoZWNraW5nIGlmIGEgbW9kZSBpcyBhbHJlYWR5CisgICAgICAgICAgY2hl Y2tlZC4gaXNCbGFoU3BlY3VsYXRpb24gaW1wbGljaXRseSBjaGVja3MgaWYgdGhlIFNwZWN1bGF0 ZWRUeXBlIGlzIG5vdAorICAgICAgICAgIEJPVFRPTSAoImVtcHR5IiksIHdoaWNoIGJyZWFrcyBm b3IgY2hlY2tpbmcgaWYgYSBtb2RlIGlzIGFscmVhZHkgY2hlY2tlZAorICAgICAgICAgIHNpbmNl IGEgbW9kZSBtYXkgYWxyZWFkeSBiZSAiY2hlY2tlZCIgaW4gdGhlIHNlbnNlIHRoYXQgd2UndmUg cHJvdmVuIHRoYXQKKyAgICAgICAgICB0aGUgY29kZSBpcyB1bnJlYWNoYWJsZS4KKyAgICAgICAg CisgICAgICAgIH4xJSBzcGVlZC11cCBvbiBWOHY3LCBtb3N0bHkgZnJvbSBhIHNwZWVkLXVwIG9u IGNyeXB0bywgd2hpY2ggdXNlcyBzdHJpbmcKKyAgICAgICAgaW50cmluc2ljcyBpbiBvbmUgb2Yg dGhlIGhvdCBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5o OgorICAgICAgICAoSlNDOjpzcGVjdWxhdGlvbkNoZWNrZWQpOgorICAgICAgICAoSlNDKToKKyAg ICAgICAgKiBkZmcvREZHQXJyYXlNb2RlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpBcnJheU1v ZGU6OmFscmVhZHlDaGVja2VkKToKKyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWMpOgor ICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1 cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6 CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVHZXRDaGFyQ29kZUF0 KToKKwogMjAxMi0xMC0zMCAgWXVxaWFuZyBYaWFuICA8eXVxaWFuZy54aWFuQGludGVsLmNvbT4K IAogICAgICAgICBnbHNsLWZ1bmN0aW9uLWF0YW4uaHRtbCBXZWJHTCBjb25mb3JtYW5jZSB0ZXN0 IGZhaWxzIGFmdGVyIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTE1 NApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRU eXBlLmgJKHJldmlzaW9uIDEzMjc1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9TcGVjdWxhdGVkVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODQsNiArMjg0LDExIEBAIGlu bGluZSBib29sIG1lcmdlU3BlY3VsYXRpb24oVCYgbGVmdCwgU3AKICAgICByZXR1cm4gcmVzdWx0 OwogfQogCitpbmxpbmUgYm9vbCBzcGVjdWxhdGlvbkNoZWNrZWQoU3BlY3VsYXRlZFR5cGUgYWN0 dWFsLCBTcGVjdWxhdGVkVHlwZSBkZXNpcmVkKQoreworICAgIHJldHVybiAoYWN0dWFsIHwgZGVz aXJlZCkgPT0gZGVzaXJlZDsKK30KKwogU3BlY3VsYXRlZFR5cGUgc3BlY3VsYXRpb25Gcm9tQ2xh c3NJbmZvKGNvbnN0IENsYXNzSW5mbyopOwogU3BlY3VsYXRlZFR5cGUgc3BlY3VsYXRpb25Gcm9t U3RydWN0dXJlKFN0cnVjdHVyZSopOwogU3BlY3VsYXRlZFR5cGUgc3BlY3VsYXRpb25Gcm9tQ2Vs bChKU0NlbGwqKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQXJyYXlNb2Rl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FycmF5TW9k ZS5jcHAJKHJldmlzaW9uIDEzMjc1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH QXJyYXlNb2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU5LDcgKzE1OSw3IEBAIGJvb2wgQXJy YXlNb2RlOjphbHJlYWR5Q2hlY2tlZChBYnN0cmFjdFYKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICAKICAgICBjYXNlIEFycmF5OjpTdHJpbmc6Ci0gICAgICAgIHJldHVybiBpc1N0cmlu Z1NwZWN1bGF0aW9uKHZhbHVlLm1fdHlwZSk7CisgICAgICAgIHJldHVybiBzcGVjdWxhdGlvbkNo ZWNrZWQodmFsdWUubV90eXBlLCBTcGVjU3RyaW5nKTsKICAgICAgICAgCiAgICAgY2FzZSBBcnJh eTo6Q29udGlndW91czoKICAgICAgICAgaWYgKGlzSlNBcnJheSgpKSB7CkBAIC0yMDEsMzQgKzIw MSwzNCBAQCBib29sIEFycmF5TW9kZTo6YWxyZWFkeUNoZWNrZWQoQWJzdHJhY3RWCiAgICAgICAg ICAgICAmJiBoYXNBcnJheVN0b3JhZ2UodmFsdWUubV9jdXJyZW50S25vd25TdHJ1Y3R1cmUuc2lu Z2xldG9uKCktPmluZGV4aW5nVHlwZSgpKTsKICAgICAgICAgCiAgICAgY2FzZSBBcnJheTo6QXJn dW1lbnRzOgotICAgICAgICByZXR1cm4gaXNBcmd1bWVudHNTcGVjdWxhdGlvbih2YWx1ZS5tX3R5 cGUpOworICAgICAgICByZXR1cm4gc3BlY3VsYXRpb25DaGVja2VkKHZhbHVlLm1fdHlwZSwgU3Bl Y0FyZ3VtZW50cyk7CiAgICAgICAgIAogICAgIGNhc2UgQXJyYXk6OkludDhBcnJheToKLSAgICAg ICAgcmV0dXJuIGlzSW50OEFycmF5U3BlY3VsYXRpb24odmFsdWUubV90eXBlKTsKKyAgICAgICAg cmV0dXJuIHNwZWN1bGF0aW9uQ2hlY2tlZCh2YWx1ZS5tX3R5cGUsIFNwZWNJbnQ4QXJyYXkpOwog ICAgICAgICAKICAgICBjYXNlIEFycmF5OjpJbnQxNkFycmF5OgotICAgICAgICByZXR1cm4gaXNJ bnQxNkFycmF5U3BlY3VsYXRpb24odmFsdWUubV90eXBlKTsKKyAgICAgICAgcmV0dXJuIHNwZWN1 bGF0aW9uQ2hlY2tlZCh2YWx1ZS5tX3R5cGUsIFNwZWNJbnQxNkFycmF5KTsKICAgICAgICAgCiAg ICAgY2FzZSBBcnJheTo6SW50MzJBcnJheToKLSAgICAgICAgcmV0dXJuIGlzSW50MzJBcnJheVNw ZWN1bGF0aW9uKHZhbHVlLm1fdHlwZSk7CisgICAgICAgIHJldHVybiBzcGVjdWxhdGlvbkNoZWNr ZWQodmFsdWUubV90eXBlLCBTcGVjSW50MzJBcnJheSk7CiAgICAgICAgIAogICAgIGNhc2UgQXJy YXk6OlVpbnQ4QXJyYXk6Ci0gICAgICAgIHJldHVybiBpc1VpbnQ4QXJyYXlTcGVjdWxhdGlvbih2 YWx1ZS5tX3R5cGUpOworICAgICAgICByZXR1cm4gc3BlY3VsYXRpb25DaGVja2VkKHZhbHVlLm1f dHlwZSwgU3BlY1VpbnQ4QXJyYXkpOwogICAgICAgICAKICAgICBjYXNlIEFycmF5OjpVaW50OENs YW1wZWRBcnJheToKLSAgICAgICAgcmV0dXJuIGlzVWludDhDbGFtcGVkQXJyYXlTcGVjdWxhdGlv bih2YWx1ZS5tX3R5cGUpOworICAgICAgICByZXR1cm4gc3BlY3VsYXRpb25DaGVja2VkKHZhbHVl Lm1fdHlwZSwgU3BlY1VpbnQ4Q2xhbXBlZEFycmF5KTsKICAgICAgICAgCiAgICAgY2FzZSBBcnJh eTo6VWludDE2QXJyYXk6Ci0gICAgICAgIHJldHVybiBpc1VpbnQxNkFycmF5U3BlY3VsYXRpb24o dmFsdWUubV90eXBlKTsKKyAgICAgICAgcmV0dXJuIHNwZWN1bGF0aW9uQ2hlY2tlZCh2YWx1ZS5t X3R5cGUsIFNwZWNVaW50MTZBcnJheSk7CiAgICAgICAgIAogICAgIGNhc2UgQXJyYXk6OlVpbnQz MkFycmF5OgotICAgICAgICByZXR1cm4gaXNVaW50MzJBcnJheVNwZWN1bGF0aW9uKHZhbHVlLm1f dHlwZSk7CisgICAgICAgIHJldHVybiBzcGVjdWxhdGlvbkNoZWNrZWQodmFsdWUubV90eXBlLCBT cGVjVWludDMyQXJyYXkpOwogCiAgICAgY2FzZSBBcnJheTo6RmxvYXQzMkFycmF5OgotICAgICAg ICByZXR1cm4gaXNGbG9hdDMyQXJyYXlTcGVjdWxhdGlvbih2YWx1ZS5tX3R5cGUpOworICAgICAg ICByZXR1cm4gc3BlY3VsYXRpb25DaGVja2VkKHZhbHVlLm1fdHlwZSwgU3BlY0Zsb2F0MzJBcnJh eSk7CiAKICAgICBjYXNlIEFycmF5OjpGbG9hdDY0QXJyYXk6Ci0gICAgICAgIHJldHVybiBpc0Zs b2F0NjRBcnJheVNwZWN1bGF0aW9uKHZhbHVlLm1fdHlwZSk7CisgICAgICAgIHJldHVybiBzcGVj dWxhdGlvbkNoZWNrZWQodmFsdWUubV90eXBlLCBTcGVjRmxvYXQ2NEFycmF5KTsKICAgICAgICAg CiAgICAgY2FzZSBBcnJheTo6U2VsZWN0VXNpbmdQcmVkaWN0aW9uczoKICAgICBjYXNlIEFycmF5 OjpVbnByb2ZpbGVkOgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdC eXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDEzMjc1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjg5LDkg KzE2ODksNiBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWMoYm9vCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgaW50IHRoaXNPcGVyYW5kID0gcmVnaXN0 ZXJPZmZzZXQgKyBhcmd1bWVudFRvT3BlcmFuZCgwKTsKLSAgICAgICAgaWYgKCEobV9ncmFwaFtn ZXQodGhpc09wZXJhbmQpXS5wcmVkaWN0aW9uKCkgJiBTcGVjU3RyaW5nKSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgCiAgICAgICAgIGludCBpbmRleE9wZXJhbmQgPSByZWdp c3Rlck9mZnNldCArIGFyZ3VtZW50VG9PcGVyYW5kKDEpOwogICAgICAgICBOb2RlSW5kZXggY2hh ckNvZGUgPSBhZGRUb0dyYXBoKFN0cmluZ0NoYXJDb2RlQXQsIE9wSW5mbyhBcnJheTo6U3RyaW5n KSwgZ2V0KHRoaXNPcGVyYW5kKSwgZ2V0VG9JbnQzMihpbmRleE9wZXJhbmQpKTsKIApAQCAtMTcw NSw5ICsxNzAyLDYgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljKGJvbwog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIGludCB0aGlzT3BlcmFuZCA9IHJl Z2lzdGVyT2Zmc2V0ICsgYXJndW1lbnRUb09wZXJhbmQoMCk7Ci0gICAgICAgIGlmICghKG1fZ3Jh cGhbZ2V0KHRoaXNPcGVyYW5kKV0ucHJlZGljdGlvbigpICYgU3BlY1N0cmluZykpCi0gICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICAgICAgaW50IGluZGV4T3BlcmFuZCA9IHJlZ2lzdGVy T2Zmc2V0ICsgYXJndW1lbnRUb09wZXJhbmQoMSk7CiAgICAgICAgIE5vZGVJbmRleCBjaGFyQ29k ZSA9IGFkZFRvR3JhcGgoU3RyaW5nQ2hhckF0LCBPcEluZm8oQXJyYXk6OlN0cmluZyksIGdldCh0 aGlzT3BlcmFuZCksIGdldFRvSW50MzIoaW5kZXhPcGVyYW5kKSk7CiAKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAkocmV2aXNpb24gMTMyNzU5KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTI3LDkgKzEyNyw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBBU1NFUlQobm9k ZS5hcnJheU1vZGUoKS5jYW5DU0VTdG9yYWdlKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KLSAgICAgICAgY2FzZSBHZXRCeVZhbDoKLSAgICAgICAgY2FzZSBTdHJpbmdDaGFyQXQ6 Ci0gICAgICAgIGNhc2UgU3RyaW5nQ2hhckNvZGVBdDogeworICAgICAgICBjYXNlIEdldEJ5VmFs OiB7CiAgICAgICAgICAgICBub2RlLnNldEFycmF5TW9kZSgKICAgICAgICAgICAgICAgICBub2Rl LmFycmF5TW9kZSgpLnJlZmluZSgKICAgICAgICAgICAgICAgICAgICAgbV9ncmFwaFtub2RlLmNo aWxkMSgpXS5wcmVkaWN0aW9uKCksCkBAIC0xMzgsNiArMTM2LDEzIEBAIHByaXZhdGU6CiAgICAg ICAgICAgICBibGVzc0FycmF5T3BlcmF0aW9uKG5vZGUuY2hpbGQxKCksIG5vZGUuY2hpbGQyKCks IDIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBTdHJpbmdD aGFyQXQ6CisgICAgICAgIGNhc2UgU3RyaW5nQ2hhckNvZGVBdDogeworICAgICAgICAgICAgLy8g Q3VycmVudGx5IHdlIGhhdmUgbm8gZ29vZCB3YXkgb2YgcmVmaW5pbmcgdGhlc2UuCisgICAgICAg ICAgICBBU1NFUlQobm9kZS5hcnJheU1vZGUoKSA9PSBBcnJheU1vZGUoQXJyYXk6OlN0cmluZykp OworICAgICAgICAgICAgYmxlc3NBcnJheU9wZXJhdGlvbihub2RlLmNoaWxkMSgpLCBub2RlLmNo aWxkMigpLCAyKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAgICAgICAK ICAgICAgICAgY2FzZSBBcnJheVB1c2g6IHsKICAgICAgICAgICAgIGJsZXNzQXJyYXlPcGVyYXRp b24obm9kZS5jaGlsZDEoKSwgbm9kZS5jaGlsZDIoKSwgMik7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24gMTMyNzU5 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE3OTksNyArMTc5OSw2IEBAIFZhbHVlUmVjb3ZlcnkgU3BlY3VsYXRp dmVKSVQ6OmNvbXB1dGVWYWwKIAogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUdldENoYXJD b2RlQXQoTm9kZSYgbm9kZSkKIHsKLSAgICBBU1NFUlQobm9kZS5jaGlsZDMoKSA9PSBOb05vZGUp OwogICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIHN0cmluZyh0aGlzLCBub2RlLmNoaWxkMSgpKTsK ICAgICBTcGVjdWxhdGVTdHJpY3RJbnQzMk9wZXJhbmQgaW5kZXgodGhpcywgbm9kZS5jaGlsZDIo KSk7CiAgICAgU3RvcmFnZU9wZXJhbmQgc3RvcmFnZSh0aGlzLCBub2RlLmNoaWxkMygpKTsKQEAg LTE4MDgsMTIgKzE4MDcsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlR2V0Q2hhckNv ZGVBCiAgICAgR1BSUmVnIGluZGV4UmVnID0gaW5kZXguZ3ByKCk7CiAgICAgR1BSUmVnIHN0b3Jh Z2VSZWcgPSBzdG9yYWdlLmdwcigpOwogICAgIAotICAgIGlmICghaXNTdHJpbmdTcGVjdWxhdGlv bihtX3N0YXRlLmZvck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlKSkgewotICAgICAgICBBU1NF UlQoIShhdChub2RlLmNoaWxkMSgpKS5wcmVkaWN0aW9uKCkgJiBTcGVjU3RyaW5nKSk7Ci0gICAg ICAgIHRlcm1pbmF0ZVNwZWN1bGF0aXZlRXhlY3V0aW9uKFVuY291bnRhYmxlLCBKU1ZhbHVlUmVn cygpLCBOb05vZGUpOwotICAgICAgICBub1Jlc3VsdChtX2NvbXBpbGVJbmRleCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9CisgICAgQVNTRVJUKHNwZWN1bGF0aW9uQ2hlY2tlZChtX3N0YXRlLmZv ck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlLCBTcGVjU3RyaW5nKSk7CiAKICAgICAvLyB1bnNp Z25lZCBjb21wYXJpc29uIHNvIHdlIGNhbiBmaWx0ZXIgb3V0IG5lZ2F0aXZlIGluZGljZXMgYW5k IGluZGljZXMgdGhhdCBhcmUgdG9vIGxhcmdlCiAgICAgc3BlY3VsYXRpb25DaGVjayhVbmNvdW50 YWJsZSwgSlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxl cjo6QWJvdmVPckVxdWFsLCBpbmRleFJlZywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RyaW5n UmVnLCBKU1N0cmluZzo6b2Zmc2V0T2ZMZW5ndGgoKSkpKTsK