158250 2016-05-31 21:47:27 -0700 Dictionary property access should be fast 2016-06-01 12:31:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren barraclough commit-queue keith_miller mark.lam msaboff oliver saam oldest_to_newest 1198070 0 ggaren 2016-05-31 21:47:27 -0700 Dictionary property access should be fast 1198073 1 280212 ggaren 2016-05-31 21:53:43 -0700 Created attachment 280212 Patch 1198074 2 280213 ggaren 2016-05-31 22:00:25 -0700 Created attachment 280213 Patch 1198181 3 280213 keith_miller 2016-06-01 09:36:24 -0700 Comment on attachment 280213 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=280213&action=review r=me with comments. > Source/JavaScriptCore/runtime/JSObject.cpp:2004 > - if (structure()->isDictionary()) { > + if (structure()->isUncacheableDictionary()) { I think it would be useful to have a comment stating that JSObject::putDirectInternal will transition the structure on an attribute change. Also, do we have tests for this? > Source/JavaScriptCore/runtime/JSObject.h:1228 > - if (structure.isDictionary()) { > + if (structure.isUncacheableDictionary()) { Ditto. 1198233 4 ggaren 2016-06-01 12:28:28 -0700 > > Source/JavaScriptCore/runtime/JSObject.cpp:2004 > > - if (structure()->isDictionary()) { > > + if (structure()->isUncacheableDictionary()) { > > I think it would be useful to have a comment stating that > JSObject::putDirectInternal will transition the structure on an attribute > change. Okeedokee. > Also, do we have tests for this? I checked SVN history and it looks like the change to putDirect corresponded to some web standards test suites. 1198234 5 ggaren 2016-06-01 12:31:15 -0700 Committed r201562: <http://trac.webkit.org/changeset/201562> 280212 2016-05-31 21:53:43 -0700 2016-05-31 22:00:22 -0700 Patch bug-158250-20160531215500.patch text/plain 5482 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxNTQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE2LTA1LTMxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRGljdGlvbmFyeSBwcm9wZXJ0eSBhY2Nlc3Mgc2hvdWxkIGJlIGZhc3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI1MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgc29tZSByZW1uYW50 IGNvZGUgdGhhdCB1bm5lY2Vzc2FyaWx5IHRha2VzIGEgc2xvdyBwYXRoIGZvcgorICAgICAgICBk aWN0aW9uYXJpZXMuIFRoaXMgY2F1c2VkIHRoZSBEcm9tYWVvIHJlZ3Jlc3Npb24gaW4gcjIwMTQz Ni4gTGV0J3MgZml4CisgICAgICAgIHRoYXQuCisKKyAgICAgICAgKiBqaXQvUmVwYXRjaC5jcHA6 CisgICAgICAgIChKU0M6OnRyeUNhY2hlR2V0QnlJRCk6IEF0dGVtcHQgdG8gZmxhdHRlbiBhIGRp Y3Rpb25hcnkgaWYgbmVjZXNzYXJ5LCBidXQKKyAgICAgICAgbm90IHRvbyBtdWNoLiBUaGlzIGlz IG91ciBpZGlvbSBpbiBvdGhlciBwbGFjZXMuCisKKyAgICAgICAgKEpTQzo6dHJ5Q2FjaGVQdXRC eUlEKTogU2VlIHRyeUNhY2hlR2V0QnlJRC4KKworICAgICAgICAqIGxsaW50L0xMSW50U2xvd1Bh dGhzLmNwcDoKKyAgICAgICAgKEpTQzo6TExJbnQ6OnNldHVwR2V0QnlJZFByb3RvdHlwZUNhY2hl KTogU2VlIHRyeUNhY2hlR2V0QnlJRC4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3Bw OgorICAgICAgICAoSlNDOjpKU09iamVjdDo6ZmlsbEdldHRlclByb3BlcnR5U2xvdCk6CisgICAg ICAgICogcnVudGltZS9KU09iamVjdC5oOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6ZmlsbEN1 c3RvbUdldHRlclByb3BlcnR5U2xvdCk6IFdlJ3JlIGFsbG93ZWQgdG8gY2FjaGUKKyAgICAgICAg Z2V0dGVycyBldmVuIGluIGRpY3Rpb25hcmllcy4gSlNPYmplY3Q6OnB1dERpcmVjdEludGVybmFs IHdpbGwgcGVyZm9ybQorICAgICAgICBhIFN0cnVjdHVyZSB0cmFuc2l0aW9uIHdoZW4gYSBwcm9w ZXJ0eSB0cmFuc2l0aW9ucyB0by9mcm9tIGdldHRlci4KKwogMjAxNi0wNS0zMSAgWXVzdWtlIFN1 enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs IG91dCByMjAxNDgxLCByMjAxNTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5lIGNvZGUtbG9h ZApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCShyZXZpc2lvbiAyMDE0 MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOTcsOCArMjk3LDE0IEBAIHN0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNo ZUdldEJ5SUQKICAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gc2xvdC5pc1Vuc2V0KCkg PyBpbnZhbGlkT2Zmc2V0IDogc2xvdC5jYWNoZWRPZmZzZXQoKTsKIAogICAgICAgICBpZiAoc2xv dC5pc1Vuc2V0KCkgfHwgc2xvdC5zbG90QmFzZSgpICE9IGJhc2VWYWx1ZSkgewotICAgICAgICAg ICAgaWYgKHN0cnVjdHVyZS0+dHlwZUluZm8oKS5wcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcoKSB8 fCBzdHJ1Y3R1cmUtPmlzRGljdGlvbmFyeSgpKQorICAgICAgICAgICAgaWYgKHN0cnVjdHVyZS0+ dHlwZUluZm8oKS5wcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcoKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gR2l2ZVVwT25DYWNoZTsKKworICAgICAgICAgICAgaWYgKHN0cnVjdHVyZS0+aXNEaWN0 aW9uYXJ5KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoc3RydWN0dXJlLT5oYXNCZWVuRmxhdHRl bmVkQmVmb3JlKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBHaXZlVXBPbkNhY2hlOwor ICAgICAgICAgICAgICAgIHN0cnVjdHVyZS0+ZmxhdHRlbkRpY3Rpb25hcnlTdHJ1Y3R1cmUodm0s IGpzQ2FzdDxKU09iamVjdCo+KGJhc2VDZWxsKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICAKICAgICAgICAgICAgIGlmIChzbG90LmlzVW5zZXQoKSAmJiBzdHJ1Y3R1cmUtPnR5cGVJbmZv KCkuZ2V0T3duUHJvcGVydHlTbG90SXNJbXB1cmVGb3JQcm9wZXJ0eUFic2VuY2UoKSkKICAgICAg ICAgICAgICAgICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKQEAgLTQ0NSw5ICs0NTEsMTUgQEAgc3Rh dGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlUHV0QnlJRAogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgQVNTRVJUKHNsb3QudHlwZSgpID09IFB1dFByb3BlcnR5U2xvdDo6TmV3UHJv cGVydHkpOwogCi0gICAgICAgICAgICBpZiAoIXN0cnVjdHVyZS0+aXNPYmplY3QoKSB8fCBzdHJ1 Y3R1cmUtPmlzRGljdGlvbmFyeSgpKQorICAgICAgICAgICAgaWYgKCFzdHJ1Y3R1cmUtPmlzT2Jq ZWN0KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEdpdmVVcE9uQ2FjaGU7CiAKKyAgICAgICAg ICAgIGlmIChzdHJ1Y3R1cmUtPmlzRGljdGlvbmFyeSgpKSB7CisgICAgICAgICAgICAgICAgaWYg KHN0cnVjdHVyZS0+aGFzQmVlbkZsYXR0ZW5lZEJlZm9yZSgpKQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKKyAgICAgICAgICAgICAgICBzdHJ1Y3R1cmUtPmZsYXR0 ZW5EaWN0aW9uYXJ5U3RydWN0dXJlKHZtLCBqc0Nhc3Q8SlNPYmplY3QqPihiYXNlVmFsdWUpKTsK KyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0OwogICAg ICAgICAgICAgU3RydWN0dXJlKiBuZXdTdHJ1Y3R1cmUgPQogICAgICAgICAgICAgICAgIFN0cnVj dHVyZTo6YWRkUHJvcGVydHlUcmFuc2l0aW9uVG9FeGlzdGluZ1N0cnVjdHVyZUNvbmN1cnJlbnRs eSgKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhz LmNwcAkocmV2aXNpb24gMjAxNDI3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xM SW50U2xvd1BhdGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTg2LDkgKzU4NiwxNSBAQCBzdGF0 aWMgdm9pZCBzZXR1cEdldEJ5SWRQcm90b3R5cGVDYWNoZShFCiAgICAgQ29kZUJsb2NrKiBjb2Rl QmxvY2sgPSBleGVjLT5jb2RlQmxvY2soKTsKICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGJh c2VDZWxsLT5zdHJ1Y3R1cmUoKTsKIAotICAgIGlmIChzdHJ1Y3R1cmUtPnR5cGVJbmZvKCkucHJv aGliaXRzUHJvcGVydHlDYWNoaW5nKCkgfHwgc3RydWN0dXJlLT5pc0RpY3Rpb25hcnkoKSkKKyAg ICBpZiAoc3RydWN0dXJlLT50eXBlSW5mbygpLnByb2hpYml0c1Byb3BlcnR5Q2FjaGluZygpKQog ICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoc3RydWN0dXJlLT5pc0RpY3Rpb25hcnkoKSkgewor ICAgICAgICBpZiAoc3RydWN0dXJlLT5oYXNCZWVuRmxhdHRlbmVkQmVmb3JlKCkpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIHN0cnVjdHVyZS0+ZmxhdHRlbkRpY3Rpb25hcnlTdHJ1Y3R1 cmUodm0sIGpzQ2FzdDxKU09iamVjdCo+KGJhc2VDZWxsKSk7CisgICAgfQorCiAgICAgT2JqZWN0 UHJvcGVydHlDb25kaXRpb25TZXQgY29uZGl0aW9ucyA9IGdlbmVyYXRlQ29uZGl0aW9uc0ZvclBy b3RvdHlwZVByb3BlcnR5SGl0KHZtLCBjb2RlQmxvY2ssIGV4ZWMsIHN0cnVjdHVyZSwgc2xvdC5z bG90QmFzZSgpLCBpZGVudC5pbXBsKCkpOwogCiAgICAgaWYgKCFjb25kaXRpb25zLmlzVmFsaWQo KSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJKHJl dmlzaW9uIDIwMTQyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk5MCw3ICsxOTkwLDcgQEAgYm9vbCBKU09iamVjdDo6 cmVtb3ZlRGlyZWN0KFZNJiB2bSwgUHJvcAogCiBORVZFUl9JTkxJTkUgdm9pZCBKU09iamVjdDo6 ZmlsbEdldHRlclByb3BlcnR5U2xvdChQcm9wZXJ0eVNsb3QmIHNsb3QsIEpTVmFsdWUgZ2V0dGVy U2V0dGVyLCB1bnNpZ25lZCBhdHRyaWJ1dGVzLCBQcm9wZXJ0eU9mZnNldCBvZmZzZXQpCiB7Ci0g ICAgaWYgKHN0cnVjdHVyZSgpLT5pc0RpY3Rpb25hcnkoKSkgeworICAgIGlmIChzdHJ1Y3R1cmUo KS0+aXNVbmNhY2hlYWJsZURpY3Rpb25hcnkoKSkgewogICAgICAgICBzbG90LnNldEdldHRlclNs b3QodGhpcywgYXR0cmlidXRlcywganNDYXN0PEdldHRlclNldHRlcio+KGdldHRlclNldHRlcikp OwogICAgICAgICByZXR1cm47CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU09iamVjdC5oCShyZXZpc2lvbiAyMDE0MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjIxLDcgKzEyMjEsNyBA QCBBTFdBWVNfSU5MSU5FIGJvb2wgSlNPYmplY3Q6OmdldE93bk5vbkluCiAKIEFMV0FZU19JTkxJ TkUgdm9pZCBKU09iamVjdDo6ZmlsbEN1c3RvbUdldHRlclByb3BlcnR5U2xvdChQcm9wZXJ0eVNs b3QmIHNsb3QsIEpTVmFsdWUgY3VzdG9tR2V0dGVyU2V0dGVyLCB1bnNpZ25lZCBhdHRyaWJ1dGVz LCBTdHJ1Y3R1cmUmIHN0cnVjdHVyZSkKIHsKLSAgICBpZiAoc3RydWN0dXJlLmlzRGljdGlvbmFy eSgpKSB7CisgICAgaWYgKHN0cnVjdHVyZS5pc1VuY2FjaGVhYmxlRGljdGlvbmFyeSgpKSB7CiAg ICAgICAgIHNsb3Quc2V0Q3VzdG9tKHRoaXMsIGF0dHJpYnV0ZXMsIGpzQ2FzdDxDdXN0b21HZXR0 ZXJTZXR0ZXIqPihjdXN0b21HZXR0ZXJTZXR0ZXIpLT5nZXR0ZXIoKSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9Cg== 280213 2016-05-31 22:00:25 -0700 2016-06-01 09:36:24 -0700 Patch bug-158250-20160531220142.patch text/plain 4513 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxNTQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE2LTA1LTMxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRGljdGlvbmFyeSBwcm9wZXJ0eSBhY2Nlc3Mgc2hvdWxkIGJlIGZhc3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI1MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgc29tZSByZW1uYW50 IGNvZGUgdGhhdCB1bm5lY2Vzc2FyaWx5IHRha2VzIGEgc2xvdyBwYXRoIGZvcgorICAgICAgICBk aWN0aW9uYXJpZXMuIFRoaXMgY2F1c2VkIHRoZSBEcm9tYWVvIHJlZ3Jlc3Npb24gaW4gcjIwMTQz Ni4gTGV0J3MgZml4CisgICAgICAgIHRoYXQuCisKKyAgICAgICAgKiBqaXQvUmVwYXRjaC5jcHA6 CisgICAgICAgIChKU0M6OnRyeUNhY2hlR2V0QnlJRCk6IEF0dGVtcHQgdG8gZmxhdHRlbiBhIGRp Y3Rpb25hcnkgaWYgbmVjZXNzYXJ5LCBidXQKKyAgICAgICAgbm90IHRvbyBtdWNoLiBUaGlzIGlz IG91ciBpZGlvbSBpbiBvdGhlciBwbGFjZXMuCisKKyAgICAgICAgKEpTQzo6dHJ5Q2FjaGVQdXRC eUlEKTogU2VlIHRyeUNhY2hlR2V0QnlJRC4KKworICAgICAgICAqIGxsaW50L0xMSW50U2xvd1Bh dGhzLmNwcDoKKyAgICAgICAgKEpTQzo6TExJbnQ6OnNldHVwR2V0QnlJZFByb3RvdHlwZUNhY2hl KTogU2VlIHRyeUNhY2hlR2V0QnlJRC4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3Bw OgorICAgICAgICAoSlNDOjpKU09iamVjdDo6ZmlsbEdldHRlclByb3BlcnR5U2xvdCk6CisgICAg ICAgICogcnVudGltZS9KU09iamVjdC5oOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6ZmlsbEN1 c3RvbUdldHRlclByb3BlcnR5U2xvdCk6IFdlJ3JlIGFsbG93ZWQgdG8gY2FjaGUKKyAgICAgICAg Z2V0dGVycyBldmVuIGluIGRpY3Rpb25hcmllcy4gSlNPYmplY3Q6OnB1dERpcmVjdEludGVybmFs IHdpbGwgcGVyZm9ybQorICAgICAgICBhIFN0cnVjdHVyZSB0cmFuc2l0aW9uIHdoZW4gYSBwcm9w ZXJ0eSB0cmFuc2l0aW9ucyB0by9mcm9tIGdldHRlci4KKwogMjAxNi0wNS0zMSAgWXVzdWtlIFN1 enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs IG91dCByMjAxNDgxLCByMjAxNTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5lIGNvZGUtbG9h ZApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCShyZXZpc2lvbiAyMDE1 NDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOTcsOCArMjk3LDE0IEBAIHN0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNo ZUdldEJ5SUQKICAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gc2xvdC5pc1Vuc2V0KCkg PyBpbnZhbGlkT2Zmc2V0IDogc2xvdC5jYWNoZWRPZmZzZXQoKTsKIAogICAgICAgICBpZiAoc2xv dC5pc1Vuc2V0KCkgfHwgc2xvdC5zbG90QmFzZSgpICE9IGJhc2VWYWx1ZSkgewotICAgICAgICAg ICAgaWYgKHN0cnVjdHVyZS0+dHlwZUluZm8oKS5wcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcoKSB8 fCBzdHJ1Y3R1cmUtPmlzRGljdGlvbmFyeSgpKQorICAgICAgICAgICAgaWYgKHN0cnVjdHVyZS0+ dHlwZUluZm8oKS5wcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcoKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gR2l2ZVVwT25DYWNoZTsKKworICAgICAgICAgICAgaWYgKHN0cnVjdHVyZS0+aXNEaWN0 aW9uYXJ5KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoc3RydWN0dXJlLT5oYXNCZWVuRmxhdHRl bmVkQmVmb3JlKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBHaXZlVXBPbkNhY2hlOwor ICAgICAgICAgICAgICAgIHN0cnVjdHVyZS0+ZmxhdHRlbkRpY3Rpb25hcnlTdHJ1Y3R1cmUodm0s IGpzQ2FzdDxKU09iamVjdCo+KGJhc2VDZWxsKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICAKICAgICAgICAgICAgIGlmIChzbG90LmlzVW5zZXQoKSAmJiBzdHJ1Y3R1cmUtPnR5cGVJbmZv KCkuZ2V0T3duUHJvcGVydHlTbG90SXNJbXB1cmVGb3JQcm9wZXJ0eUFic2VuY2UoKSkKICAgICAg ICAgICAgICAgICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKQEAgLTQ0NSw5ICs0NTEsMTUgQEAgc3Rh dGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlUHV0QnlJRAogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgQVNTRVJUKHNsb3QudHlwZSgpID09IFB1dFByb3BlcnR5U2xvdDo6TmV3UHJv cGVydHkpOwogCi0gICAgICAgICAgICBpZiAoIXN0cnVjdHVyZS0+aXNPYmplY3QoKSB8fCBzdHJ1 Y3R1cmUtPmlzRGljdGlvbmFyeSgpKQorICAgICAgICAgICAgaWYgKCFzdHJ1Y3R1cmUtPmlzT2Jq ZWN0KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEdpdmVVcE9uQ2FjaGU7CiAKKyAgICAgICAg ICAgIGlmIChzdHJ1Y3R1cmUtPmlzRGljdGlvbmFyeSgpKSB7CisgICAgICAgICAgICAgICAgaWYg KHN0cnVjdHVyZS0+aGFzQmVlbkZsYXR0ZW5lZEJlZm9yZSgpKQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKKyAgICAgICAgICAgICAgICBzdHJ1Y3R1cmUtPmZsYXR0 ZW5EaWN0aW9uYXJ5U3RydWN0dXJlKHZtLCBqc0Nhc3Q8SlNPYmplY3QqPihiYXNlVmFsdWUpKTsK KyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0OwogICAg ICAgICAgICAgU3RydWN0dXJlKiBuZXdTdHJ1Y3R1cmUgPQogICAgICAgICAgICAgICAgIFN0cnVj dHVyZTo6YWRkUHJvcGVydHlUcmFuc2l0aW9uVG9FeGlzdGluZ1N0cnVjdHVyZUNvbmN1cnJlbnRs eSgKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJKHJl dmlzaW9uIDIwMTU0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAwMSw3ICsyMDAxLDcgQEAgYm9vbCBKU09iamVjdDo6 cmVtb3ZlRGlyZWN0KFZNJiB2bSwgUHJvcAogCiBORVZFUl9JTkxJTkUgdm9pZCBKU09iamVjdDo6 ZmlsbEdldHRlclByb3BlcnR5U2xvdChQcm9wZXJ0eVNsb3QmIHNsb3QsIEpTVmFsdWUgZ2V0dGVy U2V0dGVyLCB1bnNpZ25lZCBhdHRyaWJ1dGVzLCBQcm9wZXJ0eU9mZnNldCBvZmZzZXQpCiB7Ci0g ICAgaWYgKHN0cnVjdHVyZSgpLT5pc0RpY3Rpb25hcnkoKSkgeworICAgIGlmIChzdHJ1Y3R1cmUo KS0+aXNVbmNhY2hlYWJsZURpY3Rpb25hcnkoKSkgewogICAgICAgICBzbG90LnNldEdldHRlclNs b3QodGhpcywgYXR0cmlidXRlcywganNDYXN0PEdldHRlclNldHRlcio+KGdldHRlclNldHRlcikp OwogICAgICAgICByZXR1cm47CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU09iamVjdC5oCShyZXZpc2lvbiAyMDE1NDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjI1LDcgKzEyMjUsNyBA QCBBTFdBWVNfSU5MSU5FIGJvb2wgSlNPYmplY3Q6OmdldE93bk5vbkluCiAKIEFMV0FZU19JTkxJ TkUgdm9pZCBKU09iamVjdDo6ZmlsbEN1c3RvbUdldHRlclByb3BlcnR5U2xvdChQcm9wZXJ0eVNs b3QmIHNsb3QsIEpTVmFsdWUgY3VzdG9tR2V0dGVyU2V0dGVyLCB1bnNpZ25lZCBhdHRyaWJ1dGVz LCBTdHJ1Y3R1cmUmIHN0cnVjdHVyZSkKIHsKLSAgICBpZiAoc3RydWN0dXJlLmlzRGljdGlvbmFy eSgpKSB7CisgICAgaWYgKHN0cnVjdHVyZS5pc1VuY2FjaGVhYmxlRGljdGlvbmFyeSgpKSB7CiAg ICAgICAgIHNsb3Quc2V0Q3VzdG9tKHRoaXMsIGF0dHJpYnV0ZXMsIGpzQ2FzdDxDdXN0b21HZXR0 ZXJTZXR0ZXIqPihjdXN0b21HZXR0ZXJTZXR0ZXIpLT5nZXR0ZXIoKSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9Cg==