103989 2012-12-04 02:57:05 -0800 [V8] Replace String::New("symbol") with String::NewSymbol("symbol") 2012-12-04 16:29:34 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 782426 0 haraken 2012-12-04 02:57:05 -0800 In V8, a symbol lookup is faster than a string lookup. We should use String::NewSymbol("symbol") for symbols. 782428 1 177462 haraken 2012-12-04 02:58:21 -0800 Created attachment 177462 Patch 782429 2 haraken 2012-12-04 02:59:03 -0800 If this patch looks OK, I'll do the rest of the replacements. 782578 3 177462 abarth 2012-12-04 08:39:38 -0800 Comment on attachment 177462 Patch Ok. The only downside might be that NewSymbol is slower to create. 783084 4 haraken 2012-12-04 16:28:46 -0800 Committed r136589: <http://trac.webkit.org/changeset/136589> 783085 5 177462 haraken 2012-12-04 16:29:34 -0800 Comment on attachment 177462 Patch Landed manually. 177462 2012-12-04 02:58:21 -0800 2012-12-04 16:29:34 -0800 Patch bug-103989-20121204195546.patch text/plain 15245 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTEyNjlhYWViYjEwZTgz Zjc1OGMzOWEzMmNkYWVlZjNlMTU0M2JhMC4uZjg2NjA1YzNlMTM2M2U1NjU3ZGFkODcxZGVmNTE3 ZmM3NTM3MmQ3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEyLTEyLTA0ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFJlcGxhY2Ug U3RyaW5nOjpOZXcoInN5bWJvbCIpIHdpdGggU3RyaW5nOjpOZXdTeW1ib2woInN5bWJvbCIpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5ODkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBWOCwgYSBz eW1ib2wgbG9va3VwIGlzIGZhc3RlciB0aGFuIGEgc3RyaW5nIGxvb2t1cC4gV2Ugc2hvdWxkIHVz ZQorICAgICAgICBTdHJpbmc6Ok5ld1N5bWJvbCgic3ltYm9sIikgZm9yIHN5bWJvbHMuCisKKyAg ICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRp bmdzL3Y4L2N1c3RvbS9WOERldmljZU1vdGlvbkV2ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKiBi aW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpWOEhUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0Q2FsbGJhY2spOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpWOEluamVjdGVkU2NyaXB0SG9zdDo6dHlwZUNhbGxiYWNrKToK KyAgICAgICAgKFdlYkNvcmU6OlY4SW5qZWN0ZWRTY3JpcHRIb3N0OjpmdW5jdGlvbkRldGFpbHND YWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpnZXRKU0xpc3RlbmVyRnVuY3Rpb25zKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6cG9wdWxhdGVDb250ZXh0TWVudUl0ZW1zKToKKworMjAx Mi0xMi0wNCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAg VW5yZXZpZXdlZC4gUmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3RzLgogCiAgICAgICAgICog YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5vZGUuY3BwOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlTW90aW9uRXZlbnRDdXN0b20u Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlTW90aW9uRXZl bnRDdXN0b20uY3BwCmluZGV4IGE5NGRjZWE0NDFlNWUxMmM2OTEzNTJhZjkzOWNhMTBkNWNjZmI1 MTguLjdmMGM4Yzg4ZjBjZmUyMGY2ZTBlNDZkZDNhYmE4ZTI1ZTFlZmI5MDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERldmljZU1vdGlvbkV2ZW50Q3Vz dG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEZXZpY2VN b3Rpb25FdmVudEN1c3RvbS5jcHAKQEAgLTQwLDE4ICs0MCwxOCBAQCBuYW1lc3BhY2Ugewogc3Rh dGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjcmVhdGVBY2NlbGVyYXRpb25PYmplY3QoY29uc3Qg RGV2aWNlTW90aW9uRGF0YTo6QWNjZWxlcmF0aW9uKiBhY2NlbGVyYXRpb24sIHY4OjpJc29sYXRl KiBpc29sYXRlKQogewogICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBvYmplY3QgPSB2ODo6T2Jq ZWN0OjpOZXcoKTsKLSAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpOZXcoIngiKSwgYWNjZWxl cmF0aW9uLT5jYW5Qcm92aWRlWCgpID8gdjg6Ok51bWJlcjo6TmV3KGFjY2VsZXJhdGlvbi0+eCgp KSA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKLSAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpOZXco InkiKSwgYWNjZWxlcmF0aW9uLT5jYW5Qcm92aWRlWSgpID8gdjg6Ok51bWJlcjo6TmV3KGFjY2Vs ZXJhdGlvbi0+eSgpKSA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKLSAgICBvYmplY3QtPlNldCh2ODo6 U3RyaW5nOjpOZXcoInoiKSwgYWNjZWxlcmF0aW9uLT5jYW5Qcm92aWRlWigpID8gdjg6Ok51bWJl cjo6TmV3KGFjY2VsZXJhdGlvbi0+eigpKSA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKKyAgICBvYmpl Y3QtPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2woIngiKSwgYWNjZWxlcmF0aW9uLT5jYW5Qcm92 aWRlWCgpID8gdjg6Ok51bWJlcjo6TmV3KGFjY2VsZXJhdGlvbi0+eCgpKSA6IHY4OjpOdWxsKGlz b2xhdGUpKTsKKyAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2woInkiKSwgYWNj ZWxlcmF0aW9uLT5jYW5Qcm92aWRlWSgpID8gdjg6Ok51bWJlcjo6TmV3KGFjY2VsZXJhdGlvbi0+ eSgpKSA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKKyAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpO ZXdTeW1ib2woInoiKSwgYWNjZWxlcmF0aW9uLT5jYW5Qcm92aWRlWigpID8gdjg6Ok51bWJlcjo6 TmV3KGFjY2VsZXJhdGlvbi0+eigpKSA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKICAgICByZXR1cm4g b2JqZWN0OwogfQogCiBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNyZWF0ZVJvdGF0aW9u UmF0ZU9iamVjdChjb25zdCBEZXZpY2VNb3Rpb25EYXRhOjpSb3RhdGlvblJhdGUqIHJvdGF0aW9u UmF0ZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAgICAgdjg6OkxvY2FsPHY4OjpPYmplY3Q+ IG9iamVjdCA9IHY4OjpPYmplY3Q6Ok5ldygpOwotICAgIG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6 Ok5ldygiYWxwaGEiKSwgcm90YXRpb25SYXRlLT5jYW5Qcm92aWRlQWxwaGEoKSA/IHY4OjpOdW1i ZXI6Ok5ldyhyb3RhdGlvblJhdGUtPmFscGhhKCkpIDogdjg6Ok51bGwoaXNvbGF0ZSkpOwotICAg IG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6Ok5ldygiYmV0YSIpLCAgcm90YXRpb25SYXRlLT5jYW5Q cm92aWRlQmV0YSgpICA/IHY4OjpOdW1iZXI6Ok5ldyhyb3RhdGlvblJhdGUtPmJldGEoKSkgIDog djg6Ok51bGwoaXNvbGF0ZSkpOwotICAgIG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6Ok5ldygiZ2Ft bWEiKSwgcm90YXRpb25SYXRlLT5jYW5Qcm92aWRlR2FtbWEoKSA/IHY4OjpOdW1iZXI6Ok5ldyhy b3RhdGlvblJhdGUtPmdhbW1hKCkpIDogdjg6Ok51bGwoaXNvbGF0ZSkpOworICAgIG9iamVjdC0+ U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiYWxwaGEiKSwgcm90YXRpb25SYXRlLT5jYW5Qcm92 aWRlQWxwaGEoKSA/IHY4OjpOdW1iZXI6Ok5ldyhyb3RhdGlvblJhdGUtPmFscGhhKCkpIDogdjg6 Ok51bGwoaXNvbGF0ZSkpOworICAgIG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgi YmV0YSIpLCAgcm90YXRpb25SYXRlLT5jYW5Qcm92aWRlQmV0YSgpICA/IHY4OjpOdW1iZXI6Ok5l dyhyb3RhdGlvblJhdGUtPmJldGEoKSkgIDogdjg6Ok51bGwoaXNvbGF0ZSkpOworICAgIG9iamVj dC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiZ2FtbWEiKSwgcm90YXRpb25SYXRlLT5jYW5Q cm92aWRlR2FtbWEoKSA/IHY4OjpOdW1iZXI6Ok5ldyhyb3RhdGlvblJhdGUtPmdhbW1hKCkpIDog djg6Ok51bGwoaXNvbGF0ZSkpOwogICAgIHJldHVybiBvYmplY3Q7CiB9CiAKQEAgLTYzLDE5ICs2 MywxOSBAQCBSZWZQdHI8RGV2aWNlTW90aW9uRGF0YTo6QWNjZWxlcmF0aW9uPiByZWFkQWNjZWxl cmF0aW9uQXJndW1lbnQodjg6OkxvY2FsPHY4OjpWYQogICAgIC8vIEdpdmVuIHRoZSB0ZXN0IGFi b3ZlLCB0aGlzIHdpbGwgYWx3YXlzIHlpZWxkIGFuIG9iamVjdC4KICAgICB2ODo6TG9jYWw8djg6 Ok9iamVjdD4gb2JqZWN0ID0gdmFsdWUtPlRvT2JqZWN0KCk7CiAKLSAgICB2ODo6TG9jYWw8djg6 OlZhbHVlPiB4VmFsdWUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoIngiKSk7CisgICAg djg6OkxvY2FsPHY4OjpWYWx1ZT4geFZhbHVlID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3 U3ltYm9sKCJ4IikpOwogICAgIGlmICh4VmFsdWUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g MDsKICAgICBib29sIGNhblByb3ZpZGVYID0gIWlzVW5kZWZpbmVkT3JOdWxsKHhWYWx1ZSk7CiAg ICAgZG91YmxlIHggPSB4VmFsdWUtPk51bWJlclZhbHVlKCk7CiAKLSAgICB2ODo6TG9jYWw8djg6 OlZhbHVlPiB5VmFsdWUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInkiKSk7CisgICAg djg6OkxvY2FsPHY4OjpWYWx1ZT4geVZhbHVlID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3 U3ltYm9sKCJ5IikpOwogICAgIGlmICh5VmFsdWUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g MDsKICAgICBib29sIGNhblByb3ZpZGVZID0gIWlzVW5kZWZpbmVkT3JOdWxsKHlWYWx1ZSk7CiAg ICAgZG91YmxlIHkgPSB5VmFsdWUtPk51bWJlclZhbHVlKCk7CiAKLSAgICB2ODo6TG9jYWw8djg6 OlZhbHVlPiB6VmFsdWUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInoiKSk7CisgICAg djg6OkxvY2FsPHY4OjpWYWx1ZT4gelZhbHVlID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3 U3ltYm9sKCJ6IikpOwogICAgIGlmICh6VmFsdWUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g MDsKICAgICBib29sIGNhblByb3ZpZGVaID0gIWlzVW5kZWZpbmVkT3JOdWxsKHpWYWx1ZSk7CkBA IC05NSwxOSArOTUsMTkgQEAgUmVmUHRyPERldmljZU1vdGlvbkRhdGE6OlJvdGF0aW9uUmF0ZT4g cmVhZFJvdGF0aW9uUmF0ZUFyZ3VtZW50KHY4OjpMb2NhbDx2ODo6VmEKICAgICAvLyBHaXZlbiB0 aGUgdGVzdCBhYm92ZSwgdGhpcyB3aWxsIGFsd2F5cyB5aWVsZCBhbiBvYmplY3QuCiAgICAgdjg6 OkxvY2FsPHY4OjpPYmplY3Q+IG9iamVjdCA9IHZhbHVlLT5Ub09iamVjdCgpOwogCi0gICAgdjg6 OkxvY2FsPHY4OjpWYWx1ZT4gYWxwaGFWYWx1ZSA9IG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5l dygiYWxwaGEiKSk7CisgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gYWxwaGFWYWx1ZSA9IG9iamVj dC0+R2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiYWxwaGEiKSk7CiAgICAgaWYgKGFscGhhVmFs dWUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKICAgICBib29sIGNhblByb3ZpZGVBbHBo YSA9ICFpc1VuZGVmaW5lZE9yTnVsbChhbHBoYVZhbHVlKTsKICAgICBkb3VibGUgYWxwaGEgPSBh bHBoYVZhbHVlLT5OdW1iZXJWYWx1ZSgpOwogCi0gICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gYmV0 YVZhbHVlID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJiZXRhIikpOworICAgIHY4OjpM b2NhbDx2ODo6VmFsdWU+IGJldGFWYWx1ZSA9IG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ld1N5 bWJvbCgiYmV0YSIpKTsKICAgICBpZiAoYmV0YVZhbHVlLklzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgYm9vbCBjYW5Qcm92aWRlQmV0YSA9ICFpc1VuZGVmaW5lZE9yTnVsbChiZXRh VmFsdWUpOwogICAgIGRvdWJsZSBiZXRhID0gYmV0YVZhbHVlLT5OdW1iZXJWYWx1ZSgpOwogCi0g ICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gZ2FtbWFWYWx1ZSA9IG9iamVjdC0+R2V0KHY4OjpTdHJp bmc6Ok5ldygiZ2FtbWEiKSk7CisgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gZ2FtbWFWYWx1ZSA9 IG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiZ2FtbWEiKSk7CiAgICAgaWYgKGdh bW1hVmFsdWUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKICAgICBib29sIGNhblByb3Zp ZGVHYW1tYSA9ICFpc1VuZGVmaW5lZE9yTnVsbChnYW1tYVZhbHVlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVtZW50Q3VzdG9t LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVt ZW50Q3VzdG9tLmNwcAppbmRleCAwMWU0NzY0MTIyOWEzY2ZkOGZmZjZlZTU4MzU5MjNjMzRjMzcz MWY4Li5iM2FkNjAwNmE3NjVhMjZkZjFmZWYzNmEwNjNhMDY3ZDYxNzhkZjA5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENh bnZhc0VsZW1lbnRDdXN0b20uY3BwCkBAIC02MSwyMiArNjEsMjIgQEAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IFY4SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHRDYWxsYmFjayhjb25zdCB2ODo6 QXJndW1lbnQKICAgICAgICAgV2ViR0xDb250ZXh0QXR0cmlidXRlcyogd2ViR0xBdHRycyA9IHN0 YXRpY19jYXN0PFdlYkdMQ29udGV4dEF0dHJpYnV0ZXMqPihhdHRycy5nZXQoKSk7CiAgICAgICAg IGlmIChhcmdzLkxlbmd0aCgpID4gMSAmJiBhcmdzWzFdLT5Jc09iamVjdCgpKSB7CiAgICAgICAg ICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGpzQXR0cnMgPSBhcmdzWzFdLT5Ub09iamVjdCgp OwotICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBhbHBoYSA9IHY4OjpTdHJpbmc6 Ok5ldygiYWxwaGEiKTsKKyAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gYWxwaGEg PSB2ODo6U3RyaW5nOjpOZXdTeW1ib2woImFscGhhIik7CiAgICAgICAgICAgICBpZiAoanNBdHRy cy0+SGFzKGFscGhhKSkKICAgICAgICAgICAgICAgICB3ZWJHTEF0dHJzLT5zZXRBbHBoYShqc0F0 dHJzLT5HZXQoYWxwaGEpLT5Cb29sZWFuVmFsdWUoKSk7Ci0gICAgICAgICAgICB2ODo6SGFuZGxl PHY4OjpTdHJpbmc+IGRlcHRoID0gdjg6OlN0cmluZzo6TmV3KCJkZXB0aCIpOworICAgICAgICAg ICAgdjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBkZXB0aCA9IHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgi ZGVwdGgiKTsKICAgICAgICAgICAgIGlmIChqc0F0dHJzLT5IYXMoZGVwdGgpKQogICAgICAgICAg ICAgICAgIHdlYkdMQXR0cnMtPnNldERlcHRoKGpzQXR0cnMtPkdldChkZXB0aCktPkJvb2xlYW5W YWx1ZSgpKTsKLSAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gc3RlbmNpbCA9IHY4 OjpTdHJpbmc6Ok5ldygic3RlbmNpbCIpOworICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6U3Ry aW5nPiBzdGVuY2lsID0gdjg6OlN0cmluZzo6TmV3U3ltYm9sKCJzdGVuY2lsIik7CiAgICAgICAg ICAgICBpZiAoanNBdHRycy0+SGFzKHN0ZW5jaWwpKQogICAgICAgICAgICAgICAgIHdlYkdMQXR0 cnMtPnNldFN0ZW5jaWwoanNBdHRycy0+R2V0KHN0ZW5jaWwpLT5Cb29sZWFuVmFsdWUoKSk7Ci0g ICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGFudGlhbGlhcyA9IHY4OjpTdHJpbmc6 Ok5ldygiYW50aWFsaWFzIik7CisgICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGFu dGlhbGlhcyA9IHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiYW50aWFsaWFzIik7CiAgICAgICAgICAg ICBpZiAoanNBdHRycy0+SGFzKGFudGlhbGlhcykpCiAgICAgICAgICAgICAgICAgd2ViR0xBdHRy cy0+c2V0QW50aWFsaWFzKGpzQXR0cnMtPkdldChhbnRpYWxpYXMpLT5Cb29sZWFuVmFsdWUoKSk7 Ci0gICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IHByZW11bHRpcGxpZWRBbHBoYSA9 IHY4OjpTdHJpbmc6Ok5ldygicHJlbXVsdGlwbGllZEFscGhhIik7CisgICAgICAgICAgICB2ODo6 SGFuZGxlPHY4OjpTdHJpbmc+IHByZW11bHRpcGxpZWRBbHBoYSA9IHY4OjpTdHJpbmc6Ok5ld1N5 bWJvbCgicHJlbXVsdGlwbGllZEFscGhhIik7CiAgICAgICAgICAgICBpZiAoanNBdHRycy0+SGFz KHByZW11bHRpcGxpZWRBbHBoYSkpCiAgICAgICAgICAgICAgICAgd2ViR0xBdHRycy0+c2V0UHJl bXVsdGlwbGllZEFscGhhKGpzQXR0cnMtPkdldChwcmVtdWx0aXBsaWVkQWxwaGEpLT5Cb29sZWFu VmFsdWUoKSk7Ci0gICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IHByZXNlcnZlRHJh d2luZ0J1ZmZlciA9IHY4OjpTdHJpbmc6Ok5ldygicHJlc2VydmVEcmF3aW5nQnVmZmVyIik7Cisg ICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IHByZXNlcnZlRHJhd2luZ0J1ZmZlciA9 IHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgicHJlc2VydmVEcmF3aW5nQnVmZmVyIik7CiAgICAgICAg ICAgICBpZiAoanNBdHRycy0+SGFzKHByZXNlcnZlRHJhd2luZ0J1ZmZlcikpCiAgICAgICAgICAg ICAgICAgd2ViR0xBdHRycy0+c2V0UHJlc2VydmVEcmF3aW5nQnVmZmVyKGpzQXR0cnMtPkdldChw cmVzZXJ2ZURyYXdpbmdCdWZmZXIpLT5Cb29sZWFuVmFsdWUoKSk7CiAgICAgICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0 SG9zdEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmpl Y3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCmluZGV4IGY1YzZjNWM5ZDVkOGUzMjA0YWMwZDc4NGVh NmNhNGI5YjU5MjYzYjUuLjMzNjAyNGFkODZjMDlkZjYyODZhMTY0ODVhNmJkMjI4MjMxZDhmZjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVk U2NyaXB0SG9zdEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcApAQCAtMTI0LDMxICsxMjQsMzEgQEAg djg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SW5qZWN0ZWRTY3JpcHRIb3N0Ojp0eXBlQ2FsbGJhY2so Y29uc3Qgdjg6OkFyZ3VtZW50cyYgYXIKIAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1 ZSA9IGFyZ3NbMF07CiAgICAgaWYgKHZhbHVlLT5Jc1N0cmluZygpKQotICAgICAgICByZXR1cm4g djg6OlN0cmluZzo6TmV3KCJzdHJpbmciKTsKKyAgICAgICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5l d1N5bWJvbCgic3RyaW5nIik7CiAgICAgaWYgKHZhbHVlLT5Jc0FycmF5KCkpCi0gICAgICAgIHJl dHVybiB2ODo6U3RyaW5nOjpOZXcoImFycmF5Iik7CisgICAgICAgIHJldHVybiB2ODo6U3RyaW5n OjpOZXdTeW1ib2woImFycmF5Iik7CiAgICAgaWYgKHZhbHVlLT5Jc0Jvb2xlYW4oKSkKLSAgICAg ICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5ldygiYm9vbGVhbiIpOworICAgICAgICByZXR1cm4gdjg6 OlN0cmluZzo6TmV3U3ltYm9sKCJib29sZWFuIik7CiAgICAgaWYgKHZhbHVlLT5Jc051bWJlcigp KQotICAgICAgICByZXR1cm4gdjg6OlN0cmluZzo6TmV3KCJudW1iZXIiKTsKKyAgICAgICAgcmV0 dXJuIHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgibnVtYmVyIik7CiAgICAgaWYgKHZhbHVlLT5Jc0Rh dGUoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5ldygiZGF0ZSIpOworICAgICAgICBy ZXR1cm4gdjg6OlN0cmluZzo6TmV3U3ltYm9sKCJkYXRlIik7CiAgICAgaWYgKHZhbHVlLT5Jc1Jl Z0V4cCgpKQotICAgICAgICByZXR1cm4gdjg6OlN0cmluZzo6TmV3KCJyZWdleHAiKTsKKyAgICAg ICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgicmVnZXhwIik7CiAgICAgaWYgKFY4Tm9k ZTo6SGFzSW5zdGFuY2UodmFsdWUpKQotICAgICAgICByZXR1cm4gdjg6OlN0cmluZzo6TmV3KCJu b2RlIik7CisgICAgICAgIHJldHVybiB2ODo6U3RyaW5nOjpOZXdTeW1ib2woIm5vZGUiKTsKICAg ICBpZiAoVjhOb2RlTGlzdDo6SGFzSW5zdGFuY2UodmFsdWUpKQotICAgICAgICByZXR1cm4gdjg6 OlN0cmluZzo6TmV3KCJhcnJheSIpOworICAgICAgICByZXR1cm4gdjg6OlN0cmluZzo6TmV3U3lt Ym9sKCJhcnJheSIpOwogICAgIGlmIChWOEhUTUxDb2xsZWN0aW9uOjpIYXNJbnN0YW5jZSh2YWx1 ZSkpCi0gICAgICAgIHJldHVybiB2ODo6U3RyaW5nOjpOZXcoImFycmF5Iik7CisgICAgICAgIHJl dHVybiB2ODo6U3RyaW5nOjpOZXdTeW1ib2woImFycmF5Iik7CiAgICAgaWYgKFY4SW50OEFycmF5 OjpIYXNJbnN0YW5jZSh2YWx1ZSkgfHwgVjhJbnQxNkFycmF5OjpIYXNJbnN0YW5jZSh2YWx1ZSkg fHwgVjhJbnQzMkFycmF5OjpIYXNJbnN0YW5jZSh2YWx1ZSkpCi0gICAgICAgIHJldHVybiB2ODo6 U3RyaW5nOjpOZXcoImFycmF5Iik7CisgICAgICAgIHJldHVybiB2ODo6U3RyaW5nOjpOZXdTeW1i b2woImFycmF5Iik7CiAgICAgaWYgKFY4VWludDhBcnJheTo6SGFzSW5zdGFuY2UodmFsdWUpIHx8 IFY4VWludDE2QXJyYXk6Okhhc0luc3RhbmNlKHZhbHVlKSB8fCBWOFVpbnQzMkFycmF5OjpIYXNJ bnN0YW5jZSh2YWx1ZSkpCi0gICAgICAgIHJldHVybiB2ODo6U3RyaW5nOjpOZXcoImFycmF5Iik7 CisgICAgICAgIHJldHVybiB2ODo6U3RyaW5nOjpOZXdTeW1ib2woImFycmF5Iik7CiAgICAgaWYg KFY4RmxvYXQzMkFycmF5OjpIYXNJbnN0YW5jZSh2YWx1ZSkgfHwgVjhGbG9hdDY0QXJyYXk6Okhh c0luc3RhbmNlKHZhbHVlKSkKLSAgICAgICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5ldygiYXJyYXki KTsKKyAgICAgICAgcmV0dXJuIHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiYXJyYXkiKTsKICAgICBp ZiAoVjhVaW50OENsYW1wZWRBcnJheTo6SGFzSW5zdGFuY2UodmFsdWUpKQotICAgICAgICByZXR1 cm4gdjg6OlN0cmluZzo6TmV3KCJhcnJheSIpOworICAgICAgICByZXR1cm4gdjg6OlN0cmluZzo6 TmV3U3ltYm9sKCJhcnJheSIpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiB9CiAKQEAg LTE2OCwyNiArMTY4LDI2IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEluamVjdGVkU2NyaXB0 SG9zdDo6ZnVuY3Rpb25EZXRhaWxzQ2FsbGJhY2soY29uc3Qgdjg6OkFyCiAgICAgaW50IGNvbHVt bk51bWJlciA9IGZ1bmN0aW9uLT5HZXRTY3JpcHRDb2x1bW5OdW1iZXIoKTsKIAogICAgIHY4OjpM b2NhbDx2ODo6T2JqZWN0PiBsb2NhdGlvbiA9IHY4OjpPYmplY3Q6Ok5ldygpOwotICAgIGxvY2F0 aW9uLT5TZXQodjg6OlN0cmluZzo6TmV3KCJsaW5lTnVtYmVyIiksIHY4SW50ZWdlcihsaW5lTnVt YmVyLCBhcmdzLkdldElzb2xhdGUoKSkpOwotICAgIGxvY2F0aW9uLT5TZXQodjg6OlN0cmluZzo6 TmV3KCJjb2x1bW5OdW1iZXIiKSwgdjhJbnRlZ2VyKGNvbHVtbk51bWJlciwgYXJncy5HZXRJc29s YXRlKCkpKTsKLSAgICBsb2NhdGlvbi0+U2V0KHY4OjpTdHJpbmc6Ok5ldygic2NyaXB0SWQiKSwg ZnVuY3Rpb24tPkdldFNjcmlwdElkKCktPlRvU3RyaW5nKCkpOworICAgIGxvY2F0aW9uLT5TZXQo djg6OlN0cmluZzo6TmV3U3ltYm9sKCJsaW5lTnVtYmVyIiksIHY4SW50ZWdlcihsaW5lTnVtYmVy LCBhcmdzLkdldElzb2xhdGUoKSkpOworICAgIGxvY2F0aW9uLT5TZXQodjg6OlN0cmluZzo6TmV3 U3ltYm9sKCJjb2x1bW5OdW1iZXIiKSwgdjhJbnRlZ2VyKGNvbHVtbk51bWJlciwgYXJncy5HZXRJ c29sYXRlKCkpKTsKKyAgICBsb2NhdGlvbi0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgic2Ny aXB0SWQiKSwgZnVuY3Rpb24tPkdldFNjcmlwdElkKCktPlRvU3RyaW5nKCkpOwogCiAgICAgdjg6 OkxvY2FsPHY4OjpPYmplY3Q+IHJlc3VsdCA9IHY4OjpPYmplY3Q6Ok5ldygpOwotICAgIHJlc3Vs dC0+U2V0KHY4OjpTdHJpbmc6Ok5ldygibG9jYXRpb24iKSwgbG9jYXRpb24pOworICAgIHJlc3Vs dC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgibG9jYXRpb24iKSwgbG9jYXRpb24pOwogCiAg ICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5hbWUgPSBmdW5jdGlvbi0+R2V0TmFtZSgpOwogICAg IGlmIChuYW1lLT5Jc1N0cmluZygpICYmIHY4OjpIYW5kbGU8djg6OlN0cmluZz46OkNhc3QobmFt ZSktPkxlbmd0aCgpKQotICAgICAgICByZXN1bHQtPlNldCh2ODo6U3RyaW5nOjpOZXcoIm5hbWUi KSwgbmFtZSk7CisgICAgICAgIHJlc3VsdC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgibmFt ZSIpLCBuYW1lKTsKIAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBpbmZlcnJlZE5hbWUgPSBm dW5jdGlvbi0+R2V0SW5mZXJyZWROYW1lKCk7CiAgICAgaWYgKGluZmVycmVkTmFtZS0+SXNTdHJp bmcoKSAmJiB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+OjpDYXN0KGluZmVycmVkTmFtZSktPkxlbmd0 aCgpKQotICAgICAgICByZXN1bHQtPlNldCh2ODo6U3RyaW5nOjpOZXcoImluZmVycmVkTmFtZSIp LCBpbmZlcnJlZE5hbWUpOworICAgICAgICByZXN1bHQtPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1i b2woImluZmVycmVkTmFtZSIpLCBpbmZlcnJlZE5hbWUpOwogCiAgICAgSW5qZWN0ZWRTY3JpcHRI b3N0KiBob3N0ID0gVjhJbmplY3RlZFNjcmlwdEhvc3Q6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkp OwogICAgIFNjcmlwdERlYnVnU2VydmVyJiBkZWJ1Z1NlcnZlciA9IGhvc3QtPnNjcmlwdERlYnVn U2VydmVyKCk7CiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHNjb3BlcyA9IGRlYnVnU2VydmVy LmZ1bmN0aW9uU2NvcGVzKGZ1bmN0aW9uKTsKICAgICBpZiAoIXNjb3Blcy5Jc0VtcHR5KCkgJiYg c2NvcGVzLT5Jc0FycmF5KCkpCi0gICAgICAgIHJlc3VsdC0+U2V0KHY4OjpTdHJpbmc6Ok5ldygi cmF3U2NvcGVzIiksIHNjb3Blcyk7CisgICAgICAgIHJlc3VsdC0+U2V0KHY4OjpTdHJpbmc6Ok5l d1N5bWJvbCgicmF3U2NvcGVzIiksIHNjb3Blcyk7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQpA QCAtMjMyLDggKzIzMiw4IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpBcnJheT4gZ2V0SlNMaXN0 ZW5lckZ1bmN0aW9ucyhEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEV2CiAgICAgICAgIH0KICAg ICAgICAgQVNTRVJUKCFmdW5jdGlvbi5Jc0VtcHR5KCkpOwogICAgICAgICB2ODo6TG9jYWw8djg6 Ok9iamVjdD4gbGlzdGVuZXJFbnRyeSA9IHY4OjpPYmplY3Q6Ok5ldygpOwotICAgICAgICBsaXN0 ZW5lckVudHJ5LT5TZXQodjg6OlN0cmluZzo6TmV3KCJsaXN0ZW5lciIpLCBmdW5jdGlvbik7Ci0g ICAgICAgIGxpc3RlbmVyRW50cnktPlNldCh2ODo6U3RyaW5nOjpOZXcoInVzZUNhcHR1cmUiKSwg djg6OkJvb2xlYW46Ok5ldyhsaXN0ZW5lckluZm8uZXZlbnRMaXN0ZW5lclZlY3RvcltpXS51c2VD YXB0dXJlKSk7CisgICAgICAgIGxpc3RlbmVyRW50cnktPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1i b2woImxpc3RlbmVyIiksIGZ1bmN0aW9uKTsKKyAgICAgICAgbGlzdGVuZXJFbnRyeS0+U2V0KHY4 OjpTdHJpbmc6Ok5ld1N5bWJvbCgidXNlQ2FwdHVyZSIpLCB2ODo6Qm9vbGVhbjo6TmV3KGxpc3Rl bmVySW5mby5ldmVudExpc3RlbmVyVmVjdG9yW2ldLnVzZUNhcHR1cmUpKTsKICAgICAgICAgcmVz dWx0LT5TZXQodjg6Ok51bWJlcjo6TmV3KG91dHB1dEluZGV4KyspLCBsaXN0ZW5lckVudHJ5KTsK ICAgICB9CiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0 b20uY3BwCmluZGV4IDliMzgwOWMzMDhmY2I0NjRhMzYzMmMxYzdjOWFiMDYxNmVlZjEwYTguLjFh MTc0ZjJkMTVjY2EzYjMzMTcwNjI1ZGNhZDVmNTJlMThlODkwYjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3Rv bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5zcGVjdG9y RnJvbnRlbmRIb3N0Q3VzdG9tLmNwcApAQCAtNzEsMTIgKzcxLDEyIEBAIHN0YXRpYyB2b2lkIHBv cHVsYXRlQ29udGV4dE1lbnVJdGVtcyh2ODo6TG9jYWw8djg6OkFycmF5PiYgaXRlbUFycmF5LCBD b250ZXh0TWVuCiB7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBpdGVtQXJyYXktPkxlbmd0 aCgpOyArK2kpIHsKICAgICAgICAgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IGl0ZW0gPSB2ODo6TG9j YWw8djg6Ok9iamVjdD46OkNhc3QoaXRlbUFycmF5LT5HZXQoaSkpOwotICAgICAgICB2ODo6TG9j YWw8djg6OlZhbHVlPiB0eXBlID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygidHlwZSIpKTsK LSAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gaWQgPSBpdGVtLT5HZXQodjg6OlN0cmluZzo6 TmV3KCJpZCIpKTsKLSAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gbGFiZWwgPSBpdGVtLT5H ZXQodjg6OlN0cmluZzo6TmV3KCJsYWJlbCIpKTsKLSAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1 ZT4gZW5hYmxlZCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuYWJsZWQiKSk7Ci0gICAg ICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGNoZWNrZWQgPSBpdGVtLT5HZXQodjg6OlN0cmluZzo6 TmV3KCJjaGVja2VkIikpOwotICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBzdWJJdGVtcyA9 IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXcoInN1Ykl0ZW1zIikpOworICAgICAgICB2ODo6TG9j YWw8djg6OlZhbHVlPiB0eXBlID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgidHlw ZSIpKTsKKyAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gaWQgPSBpdGVtLT5HZXQodjg6OlN0 cmluZzo6TmV3U3ltYm9sKCJpZCIpKTsKKyAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gbGFi ZWwgPSBpdGVtLT5HZXQodjg6OlN0cmluZzo6TmV3U3ltYm9sKCJsYWJlbCIpKTsKKyAgICAgICAg djg6OkxvY2FsPHY4OjpWYWx1ZT4gZW5hYmxlZCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXdT eW1ib2woImVuYWJsZWQiKSk7CisgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGNoZWNrZWQg PSBpdGVtLT5HZXQodjg6OlN0cmluZzo6TmV3U3ltYm9sKCJjaGVja2VkIikpOworICAgICAgICB2 ODo6TG9jYWw8djg6OlZhbHVlPiBzdWJJdGVtcyA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXdT eW1ib2woInN1Ykl0ZW1zIikpOwogICAgICAgICBpZiAoIXR5cGUtPklzU3RyaW5nKCkpCiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgU3RyaW5nIHR5cGVTdHJpbmcgPSB0b1dlYkNvcmVT dHJpbmdXaXRoTnVsbENoZWNrKHR5cGUpOwo=