119359 2013-07-31 16:55:29 -0700 More cleanup in PropertySlot 2013-07-31 18:08:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue oldest_to_newest 913542 0 barraclough 2013-07-31 16:55:29 -0700 m_slotBase is overloaded to store the (receiver) thisValue and the object that contains the property, This is confusing, and means that slotBase cannot be typed correctly (can only be a JSObject). 913546 1 207888 barraclough 2013-07-31 16:56:58 -0700 Created attachment 207888 fix 913547 2 207888 ggaren 2013-07-31 16:59:19 -0700 Comment on attachment 207888 fix r=me 913549 3 commit-queue 2013-07-31 16:59:44 -0700 Attachment 207888 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/dfg/DFGRepatch.cpp', u'Source/JavaScriptCore/jit/JITStubs.cpp', u'Source/JavaScriptCore/runtime/JSObject.cpp', u'Source/JavaScriptCore/runtime/JSObject.h', u'Source/JavaScriptCore/runtime/PropertySlot.cpp', u'Source/JavaScriptCore/runtime/PropertySlot.h', u'Source/JavaScriptCore/runtime/SparseArrayValueMap.cpp', u'Source/JavaScriptCore/runtime/SparseArrayValueMap.h']" exit_code: 1 Source/JavaScriptCore/runtime/PropertySlot.h:62: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] Source/JavaScriptCore/runtime/PropertySlot.h:62: The parameter name "propertyName" adds no information, so it should be removed. [readability/parameter_name] [5] Source/JavaScriptCore/runtime/PropertySlot.h:63: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 913580 4 barraclough 2013-07-31 18:08:17 -0700 Committed revision 153556. 207888 2013-07-31 16:56:58 -0700 2013-07-31 16:59:19 -0700 fix 119359.1.patch text/plain 14885 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUzNTQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBA CisyMDEzLTA3LTMxICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBNb3JlIGNsZWFudXAgaW4gUHJvcGVydHlTbG90CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkzNTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3Nsb3RCYXNlIGlzIG92ZXJsb2FkZWQg dG8gc3RvcmUgdGhlIChyZWNlaXZlcikgdGhpc1ZhbHVlIGFuZCB0aGUgb2JqZWN0IHRoYXQgY29u dGFpbnMgdGhlIHByb3BlcnR5LAorICAgICAgICBUaGlzIGlzIGNvbmZ1c2luZywgYW5kIG1lYW5z IHRoYXQgc2xvdEJhc2UgY2Fubm90IGJlIHR5cGVkIGNvcnJlY3RseSAoY2FuIG9ubHkgYmUgYSBK U09iamVjdCkuCisKKyAgICAgICAgKiBkZmcvREZHUmVwYXRjaC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6dHJ5Q2FjaGVHZXRCeUlEKToKKyAgICAgICAgKEpTQzo6REZHOjp0cnlCdWlsZEdldEJ5 SURMaXN0KToKKyAgICAgICAgICAgIC0gTm8gbmVlZCB0byBBU1NFUlQgc2xvdEJhc2UgaXMgYW4g b2JqZWN0LgorICAgICAgICAqIGppdC9KSVRTdHVicy5jcHA6CisgICAgICAgIChKU0M6OnRyeUNh Y2hlR2V0QnlJRCk6CisgICAgICAgIChKU0M6OkRFRklORV9TVFVCX0ZVTkNUSU9OKToKKyAgICAg ICAgICAgIC0gTm8gbmVlZCB0byBBU1NFUlQgc2xvdEJhc2UgaXMgYW4gb2JqZWN0LgorICAgICAg ICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6Z2V0T3du UHJvcGVydHlTbG90QnlJbmRleCk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpmaWxsR2V0dGVy UHJvcGVydHlTbG90KToKKyAgICAgICAgICAgIC0gUGFzcyBhbiBvYmplY3QgdGhyb3VnaCB0byBz ZXRHZXR0ZXJTbG90LgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuaDoKKyAgICAgICAgKEpT Qzo6UHJvcGVydHlTbG90OjpnZXRWYWx1ZSk6CisgICAgICAgICAgICAtIE1vdmVkIGZyb20gUHJv cGVydHlTbG90IChuZWVkIHRvIGtub3cgYW5vdXQgSlNPYmplY3QpLgorICAgICAgICAqIHJ1bnRp bWUvUHJvcGVydHlTbG90LmNwcDoKKyAgICAgICAgKEpTQzo6UHJvcGVydHlTbG90OjpmdW5jdGlv bkdldHRlcik6CisgICAgICAgICAgICAtIHVwZGF0ZSBwZXIgbWVtYmVyIG5hbWUgY2hhbmdlcwor ICAgICAgICAqIHJ1bnRpbWUvUHJvcGVydHlTbG90Lmg6CisgICAgICAgIChKU0M6OlByb3BlcnR5 U2xvdDo6UHJvcGVydHlTbG90KToKKyAgICAgICAgICAgIC0gQXJndW1lbnQgdG8gY29uc3RydWN0 b3Igc2V0IHRvICd0aGlzVmFsdWUnLgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVNsb3Q6OnNsb3RC YXNlKToKKyAgICAgICAgICAgIC0gVGhpcyByZXR1cm5zIGEgSlNPYmplY3QqLgorICAgICAgICAo SlNDOjpQcm9wZXJ0eVNsb3Q6OnNldFZhbHVlKToKKyAgICAgICAgKEpTQzo6UHJvcGVydHlTbG90 OjpzZXRDdXN0b20pOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVNsb3Q6OnNldENhY2hlYWJsZUN1 c3RvbSk6CisgICAgICAgIChKU0M6OlByb3BlcnR5U2xvdDo6c2V0Q3VzdG9tSW5kZXgpOgorICAg ICAgICAoSlNDOjpQcm9wZXJ0eVNsb3Q6OnNldEdldHRlclNsb3QpOgorICAgICAgICAoSlNDOjpQ cm9wZXJ0eVNsb3Q6OnNldENhY2hlYWJsZUdldHRlclNsb3QpOgorICAgICAgICAgICAgLSBzbG90 QmFzZSBpcyBhIEpTT2JqZWN0KiwgbWFrZSBzZXRHZXR0ZXJTbG90IHNldCBzbG90QmFzZSBmb3Ig Y29uc2lzdGVuY3kuCisgICAgICAgICogcnVudGltZS9TcGFyc2VBcnJheVZhbHVlTWFwLmNwcDoK KyAgICAgICAgKEpTQzo6U3BhcnNlQXJyYXlFbnRyeTo6Z2V0KToKKyAgICAgICAgICAgIC0gUGFz cyBhbiBvYmplY3QgdGhyb3VnaCB0byBzZXRHZXR0ZXJTbG90LgorICAgICAgICAqIHJ1bnRpbWUv U3BhcnNlQXJyYXlWYWx1ZU1hcC5oOgorICAgICAgICAgICAgLSBQYXNzIGFuIG9iamVjdCB0aHJv dWdoIHRvIHNldEdldHRlclNsb3QuCisKIDIwMTMtMDctMzEgIFJ1dGggRm9uZyAgPHJ1dGhfZm9u Z0BhcHBsZS5jb20+CiAKICAgICAgICAgPGlucHV0IHR5cGU9Y29sb3I+IE1hYyBVSSBiZWhhdmlv dXIKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUmVwYXRjaC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcAkocmV2aXNp b24gMTUzNTM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzQ5LDggKzM0OSw2IEBAIHN0YXRpYyBib29sIHRyeUNhY2hlR2V0 QnlJRChFeGVjU3RhdGUqIGUKIAogICAgIFN0cnVjdHVyZUNoYWluKiBwcm90b3R5cGVDaGFpbiA9 IHN0cnVjdHVyZS0+cHJvdG90eXBlQ2hhaW4oZXhlYyk7CiAgICAgCi0gICAgQVNTRVJUKHNsb3Qu c2xvdEJhc2UoKS5pc09iamVjdCgpKTsKLSAgICAKICAgICBnZW5lcmF0ZVByb3RvQ2hhaW5BY2Nl c3NTdHViKGV4ZWMsIHN0dWJJbmZvLCBwcm90b3R5cGVDaGFpbiwgY291bnQsIG9mZnNldCwgc3Ry dWN0dXJlLCBzdHViSW5mby5jYWxsUmV0dXJuTG9jYXRpb24ubGFiZWxBdE9mZnNldChzdHViSW5m by5wYXRjaC5kZmcuZGVsdGFDYWxsVG9Eb25lKSwgc3R1YkluZm8uY2FsbFJldHVybkxvY2F0aW9u LmxhYmVsQXRPZmZzZXQoc3R1YkluZm8ucGF0Y2guZGZnLmRlbHRhQ2FsbFRvU2xvd0Nhc2UpLCBz dHViSW5mby5zdHViUm91dGluZSk7CiAgICAgCiAgICAgUmVwYXRjaEJ1ZmZlciByZXBhdGNoQnVm ZmVyKGNvZGVCbG9jayk7CkBAIC00NDIsOCArNDQwLDYgQEAgc3RhdGljIGJvb2wgdHJ5QnVpbGRH ZXRCeUlETGlzdChFeGVjU3RhdAogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQogICAgIAotICAgICAgICBBU1NFUlQoc2xvdC5zbG90QmFzZSgpLmlzT2JqZWN0KCkpOwot ICAgIAogICAgICAgICBQb2x5bW9ycGhpY0FjY2Vzc1N0cnVjdHVyZUxpc3QqIHBvbHltb3JwaGlj U3RydWN0dXJlTGlzdDsKICAgICAgICAgaW50IGxpc3RJbmRleDsKICAgICAgICAgQ29kZUxvY2F0 aW9uTGFiZWwgc2xvd0Nhc2U7CkBAIC01NzcsOCArNTczLDYgQEAgc3RhdGljIGJvb2wgdHJ5QnVp bGRHZXRCeUlETGlzdChFeGVjU3RhdAogICAgIGlmIChiYXNlVmFsdWUuYXNDZWxsKCktPnN0cnVj dHVyZSgpLT50eXBlSW5mbygpLnByb2hpYml0c1Byb3BlcnR5Q2FjaGluZygpIHx8ICFzbG90Lmlz Q2FjaGVhYmxlVmFsdWUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgQVNTRVJUKHNs b3Quc2xvdEJhc2UoKS5pc09iamVjdCgpKTsKLSAgICAKICAgICBQcm9wZXJ0eU9mZnNldCBvZmZz ZXQgPSBzbG90LmNhY2hlZE9mZnNldCgpOwogICAgIHNpemVfdCBjb3VudCA9IG5vcm1hbGl6ZVBy b3RvdHlwZUNoYWluRm9yQ2hhaW5BY2Nlc3MoZXhlYywgYmFzZVZhbHVlLCBzbG90LnNsb3RCYXNl KCksIGlkZW50LCBvZmZzZXQpOwogICAgIGlmIChjb3VudCA9PSBJbnZhbGlkUHJvdG90eXBlQ2hh aW4pCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcAkocmV2aXNpb24g MTUzNTM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIzNiw4ICsyMzYsNiBAQCBORVZFUl9JTkxJTkUgc3RhdGljIHZvaWQgdHJ5 Q2FjaGVHZXRCeUlECiAgICAgfQogCiAgICAgaWYgKHNsb3Quc2xvdEJhc2UoKSA9PSBzdHJ1Y3R1 cmUtPnByb3RvdHlwZUZvckxvb2t1cChjYWxsRnJhbWUpKSB7Ci0gICAgICAgIEFTU0VSVChzbG90 LnNsb3RCYXNlKCkuaXNPYmplY3QoKSk7Ci0gICAgICAgIAogICAgICAgICBKU09iamVjdCogc2xv dEJhc2VPYmplY3QgPSBhc09iamVjdChzbG90LnNsb3RCYXNlKCkpOwogICAgICAgICBzaXplX3Qg b2Zmc2V0ID0gc2xvdC5jYWNoZWRPZmZzZXQoKTsKIApAQCAtNjUzLDggKzY1MSw2IEBAIERFRklO RV9TVFVCX0ZVTkNUSU9OKEVuY29kZWRKU1ZhbHVlLCBvcF8KICAgICAgICAgJiYgIWJhc2VWYWx1 ZS5hc0NlbGwoKS0+c3RydWN0dXJlKCktPmlzVW5jYWNoZWFibGVEaWN0aW9uYXJ5KCkKICAgICAg ICAgJiYgc2xvdC5zbG90QmFzZSgpID09IGJhc2VWYWx1ZSkgewogCi0gICAgICAgIEFTU0VSVChz bG90LnNsb3RCYXNlKCkuaXNPYmplY3QoKSk7Ci0KICAgICAgICAgUG9seW1vcnBoaWNBY2Nlc3NT dHJ1Y3R1cmVMaXN0KiBwb2x5bW9ycGhpY1N0cnVjdHVyZUxpc3Q7CiAgICAgICAgIGludCBsaXN0 SW5kZXggPSAxOwogCkBAIC03NjYsNyArNzYyLDYgQEAgREVGSU5FX1NUVUJfRlVOQ1RJT04oRW5j b2RlZEpTVmFsdWUsIG9wXwogICAgIAogICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gYmFzZVZh bHVlLmFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKTsKIAotICAgIEFTU0VSVChzbG90LnNsb3RCYXNlKCku aXNPYmplY3QoKSk7CiAgICAgSlNPYmplY3QqIHNsb3RCYXNlT2JqZWN0ID0gYXNPYmplY3Qoc2xv dC5zbG90QmFzZSgpKTsKICAgICAKICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBzbG90LmNh Y2hlZE9mZnNldCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl Y3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq ZWN0LmNwcAkocmV2aXNpb24gMTUzNTM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTksNyArMzE5LDcgQEAgYm9vbCBK U09iamVjdDo6Z2V0T3duUHJvcGVydHlTbG90QnlJbmRleAogICAgICAgICB9IGVsc2UgaWYgKFNw YXJzZUFycmF5VmFsdWVNYXAqIG1hcCA9IHN0b3JhZ2UtPm1fc3BhcnNlTWFwLmdldCgpKSB7CiAg ICAgICAgICAgICBTcGFyc2VBcnJheVZhbHVlTWFwOjppdGVyYXRvciBpdCA9IG1hcC0+ZmluZChp KTsKICAgICAgICAgICAgIGlmIChpdCAhPSBtYXAtPm5vdEZvdW5kKCkpIHsKLSAgICAgICAgICAg ICAgICBpdC0+dmFsdWUuZ2V0KHNsb3QpOworICAgICAgICAgICAgICAgIGl0LT52YWx1ZS5nZXQo dGhpc09iamVjdCwgc2xvdCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KQEAgLTE2MjMsNyArMTYyMyw3IEBAIGJvb2wgSlNPYmplY3Q6OnJl bW92ZURpcmVjdChWTSYgdm0sIFByb3AKIE5FVkVSX0lOTElORSB2b2lkIEpTT2JqZWN0OjpmaWxs R2V0dGVyUHJvcGVydHlTbG90KFByb3BlcnR5U2xvdCYgc2xvdCwgSlNWYWx1ZSBnZXR0ZXJTZXR0 ZXIsIFByb3BlcnR5T2Zmc2V0IG9mZnNldCkKIHsKICAgICBpZiAoc3RydWN0dXJlKCktPmlzRGlj dGlvbmFyeSgpKSB7Ci0gICAgICAgIHNsb3Quc2V0R2V0dGVyU2xvdChqc0Nhc3Q8R2V0dGVyU2V0 dGVyKj4oZ2V0dGVyU2V0dGVyKSk7CisgICAgICAgIHNsb3Quc2V0R2V0dGVyU2xvdCh0aGlzLCBq c0Nhc3Q8R2V0dGVyU2V0dGVyKj4oZ2V0dGVyU2V0dGVyKSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaAkocmV2 aXNpb24gMTUzNTM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3Qu aAkod29ya2luZyBjb3B5KQpAQCAtMTQ5MSw2ICsxNDkxLDI4IEBAIEFMV0FZU19JTkxJTkUgSWRl bnRpZmllciBtYWtlSWRlbnRpZmllcigKICNkZWZpbmUgSlNDX05BVElWRV9GVU5DVElPTihqc05h bWUsIGNwcE5hbWUsIGF0dHJpYnV0ZXMsIGxlbmd0aCkgXAogICAgIEpTQ19OQVRJVkVfSU5UUklO U0lDX0ZVTkNUSU9OKGpzTmFtZSwgY3BwTmFtZSwgKGF0dHJpYnV0ZXMpLCAobGVuZ3RoKSwgTm9J bnRyaW5zaWMpCiAKK0FMV0FZU19JTkxJTkUgSlNWYWx1ZSBQcm9wZXJ0eVNsb3Q6OmdldFZhbHVl KEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKK3sKKyAg ICBpZiAobV9wcm9wZXJ0eVR5cGUgPT0gVHlwZVZhbHVlKQorICAgICAgICByZXR1cm4gSlNWYWx1 ZTo6ZGVjb2RlKG1fZGF0YS52YWx1ZSk7CisgICAgaWYgKG1fcHJvcGVydHlUeXBlID09IFR5cGVD dXN0b21JbmRleCkKKyAgICAgICAgcmV0dXJuIG1fZGF0YS5jdXN0b21JbmRleC5nZXRJbmRleFZh bHVlKGV4ZWMsIHNsb3RCYXNlKCksIG1fZGF0YS5jdXN0b21JbmRleC5pbmRleCk7CisgICAgaWYg KG1fcHJvcGVydHlUeXBlID09IFR5cGVHZXR0ZXIpCisgICAgICAgIHJldHVybiBmdW5jdGlvbkdl dHRlcihleGVjKTsKKyAgICByZXR1cm4gbV9kYXRhLmN1c3RvbS5nZXRWYWx1ZShleGVjLCBzbG90 QmFzZSgpLCBwcm9wZXJ0eU5hbWUpOworfQorCitBTFdBWVNfSU5MSU5FIEpTVmFsdWUgUHJvcGVy dHlTbG90OjpnZXRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHByb3BlcnR5TmFtZSkg Y29uc3QKK3sKKyAgICBpZiAobV9wcm9wZXJ0eVR5cGUgPT0gVHlwZVZhbHVlKQorICAgICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZGVjb2RlKG1fZGF0YS52YWx1ZSk7CisgICAgaWYgKG1fcHJvcGVydHlU eXBlID09IFR5cGVDdXN0b21JbmRleCkKKyAgICAgICAgcmV0dXJuIG1fZGF0YS5jdXN0b21JbmRl eC5nZXRJbmRleFZhbHVlKGV4ZWMsIHNsb3RCYXNlKCksIG1fZGF0YS5jdXN0b21JbmRleC5pbmRl eCk7CisgICAgaWYgKG1fcHJvcGVydHlUeXBlID09IFR5cGVHZXR0ZXIpCisgICAgICAgIHJldHVy biBmdW5jdGlvbkdldHRlcihleGVjKTsKKyAgICByZXR1cm4gbV9kYXRhLmN1c3RvbS5nZXRWYWx1 ZShleGVjLCBzbG90QmFzZSgpLCBJZGVudGlmaWVyOjpmcm9tKGV4ZWMsIHByb3BlcnR5TmFtZSkp OworfQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEpTT2JqZWN0X2gKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5U2xvdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlTbG90LmNwcAkocmV2 aXNpb24gMTUzNTM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlT bG90LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsOCBAQCBuYW1lc3BhY2UgSlNDIHsK IAogSlNWYWx1ZSBQcm9wZXJ0eVNsb3Q6OmZ1bmN0aW9uR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYykg Y29uc3QKIHsKLSAgICByZXR1cm4gY2FsbEdldHRlcihleGVjLCBKU1ZhbHVlOjpkZWNvZGUobV9k YXRhLmdldHRlci50aGlzVmFsdWUpLCBtX2RhdGEuZ2V0dGVyLmdldHRlclNldHRlcik7CisgICAg QVNTRVJUKG1fdGhpc1ZhbHVlKTsKKyAgICByZXR1cm4gY2FsbEdldHRlcihleGVjLCBKU1ZhbHVl OjpkZWNvZGUobV90aGlzVmFsdWUpLCBtX2RhdGEuZ2V0dGVyLmdldHRlclNldHRlcik7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UHJvcGVydHlTbG90LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvUHJvcGVydHlTbG90LmgJKHJldmlzaW9uIDE1MzUzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1Byb3BlcnR5U2xvdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw4ICs0OSw4 IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgZXhwbGljaXQgUHJvcGVydHlTbG90KGNv bnN0IEpTVmFsdWUgYmFzZSkKLSAgICAgICAgOiBtX3Nsb3RCYXNlKGJhc2UpCisgICAgZXhwbGlj aXQgUHJvcGVydHlTbG90KGNvbnN0IEpTVmFsdWUgdGhpc1ZhbHVlKQorICAgICAgICA6IG1fdGhp c1ZhbHVlKHRoaXNWYWx1ZSkKICAgICAgICAgLCBtX3Byb3BlcnR5VHlwZShUeXBlVW5zZXQpCiAg ICAgICAgICwgbV9vZmZzZXQoaW52YWxpZE9mZnNldCkKICAgICB7CkBAIC01OSwyNyArNTksOCBA QCBwdWJsaWM6CiAgICAgdHlwZWRlZiBKU1ZhbHVlICgqR2V0VmFsdWVGdW5jKShFeGVjU3RhdGUq LCBKU1ZhbHVlIHNsb3RCYXNlLCBQcm9wZXJ0eU5hbWUpOwogICAgIHR5cGVkZWYgSlNWYWx1ZSAo KkdldEluZGV4VmFsdWVGdW5jKShFeGVjU3RhdGUqLCBKU1ZhbHVlIHNsb3RCYXNlLCB1bnNpZ25l ZCk7CiAKLSAgICBKU1ZhbHVlIGdldFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1l IHByb3BlcnR5TmFtZSkgY29uc3QKLSAgICB7Ci0gICAgICAgIGlmIChtX3Byb3BlcnR5VHlwZSA9 PSBUeXBlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZGVjb2RlKG1fZGF0YS52 YWx1ZSk7Ci0gICAgICAgIGlmIChtX3Byb3BlcnR5VHlwZSA9PSBUeXBlQ3VzdG9tSW5kZXgpCi0g ICAgICAgICAgICByZXR1cm4gbV9kYXRhLmN1c3RvbUluZGV4LmdldEluZGV4VmFsdWUoZXhlYywg c2xvdEJhc2UoKSwgbV9kYXRhLmN1c3RvbUluZGV4LmluZGV4KTsKLSAgICAgICAgaWYgKG1fcHJv cGVydHlUeXBlID09IFR5cGVHZXR0ZXIpCi0gICAgICAgICAgICByZXR1cm4gZnVuY3Rpb25HZXR0 ZXIoZXhlYyk7Ci0gICAgICAgIHJldHVybiBtX2RhdGEuY3VzdG9tLmdldFZhbHVlKGV4ZWMsIHNs b3RCYXNlKCksIHByb3BlcnR5TmFtZSk7Ci0gICAgfQotCi0gICAgSlNWYWx1ZSBnZXRWYWx1ZShF eGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHByb3BlcnR5TmFtZSkgY29uc3QKLSAgICB7Ci0gICAg ICAgIGlmIChtX3Byb3BlcnR5VHlwZSA9PSBUeXBlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm4g SlNWYWx1ZTo6ZGVjb2RlKG1fZGF0YS52YWx1ZSk7Ci0gICAgICAgIGlmIChtX3Byb3BlcnR5VHlw ZSA9PSBUeXBlQ3VzdG9tSW5kZXgpCi0gICAgICAgICAgICByZXR1cm4gbV9kYXRhLmN1c3RvbUlu ZGV4LmdldEluZGV4VmFsdWUoZXhlYywgc2xvdEJhc2UoKSwgbV9kYXRhLmN1c3RvbUluZGV4Lmlu ZGV4KTsKLSAgICAgICAgaWYgKG1fcHJvcGVydHlUeXBlID09IFR5cGVHZXR0ZXIpCi0gICAgICAg ICAgICByZXR1cm4gZnVuY3Rpb25HZXR0ZXIoZXhlYyk7Ci0gICAgICAgIHJldHVybiBtX2RhdGEu Y3VzdG9tLmdldFZhbHVlKGV4ZWMsIHNsb3RCYXNlKCksIElkZW50aWZpZXI6OmZyb20oZXhlYywg cHJvcGVydHlOYW1lKSk7Ci0gICAgfQorICAgIEpTVmFsdWUgZ2V0VmFsdWUoRXhlY1N0YXRlKiBl eGVjLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdDsKKyAgICBKU1ZhbHVlIGdldFZh bHVlKEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlOYW1lKSBjb25zdDsKIAogICAg IGJvb2wgaXNDYWNoZWFibGUoKSBjb25zdCB7IHJldHVybiBtX29mZnNldCAhPSBpbnZhbGlkT2Zm c2V0OyB9CiAgICAgYm9vbCBpc0NhY2hlYWJsZVZhbHVlKCkgY29uc3QgeyByZXR1cm4gaXNDYWNo ZWFibGUoKSAmJiBtX3Byb3BlcnR5VHlwZSA9PSBUeXBlVmFsdWU7IH0KQEAgLTk4LDcgKzc5LDEz IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fZGF0YS5jdXN0b20uZ2V0VmFsdWU7CiAgICAg fQogCi0gICAgdm9pZCBzZXRWYWx1ZShKU1ZhbHVlIHNsb3RCYXNlLCBKU1ZhbHVlIHZhbHVlKQor ICAgIEpTT2JqZWN0KiBzbG90QmFzZSgpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQobV9w cm9wZXJ0eVR5cGUgIT0gVHlwZVVuc2V0KTsKKyAgICAgICAgcmV0dXJuIG1fc2xvdEJhc2U7Cisg ICAgfQorCisgICAgdm9pZCBzZXRWYWx1ZShKU09iamVjdCogc2xvdEJhc2UsIEpTVmFsdWUgdmFs dWUpCiAgICAgewogICAgICAgICBBU1NFUlQodmFsdWUpOwogICAgICAgICBtX2RhdGEudmFsdWUg PSBKU1ZhbHVlOjplbmNvZGUodmFsdWUpOwpAQCAtMTA5LDcgKzk2LDcgQEAgcHVibGljOgogICAg ICAgICBtX29mZnNldCA9IGludmFsaWRPZmZzZXQ7CiAgICAgfQogICAgIAotICAgIHZvaWQgc2V0 VmFsdWUoSlNWYWx1ZSBzbG90QmFzZSwgSlNWYWx1ZSB2YWx1ZSwgUHJvcGVydHlPZmZzZXQgb2Zm c2V0KQorICAgIHZvaWQgc2V0VmFsdWUoSlNPYmplY3QqIHNsb3RCYXNlLCBKU1ZhbHVlIHZhbHVl LCBQcm9wZXJ0eU9mZnNldCBvZmZzZXQpCiAgICAgewogICAgICAgICBBU1NFUlQodmFsdWUpOwog ICAgICAgICBtX2RhdGEudmFsdWUgPSBKU1ZhbHVlOjplbmNvZGUodmFsdWUpOwpAQCAtMTI1LDEy ICsxMTIsMTIgQEAgcHVibGljOgogICAgICAgICBBU1NFUlQodmFsdWUpOwogICAgICAgICBtX2Rh dGEudmFsdWUgPSBKU1ZhbHVlOjplbmNvZGUodmFsdWUpOwogCi0gICAgICAgIG1fc2xvdEJhc2Ug PSBKU1ZhbHVlKCk7CisgICAgICAgIG1fc2xvdEJhc2UgPSAwOwogICAgICAgICBtX3Byb3BlcnR5 VHlwZSA9IFR5cGVWYWx1ZTsKICAgICAgICAgbV9vZmZzZXQgPSBpbnZhbGlkT2Zmc2V0OwogICAg IH0KIAotICAgIHZvaWQgc2V0Q3VzdG9tKEpTVmFsdWUgc2xvdEJhc2UsIEdldFZhbHVlRnVuYyBn ZXRWYWx1ZSkKKyAgICB2b2lkIHNldEN1c3RvbShKU09iamVjdCogc2xvdEJhc2UsIEdldFZhbHVl RnVuYyBnZXRWYWx1ZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChnZXRWYWx1ZSk7CiAgICAgICAg IG1fZGF0YS5jdXN0b20uZ2V0VmFsdWUgPSBnZXRWYWx1ZTsKQEAgLTE0MSw3ICsxMjgsNyBAQCBw dWJsaWM6CiAgICAgICAgIG1fb2Zmc2V0ID0gaW52YWxpZE9mZnNldDsKICAgICB9CiAgICAgCi0g ICAgdm9pZCBzZXRDYWNoZWFibGVDdXN0b20oSlNWYWx1ZSBzbG90QmFzZSwgR2V0VmFsdWVGdW5j IGdldFZhbHVlKQorICAgIHZvaWQgc2V0Q2FjaGVhYmxlQ3VzdG9tKEpTT2JqZWN0KiBzbG90QmFz ZSwgR2V0VmFsdWVGdW5jIGdldFZhbHVlKQogICAgIHsKICAgICAgICAgQVNTRVJUKGdldFZhbHVl KTsKICAgICAgICAgbV9kYXRhLmN1c3RvbS5nZXRWYWx1ZSA9IGdldFZhbHVlOwpAQCAtMTUyLDcg KzEzOSw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9vZmZzZXQgPSAhaW52YWxpZE9mZnNldDsKICAg ICB9CiAKLSAgICB2b2lkIHNldEN1c3RvbUluZGV4KEpTVmFsdWUgc2xvdEJhc2UsIHVuc2lnbmVk IGluZGV4LCBHZXRJbmRleFZhbHVlRnVuYyBnZXRJbmRleFZhbHVlKQorICAgIHZvaWQgc2V0Q3Vz dG9tSW5kZXgoSlNPYmplY3QqIHNsb3RCYXNlLCB1bnNpZ25lZCBpbmRleCwgR2V0SW5kZXhWYWx1 ZUZ1bmMgZ2V0SW5kZXhWYWx1ZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChnZXRJbmRleFZhbHVl KTsKICAgICAgICAgbV9kYXRhLmN1c3RvbUluZGV4LmdldEluZGV4VmFsdWUgPSBnZXRJbmRleFZh bHVlOwpAQCAtMTY0LDIwICsxNTEsMjAgQEAgcHVibGljOgogICAgICAgICBtX29mZnNldCA9IGlu dmFsaWRPZmZzZXQ7CiAgICAgfQogCi0gICAgdm9pZCBzZXRHZXR0ZXJTbG90KEdldHRlclNldHRl ciogZ2V0dGVyU2V0dGVyKQorICAgIHZvaWQgc2V0R2V0dGVyU2xvdChKU09iamVjdCogc2xvdEJh c2UsIEdldHRlclNldHRlciogZ2V0dGVyU2V0dGVyKQogICAgIHsKICAgICAgICAgQVNTRVJUKGdl dHRlclNldHRlcik7Ci0gICAgICAgIG1fZGF0YS5nZXR0ZXIudGhpc1ZhbHVlID0gSlNWYWx1ZTo6 ZW5jb2RlKG1fc2xvdEJhc2UpOwogICAgICAgICBtX2RhdGEuZ2V0dGVyLmdldHRlclNldHRlciA9 IGdldHRlclNldHRlcjsKIAorICAgICAgICBBU1NFUlQoc2xvdEJhc2UpOworICAgICAgICBtX3Ns b3RCYXNlID0gc2xvdEJhc2U7CiAgICAgICAgIG1fcHJvcGVydHlUeXBlID0gVHlwZUdldHRlcjsK ICAgICAgICAgbV9vZmZzZXQgPSBpbnZhbGlkT2Zmc2V0OwogICAgIH0KIAotICAgIHZvaWQgc2V0 Q2FjaGVhYmxlR2V0dGVyU2xvdChKU1ZhbHVlIHNsb3RCYXNlLCBHZXR0ZXJTZXR0ZXIqIGdldHRl clNldHRlciwgUHJvcGVydHlPZmZzZXQgb2Zmc2V0KQorICAgIHZvaWQgc2V0Q2FjaGVhYmxlR2V0 dGVyU2xvdChKU09iamVjdCogc2xvdEJhc2UsIEdldHRlclNldHRlciogZ2V0dGVyU2V0dGVyLCBQ cm9wZXJ0eU9mZnNldCBvZmZzZXQpCiAgICAgewogICAgICAgICBBU1NFUlQoZ2V0dGVyU2V0dGVy KTsKLSAgICAgICAgbV9kYXRhLmdldHRlci50aGlzVmFsdWUgPSBKU1ZhbHVlOjplbmNvZGUobV9z bG90QmFzZSk7CiAgICAgICAgIG1fZGF0YS5nZXR0ZXIuZ2V0dGVyU2V0dGVyID0gZ2V0dGVyU2V0 dGVyOwogCiAgICAgICAgIEFTU0VSVChzbG90QmFzZSk7CkBAIC0xOTEsMTggKzE3OCwxNCBAQCBw dWJsaWM6CiAgICAgICAgIHNldFZhbHVlKGpzVW5kZWZpbmVkKCkpOwogICAgIH0KIAotICAgIEpT VmFsdWUgc2xvdEJhc2UoKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fc2xvdEJhc2U7 Ci0gICAgfQotCiBwcml2YXRlOgogICAgIEpTX0VYUE9SVF9QUklWQVRFIEpTVmFsdWUgZnVuY3Rp b25HZXR0ZXIoRXhlY1N0YXRlKikgY29uc3Q7CiAKKyAgICBFbmNvZGVkSlNWYWx1ZSBtX3RoaXNW YWx1ZTsKKwogICAgIHVuaW9uIHsKICAgICAgICAgRW5jb2RlZEpTVmFsdWUgdmFsdWU7CiAgICAg ICAgIHN0cnVjdCB7Ci0gICAgICAgICAgICBFbmNvZGVkSlNWYWx1ZSB0aGlzVmFsdWU7CiAgICAg ICAgICAgICBHZXR0ZXJTZXR0ZXIqIGdldHRlclNldHRlcjsKICAgICAgICAgfSBnZXR0ZXI7CiAg ICAgICAgIHN0cnVjdCB7CkBAIC0yMTQsNyArMTk3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgfSBj dXN0b21JbmRleDsKICAgICB9IG1fZGF0YTsKIAotICAgIEpTVmFsdWUgbV9zbG90QmFzZTsKKyAg ICBKU09iamVjdCogbV9zbG90QmFzZTsKICAgICBQcm9wZXJ0eVR5cGUgbV9wcm9wZXJ0eVR5cGU7 CiAgICAgUHJvcGVydHlPZmZzZXQgbV9vZmZzZXQ7CiB9OwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvU3BhcnNlQXJyYXlWYWx1ZU1hcC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3BhcnNlQXJyYXlWYWx1ZU1hcC5jcHAJKHJldmlz aW9uIDE1MzUzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NwYXJzZUFycmF5 VmFsdWVNYXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjIsNyArMTIyLDcgQEAgYm9vbCBTcGFy c2VBcnJheVZhbHVlTWFwOjpwdXREaXJlY3QoRXhlYwogICAgIHJldHVybiB0cnVlOwogfQogCi12 b2lkIFNwYXJzZUFycmF5RW50cnk6OmdldChQcm9wZXJ0eVNsb3QmIHNsb3QpIGNvbnN0Cit2b2lk IFNwYXJzZUFycmF5RW50cnk6OmdldChKU09iamVjdCogdGhpc09iamVjdCwgUHJvcGVydHlTbG90 JiBzbG90KSBjb25zdAogewogICAgIEpTVmFsdWUgdmFsdWUgPSBCYXNlOjpnZXQoKTsKICAgICBB U1NFUlQodmFsdWUpOwpAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQgU3BhcnNlQXJyYXlFbnRyeTo6 Z2V0KFByb3BlcnR5U2xvdCYKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHNsb3Quc2V0 R2V0dGVyU2xvdChqc0Nhc3Q8R2V0dGVyU2V0dGVyKj4odmFsdWUpKTsKKyAgICBzbG90LnNldEdl dHRlclNsb3QodGhpc09iamVjdCwganNDYXN0PEdldHRlclNldHRlcio+KHZhbHVlKSk7CiB9CiAK IHZvaWQgU3BhcnNlQXJyYXlFbnRyeTo6Z2V0KFByb3BlcnR5RGVzY3JpcHRvciYgZGVzY3JpcHRv cikgY29uc3QKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NwYXJzZUFycmF5 VmFsdWVNYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9T cGFyc2VBcnJheVZhbHVlTWFwLmgJKHJldmlzaW9uIDE1MzUzNikKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1NwYXJzZUFycmF5VmFsdWVNYXAuaAkod29ya2luZyBjb3B5KQpAQCAt NDQsNyArNDQsNyBAQCBzdHJ1Y3QgU3BhcnNlQXJyYXlFbnRyeSA6IHB1YmxpYyBXcml0ZUJhCiAg ICAgU3BhcnNlQXJyYXlFbnRyeSgpIDogYXR0cmlidXRlcygwKSB7IH0KIAogICAgIEpTVmFsdWUg Z2V0KEV4ZWNTdGF0ZSosIEpTT2JqZWN0KikgY29uc3Q7Ci0gICAgdm9pZCBnZXQoUHJvcGVydHlT bG90JikgY29uc3Q7CisgICAgdm9pZCBnZXQoSlNPYmplY3QqLCBQcm9wZXJ0eVNsb3QmKSBjb25z dDsKICAgICB2b2lkIGdldChQcm9wZXJ0eURlc2NyaXB0b3ImKSBjb25zdDsKICAgICB2b2lkIHB1 dChFeGVjU3RhdGUqLCBKU1ZhbHVlIHRoaXNWYWx1ZSwgU3BhcnNlQXJyYXlWYWx1ZU1hcCosIEpT VmFsdWUsIGJvb2wgc2hvdWxkVGhyb3cpOwogICAgIEpTVmFsdWUgZ2V0Tm9uU3BhcnNlTW9kZSgp IGNvbnN0Owo=