132590 2014-05-05 17:16:35 -0700 Optimize GetByVal when subscript is a rope string. 2014-05-06 11:31:22 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling kling ossy oldest_to_newest 1006789 0 kling 2014-05-05 17:16:35 -0700 PutByVal was easy. This should also be easy. 1006791 1 230870 kling 2014-05-05 17:17:22 -0700 Created attachment 230870 Patch 1006804 2 kling 2014-05-05 17:58:13 -0700 Committed r168335: <http://trac.webkit.org/changeset/168335> 1007024 3 ossy 2014-05-06 11:31:22 -0700 (In reply to comment #2) > Committed r168335: <http://trac.webkit.org/changeset/168335> It made DoYouEvenBench/Full.html performance test flakey fail everywhere. Could you possibly check it? 230870 2014-05-05 17:17:22 -0700 2014-05-05 17:28:48 -0700 Patch bug-132590.diff text/plain 9270 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGNjMzA0NWUuLjI4MjQzODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTA1LTA1ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBPcHRpbWl6ZSBHZXRCeVZhbCB3aGVuIHN1 YnNjcmlwdCBpcyBhIHJvcGUgc3RyaW5nLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTMyNTkwPgorCisgICAgICAgIFVzZSBKU1N0cmluZzo6dG9JZGVudGlmaWVyKCkgaW4gdGhlIHZh cmlvdXMgR2V0QnlWYWwgaW1wbGVtZW50YXRpb25zCisgICAgICAgIHRvIHRyeSBhbmQgYXZvaWQg YWxsb2NhdGluZyBleHRyYSBzdHJpbmdzLgorCisgICAgICAgIEFkZGVkIGNhblVzZUZhc3RHZXRP d25Qcm9wZXJ0eSgpIGFuZCB3cmFwIGNhbGxzIHRvIGZhc3RHZXRPd25Qcm9wZXJ0eSgpCisgICAg ICAgIGluIHRoYXQsIHRvIGF2b2lkIGNhbGxpbmcgSlNTdHJpbmc6OnZhbHVlKCkgd2hpY2ggYWx3 YXlzIHJlc29sdmVzIHJvcGVzCisgICAgICAgIGludG8gbmV3IHN0cmluZ3MgYW5kIGRlLW9wdGlt aXplcyBzdWJzZXF1ZW50IHRvSWRlbnRpZmllcigpIGNhbGxzLgorCisgICAgICAgIE15IGlNYWMg c2F5cyB+OSUgcHJvZ3Jlc3Npb24gb24gRHJvbWFlby9kb20tYXR0ci5odG1sCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9u cy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpn ZXRCeVZhbCk6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwOgorICAgICAgICAo SlNDOjpMTEludDo6Z2V0QnlWYWwpOgorICAgICAgICAqIHJ1bnRpbWUvSlNDZWxsLmg6CisgICAg ICAgICogcnVudGltZS9KU0NlbGxJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpTQ2VsbDo6ZmFz dEdldE93blByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpjYW5Vc2VGYXN0R2V0T3du UHJvcGVydHkpOgorCiAyMDE0LTA1LTA1ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IFJFTEVBU0VfQVNTRVJUIGluIENvZGVCbG9jazo6 YmFzZWxpbmVWZXJzaW9uIEAgY25uLmNvbQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5jcHAKaW5kZXggOGM5YWI0MC4uOTlhODcyNSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCkBAIC0yOTUsMTUgKzI5NSwxOCBAQCBFbmNv ZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5VmFsKEV4ZWNTdGF0ZSogZXhl YywgRW5jb2RlZEpTVmFsdWUgZQogICAgICAgICAgICAgaWYgKHByb3BlcnR5QXNVSW50MzIgPT0g cHJvcGVydHlBc0RvdWJsZSkKICAgICAgICAgICAgICAgICByZXR1cm4gZ2V0QnlWYWwoZXhlYywg YmFzZSwgcHJvcGVydHlBc1VJbnQzMik7CiAgICAgICAgIH0gZWxzZSBpZiAocHJvcGVydHkuaXNT dHJpbmcoKSkgewotICAgICAgICAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gYmFzZS0+ZmFzdEdl dE93blByb3BlcnR5KHZtLCBhc1N0cmluZyhwcm9wZXJ0eSktPnZhbHVlKGV4ZWMpKSkKLSAgICAg ICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlc3VsdCk7CisgICAgICAgICAgICBT dHJ1Y3R1cmUmIHN0cnVjdHVyZSA9ICpiYXNlLT5zdHJ1Y3R1cmUodm0pOworICAgICAgICAgICAg aWYgKEpTQ2VsbDo6Y2FuVXNlRmFzdEdldE93blByb3BlcnR5KHN0cnVjdHVyZSkpIHsKKyAgICAg ICAgICAgICAgICBpZiAoSlNWYWx1ZSByZXN1bHQgPSBiYXNlLT5mYXN0R2V0T3duUHJvcGVydHko dm0sIHN0cnVjdHVyZSwgYXNTdHJpbmcocHJvcGVydHkpLT52YWx1ZShleGVjKSkpCisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0KIAogICAgIGlmIChpc05hbWUocHJvcGVydHkpKQogICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGJhc2VWYWx1ZS5nZXQoZXhlYywganNDYXN0PE5hbWVJ bnN0YW5jZSo+KHByb3BlcnR5LmFzQ2VsbCgpKS0+cHJpdmF0ZU5hbWUoKSkpOwogCi0gICAgSWRl bnRpZmllciBpZGVudChleGVjLCBwcm9wZXJ0eS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYykp OworICAgIElkZW50aWZpZXIgaWRlbnQgPSBwcm9wZXJ0eS50b1N0cmluZyhleGVjKS0+dG9JZGVu dGlmaWVyKGV4ZWMpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoYmFzZVZhbHVlLmdldChl eGVjLCBpZGVudCkpOwogfQogCkBAIC0zMjIsMTQgKzMyNSwxNyBAQCBFbmNvZGVkSlNWYWx1ZSBK SVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5VmFsQ2VsbChFeGVjU3RhdGUqIGV4ZWMsIEpTQ2Vs bCogYmFzZQogICAgICAgICBpZiAocHJvcGVydHlBc1VJbnQzMiA9PSBwcm9wZXJ0eUFzRG91Ymxl KQogICAgICAgICAgICAgcmV0dXJuIGdldEJ5VmFsKGV4ZWMsIGJhc2UsIHByb3BlcnR5QXNVSW50 MzIpOwogICAgIH0gZWxzZSBpZiAocHJvcGVydHkuaXNTdHJpbmcoKSkgewotICAgICAgICBpZiAo SlNWYWx1ZSByZXN1bHQgPSBiYXNlLT5mYXN0R2V0T3duUHJvcGVydHkodm0sIGFzU3RyaW5nKHBy b3BlcnR5KS0+dmFsdWUoZXhlYykpKQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShyZXN1bHQpOworICAgICAgICBTdHJ1Y3R1cmUmIHN0cnVjdHVyZSA9ICpiYXNlLT5zdHJ1Y3R1 cmUodm0pOworICAgICAgICBpZiAoSlNDZWxsOjpjYW5Vc2VGYXN0R2V0T3duUHJvcGVydHkoc3Ry dWN0dXJlKSkgeworICAgICAgICAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gYmFzZS0+ZmFzdEdl dE93blByb3BlcnR5KHZtLCBzdHJ1Y3R1cmUsIGFzU3RyaW5nKHByb3BlcnR5KS0+dmFsdWUoZXhl YykpKQorICAgICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIGlmIChpc05hbWUocHJvcGVydHkpKQogICAgICAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKEpTVmFsdWUoYmFzZSkuZ2V0KGV4ZWMsIGpzQ2FzdDxOYW1lSW5z dGFuY2UqPihwcm9wZXJ0eS5hc0NlbGwoKSktPnByaXZhdGVOYW1lKCkpKTsKIAotICAgIElkZW50 aWZpZXIgaWRlbnQoZXhlYywgcHJvcGVydHkudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpKTsK KyAgICBJZGVudGlmaWVyIGlkZW50ID0gcHJvcGVydHkudG9TdHJpbmcoZXhlYyktPnRvSWRlbnRp ZmllcihleGVjKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKEpTVmFsdWUoYmFzZSkuZ2V0 KGV4ZWMsIGlkZW50KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJh dGlvbnMuY3BwCmluZGV4IGFjZTMyZDIuLmY4YTcxZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcApAQCAtMTQyMCw4ICsxNDIwLDEyIEBAIEVuY29kZWRK U1ZhbHVlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uR2V0QXJndW1lbnRzTGVuZ3RoKEV4ZWNTdGF0 ZSogZXhlYywgaW50MzJfCiBzdGF0aWMgSlNWYWx1ZSBnZXRCeVZhbChFeGVjU3RhdGUqIGV4ZWMs IEpTVmFsdWUgYmFzZVZhbHVlLCBKU1ZhbHVlIHN1YnNjcmlwdCwgUmV0dXJuQWRkcmVzc1B0ciBy ZXR1cm5BZGRyZXNzKQogewogICAgIGlmIChMSUtFTFkoYmFzZVZhbHVlLmlzQ2VsbCgpICYmIHN1 YnNjcmlwdC5pc1N0cmluZygpKSkgewotICAgICAgICBpZiAoSlNWYWx1ZSByZXN1bHQgPSBiYXNl VmFsdWUuYXNDZWxsKCktPmZhc3RHZXRPd25Qcm9wZXJ0eShleGVjLT52bSgpLCBhc1N0cmluZyhz dWJzY3JpcHQpLT52YWx1ZShleGVjKSkpCi0gICAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAg ICAgICBWTSYgdm0gPSBleGVjLT52bSgpOworICAgICAgICBTdHJ1Y3R1cmUmIHN0cnVjdHVyZSA9 ICpiYXNlVmFsdWUuYXNDZWxsKCktPnN0cnVjdHVyZSh2bSk7CisgICAgICAgIGlmIChKU0NlbGw6 OmNhblVzZUZhc3RHZXRPd25Qcm9wZXJ0eShzdHJ1Y3R1cmUpKSB7CisgICAgICAgICAgICBpZiAo SlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUuYXNDZWxsKCktPmZhc3RHZXRPd25Qcm9wZXJ0eSh2 bSwgc3RydWN0dXJlLCBhc1N0cmluZyhzdWJzY3JpcHQpLT52YWx1ZShleGVjKSkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGlmIChzdWJz Y3JpcHQuaXNVSW50MzIoKSkgewpAQCAtMTQzNiw3ICsxNDQwLDcgQEAgc3RhdGljIEpTVmFsdWUg Z2V0QnlWYWwoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgSlNWYWx1ZSBzdWJz Y3JpcHQsIFIKICAgICBpZiAoaXNOYW1lKHN1YnNjcmlwdCkpCiAgICAgICAgIHJldHVybiBiYXNl VmFsdWUuZ2V0KGV4ZWMsIGpzQ2FzdDxOYW1lSW5zdGFuY2UqPihzdWJzY3JpcHQuYXNDZWxsKCkp LT5wcml2YXRlTmFtZSgpKTsKIAotICAgIElkZW50aWZpZXIgcHJvcGVydHkoZXhlYywgc3Vic2Ny aXB0LnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSk7CisgICAgSWRlbnRpZmllciBwcm9wZXJ0 eSA9IHN1YnNjcmlwdC50b1N0cmluZyhleGVjKS0+dG9JZGVudGlmaWVyKGV4ZWMpOwogICAgIHJl dHVybiBiYXNlVmFsdWUuZ2V0KGV4ZWMsIHByb3BlcnR5KTsKIH0KIApAQCAtMTUxOCw3ICsxNTIy LDcgQEAgRW5jb2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeVZhbFN0cmlu ZyhFeGVjU3RhdGUqIGV4ZWMsIEVuY29kZWRKU1YKICAgICB9IGVsc2UgaWYgKGlzTmFtZShzdWJz Y3JpcHQpKQogICAgICAgICByZXN1bHQgPSBiYXNlVmFsdWUuZ2V0KGV4ZWMsIGpzQ2FzdDxOYW1l SW5zdGFuY2UqPihzdWJzY3JpcHQuYXNDZWxsKCkpLT5wcml2YXRlTmFtZSgpKTsKICAgICBlbHNl IHsKLSAgICAgICAgSWRlbnRpZmllciBwcm9wZXJ0eShleGVjLCBzdWJzY3JpcHQudG9TdHJpbmco ZXhlYyktPnZhbHVlKGV4ZWMpKTsKKyAgICAgICAgSWRlbnRpZmllciBwcm9wZXJ0eSA9IHN1YnNj cmlwdC50b1N0cmluZyhleGVjKS0+dG9JZGVudGlmaWVyKGV4ZWMpOwogICAgICAgICByZXN1bHQg PSBiYXNlVmFsdWUuZ2V0KGV4ZWMsIHByb3BlcnR5KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCmluZGV4IDEwYzg5ZWIuLjU3YzVl NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRo cy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNw cApAQCAtNzE1LDggKzcxNSwxMiBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZGVs X2J5X2lkKQogaW5saW5lIEpTVmFsdWUgZ2V0QnlWYWwoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVl IGJhc2VWYWx1ZSwgSlNWYWx1ZSBzdWJzY3JpcHQpCiB7CiAgICAgaWYgKExJS0VMWShiYXNlVmFs dWUuaXNDZWxsKCkgJiYgc3Vic2NyaXB0LmlzU3RyaW5nKCkpKSB7Ci0gICAgICAgIGlmIChKU1Zh bHVlIHJlc3VsdCA9IGJhc2VWYWx1ZS5hc0NlbGwoKS0+ZmFzdEdldE93blByb3BlcnR5KGV4ZWMt PnZtKCksIGFzU3RyaW5nKHN1YnNjcmlwdCktPnZhbHVlKGV4ZWMpKSkKLSAgICAgICAgICAgIHJl dHVybiByZXN1bHQ7CisgICAgICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgICAgIFN0cnVj dHVyZSYgc3RydWN0dXJlID0gKmJhc2VWYWx1ZS5hc0NlbGwoKS0+c3RydWN0dXJlKHZtKTsKKyAg ICAgICAgaWYgKEpTQ2VsbDo6Y2FuVXNlRmFzdEdldE93blByb3BlcnR5KHN0cnVjdHVyZSkpIHsK KyAgICAgICAgICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IGJhc2VWYWx1ZS5hc0NlbGwoKS0+ZmFz dEdldE93blByb3BlcnR5KHZtLCBzdHJ1Y3R1cmUsIGFzU3RyaW5nKHN1YnNjcmlwdCktPnZhbHVl KGV4ZWMpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICB9CiAgICAg fQogICAgIAogICAgIGlmIChzdWJzY3JpcHQuaXNVSW50MzIoKSkgewpAQCAtNzMwLDcgKzczNCw3 IEBAIGlubGluZSBKU1ZhbHVlIGdldEJ5VmFsKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBiYXNl VmFsdWUsIEpTVmFsdWUgc3Vic2NyaXB0KQogICAgIGlmIChpc05hbWUoc3Vic2NyaXB0KSkKICAg ICAgICAgcmV0dXJuIGJhc2VWYWx1ZS5nZXQoZXhlYywganNDYXN0PE5hbWVJbnN0YW5jZSo+KHN1 YnNjcmlwdC5hc0NlbGwoKSktPnByaXZhdGVOYW1lKCkpOwogICAgIAotICAgIElkZW50aWZpZXIg cHJvcGVydHkoZXhlYywgc3Vic2NyaXB0LnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSk7Cisg ICAgSWRlbnRpZmllciBwcm9wZXJ0eSA9IHN1YnNjcmlwdC50b1N0cmluZyhleGVjKS0+dG9JZGVu dGlmaWVyKGV4ZWMpOwogICAgIHJldHVybiBiYXNlVmFsdWUuZ2V0KGV4ZWMsIHByb3BlcnR5KTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAppbmRleCAxYzEwZWU0Li4x MDFmZThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaApAQCAtMTQ0LDcg KzE0NCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHphcCgpIHsgKnJlaW50ZXJwcmV0X2Nhc3Q8dWlu dHB0cl90Kio+KHRoaXMpID0gMDsgfQogICAgIGJvb2wgaXNaYXBwZWQoKSBjb25zdCB7IHJldHVy biAhKnJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90KiBjb25zdCo+KHRoaXMpOyB9CiAKLSAgICBK U1ZhbHVlIGZhc3RHZXRPd25Qcm9wZXJ0eShWTSYsIGNvbnN0IFN0cmluZyYpOworICAgIHN0YXRp YyBib29sIGNhblVzZUZhc3RHZXRPd25Qcm9wZXJ0eShjb25zdCBTdHJ1Y3R1cmUmKTsKKyAgICBK U1ZhbHVlIGZhc3RHZXRPd25Qcm9wZXJ0eShWTSYsIFN0cnVjdHVyZSYsIGNvbnN0IFN0cmluZyYp OwogCiAgICAgZW51bSBHQ0RhdGEgOiB1aW50OF90IHsKICAgICAgICAgTWFya2VkID0gMCwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbElubGluZXMuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbElubGluZXMuaAppbmRleCA1OGUx ZThkLi40NWJkOGQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0NlbGxJbmxpbmVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs SW5saW5lcy5oCkBAIC0yMTMsMTkgKzIxMywyMiBAQCBpbmxpbmUgYm9vbCBKU0NlbGw6OmluaGVy aXRzKGNvbnN0IENsYXNzSW5mbyogaW5mbykgY29uc3QKIC8vIGlkZW50aWZpZXIuIFRoZSBmaXJz dCB0aW1lIHdlIHBlcmZvcm0gYSBwcm9wZXJ0eSBhY2Nlc3Mgd2l0aCBhIGdpdmVuIHN0cmluZywg dHJ5CiAvLyBwZXJmb3JtaW5nIHRoZSBwcm9wZXJ0eSBtYXAgbG9va3VwIHdpdGhvdXQgZm9ybWlu ZyBhbiBpZGVudGlmaWVyLiBXZSBkZXRlY3QgdGhpcwogLy8gY2FzZSBieSBjaGVja2luZyB3aGV0 aGVyIHRoZSBoYXNoIGhhcyB5ZXQgYmVlbiBzZXQgZm9yIHRoaXMgc3RyaW5nLgotQUxXQVlTX0lO TElORSBKU1ZhbHVlIEpTQ2VsbDo6ZmFzdEdldE93blByb3BlcnR5KFZNJiB2bSwgY29uc3QgU3Ry aW5nJiBuYW1lKQotewotICAgIFN0cnVjdHVyZSYgc3RydWN0dXJlID0gKnRoaXMtPnN0cnVjdHVy ZSh2bSk7Ci0gICAgaWYgKCFzdHJ1Y3R1cmUudHlwZUluZm8oKS5vdmVycmlkZXNHZXRPd25Qcm9w ZXJ0eVNsb3QoKSAmJiAhc3RydWN0dXJlLmhhc0dldHRlclNldHRlclByb3BlcnRpZXMoKSkgewot ICAgICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBuYW1lLmltcGwoKS0+aGFzSGFzaCgpCi0g ICAgICAgICAgICA/IHN0cnVjdHVyZS5nZXQodm0sIElkZW50aWZpZXIoJnZtLCBuYW1lKSkKLSAg ICAgICAgICAgIDogc3RydWN0dXJlLmdldCh2bSwgbmFtZSk7Ci0gICAgICAgIGlmIChvZmZzZXQg IT0gaW52YWxpZE9mZnNldCkKLSAgICAgICAgICAgIHJldHVybiBhc09iamVjdCh0aGlzKS0+bG9j YXRpb25Gb3JPZmZzZXQob2Zmc2V0KS0+Z2V0KCk7Ci0gICAgfQorQUxXQVlTX0lOTElORSBKU1Zh bHVlIEpTQ2VsbDo6ZmFzdEdldE93blByb3BlcnR5KFZNJiB2bSwgU3RydWN0dXJlJiBzdHJ1Y3R1 cmUsIGNvbnN0IFN0cmluZyYgbmFtZSkKK3sKKyAgICBBU1NFUlQoY2FuVXNlRmFzdEdldE93blBy b3BlcnR5KHZtKSk7CisgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gbmFtZS5pbXBsKCktPmhh c0hhc2goKQorICAgICAgICA/IHN0cnVjdHVyZS5nZXQodm0sIElkZW50aWZpZXIoJnZtLCBuYW1l KSkKKyAgICAgICAgOiBzdHJ1Y3R1cmUuZ2V0KHZtLCBuYW1lKTsKKyAgICBpZiAob2Zmc2V0ICE9 IGludmFsaWRPZmZzZXQpCisgICAgICAgIHJldHVybiBhc09iamVjdCh0aGlzKS0+bG9jYXRpb25G b3JPZmZzZXQob2Zmc2V0KS0+Z2V0KCk7CiAgICAgcmV0dXJuIEpTVmFsdWUoKTsKIH0KIAoraW5s aW5lIGJvb2wgSlNDZWxsOjpjYW5Vc2VGYXN0R2V0T3duUHJvcGVydHkoY29uc3QgU3RydWN0dXJl JiBzdHJ1Y3R1cmUpCit7CisgICAgcmV0dXJuICFzdHJ1Y3R1cmUuaGFzR2V0dGVyU2V0dGVyUHJv cGVydGllcygpICYmICFzdHJ1Y3R1cmUudHlwZUluZm8oKS5vdmVycmlkZXNHZXRPd25Qcm9wZXJ0 eVNsb3QoKTsKK30KKwogaW5saW5lIGJvb2wgSlNDZWxsOjp0b0Jvb2xlYW4oRXhlY1N0YXRlKiBl eGVjKSBjb25zdAogewogICAgIGlmIChpc1N0cmluZygpKSAK