173322 2017-06-13 12:49:15 -0700 Refactor AbsenceOfSetter to AbsenceOfSetEffects 2017-06-13 15:39:36 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 msaboff msaboff buildbot fpizlo keith_miller mark.lam saam oldest_to_newest 1318749 0 msaboff 2017-06-13 12:49:15 -0700 The fix to <https://bugs.webkit.org/show_bug.cgi?id=173321> - "DFG doesn't properly handle a property that is change to read only in a prototype" is to add a check for ReadOnly to the AbsenceOfSetter in PropertyCondition::isStillValidAssumingImpurePropertyWatchpoint(). Talking to Phil Pizlo it makes sense to reflect the changed functionality in the name of AbsenceOfSetter in all of it's uses. 1318845 1 msaboff 2017-06-13 15:10:17 -0700 Settled on AbsenceOfSetEffects. 1318847 2 312816 msaboff 2017-06-13 15:13:57 -0700 Created attachment 312816 Patch 1318848 3 312816 fpizlo 2017-06-13 15:14:48 -0700 Comment on attachment 312816 Patch r=me 1318867 4 msaboff 2017-06-13 15:39:36 -0700 Committed r218218: <http://trac.webkit.org/changeset/218218> 312816 2017-06-13 15:13:57 -0700 2017-06-13 15:14:48 -0700 Patch 173322.patch text/plain 10282 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE4MjA3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE3LTA2LTEzICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFJlZmFjdG9yIEFic2VuY2VPZlNldHRlciB0byBBYnNlbmNlT2ZTZXRFZmZlY3RzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMzMjIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJ5dGVjb2RlL09i amVjdFByb3BlcnR5Q29uZGl0aW9uLmg6CisgICAgICAgIChKU0M6Ok9iamVjdFByb3BlcnR5Q29u ZGl0aW9uOjphYnNlbmNlT2ZTZXRFZmZlY3RXaXRob3V0QmFycmllcik6CisgICAgICAgIChKU0M6 Ok9iamVjdFByb3BlcnR5Q29uZGl0aW9uOjphYnNlbmNlT2ZTZXRFZmZlY3QpOgorICAgICAgICAo SlNDOjpPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbjo6YWJzZW5jZU9mU2V0dGVyV2l0aG91dEJhcnJp ZXIpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbjo6YWJz ZW5jZU9mU2V0dGVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBieXRlY29kZS9PYmplY3RQcm9wZXJ0 eUNvbmRpdGlvblNldC5jcHA6CisgICAgICAgIChKU0M6OmdlbmVyYXRlQ29uZGl0aW9uc0ZvclBy b3BlcnR5U2V0dGVyTWlzcyk6CisgICAgICAgIChKU0M6OmdlbmVyYXRlQ29uZGl0aW9uc0ZvclBy b3BlcnR5U2V0dGVyTWlzc0NvbmN1cnJlbnRseSk6CisgICAgICAgICogYnl0ZWNvZGUvUHJvcGVy dHlDb25kaXRpb24uY3BwOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eUNvbmRpdGlvbjo6ZHVtcElu Q29udGV4dCk6CisgICAgICAgIChKU0M6OlByb3BlcnR5Q29uZGl0aW9uOjppc1N0aWxsVmFsaWRB c3N1bWluZ0ltcHVyZVByb3BlcnR5V2F0Y2hwb2ludCk6CisgICAgICAgIChKU0M6OlByb3BlcnR5 Q29uZGl0aW9uOjppc1N0aWxsVmFsaWQpOgorICAgICAgICAoV1RGOjpwcmludEludGVybmFsKToK KyAgICAgICAgKiBieXRlY29kZS9Qcm9wZXJ0eUNvbmRpdGlvbi5oOgorICAgICAgICAoSlNDOjpQ cm9wZXJ0eUNvbmRpdGlvbjo6YWJzZW5jZU9mU2V0RWZmZWN0V2l0aG91dEJhcnJpZXIpOgorICAg ICAgICAoSlNDOjpQcm9wZXJ0eUNvbmRpdGlvbjo6YWJzZW5jZU9mU2V0RWZmZWN0KToKKyAgICAg ICAgKEpTQzo6UHJvcGVydHlDb25kaXRpb246Omhhc1Byb3RvdHlwZSk6CisgICAgICAgIChKU0M6 OlByb3BlcnR5Q29uZGl0aW9uOjpoYXNoKToKKyAgICAgICAgKEpTQzo6UHJvcGVydHlDb25kaXRp b246Om9wZXJhdG9yPT0pOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eUNvbmRpdGlvbjo6YWJzZW5j ZU9mU2V0dGVyV2l0aG91dEJhcnJpZXIpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpQcm9wZXJ0 eUNvbmRpdGlvbjo6YWJzZW5jZU9mU2V0dGVyKTogRGVsZXRlZC4KKwogMjAxNy0wNi0xMyAgTWlj aGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBERkcgZG9lc24ndCBw cm9wZXJseSBoYW5kbGUgYSBwcm9wZXJ0eSB0aGF0IGlzIGNoYW5nZSB0byByZWFkIG9ubHkgaW4g YSBwcm90b3R5cGUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9PYmplY3RQ cm9wZXJ0eUNvbmRpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9PYmplY3RQcm9wZXJ0eUNvbmRpdGlvbi5oCShyZXZpc2lvbiAyMTgyMDIpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb24uaAko d29ya2luZyBjb3B5KQpAQCAtODgsMjEgKzg4LDIxIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IGFic2VuY2VXaXRob3V0QmFycmllcihvYmplY3QsIHVpZCwgcHJvdG90eXBlKTsKICAgICB9CiAg ICAgCi0gICAgc3RhdGljIE9iamVjdFByb3BlcnR5Q29uZGl0aW9uIGFic2VuY2VPZlNldHRlcldp dGhvdXRCYXJyaWVyKAorICAgIHN0YXRpYyBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBhYnNlbmNl T2ZTZXRFZmZlY3RXaXRob3V0QmFycmllcigKICAgICAgICAgSlNPYmplY3QqIG9iamVjdCwgVW5p cXVlZFN0cmluZ0ltcGwqIHVpZCwgSlNPYmplY3QqIHByb3RvdHlwZSkKICAgICB7CiAgICAgICAg IE9iamVjdFByb3BlcnR5Q29uZGl0aW9uIHJlc3VsdDsKICAgICAgICAgcmVzdWx0Lm1fb2JqZWN0 ID0gb2JqZWN0OwotICAgICAgICByZXN1bHQubV9jb25kaXRpb24gPSBQcm9wZXJ0eUNvbmRpdGlv bjo6YWJzZW5jZU9mU2V0dGVyV2l0aG91dEJhcnJpZXIodWlkLCBwcm90b3R5cGUpOworICAgICAg ICByZXN1bHQubV9jb25kaXRpb24gPSBQcm9wZXJ0eUNvbmRpdGlvbjo6YWJzZW5jZU9mU2V0RWZm ZWN0V2l0aG91dEJhcnJpZXIodWlkLCBwcm90b3R5cGUpOwogICAgICAgICByZXR1cm4gcmVzdWx0 OwogICAgIH0KICAgICAKLSAgICBzdGF0aWMgT2JqZWN0UHJvcGVydHlDb25kaXRpb24gYWJzZW5j ZU9mU2V0dGVyKAorICAgIHN0YXRpYyBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBhYnNlbmNlT2ZT ZXRFZmZlY3QoCiAgICAgICAgIFZNJiB2bSwgSlNDZWxsKiBvd25lciwgSlNPYmplY3QqIG9iamVj dCwgVW5pcXVlZFN0cmluZ0ltcGwqIHVpZCwgSlNPYmplY3QqIHByb3RvdHlwZSkKICAgICB7CiAg ICAgICAgIGlmIChvd25lcikKICAgICAgICAgICAgIHZtLmhlYXAud3JpdGVCYXJyaWVyKG93bmVy KTsKLSAgICAgICAgcmV0dXJuIGFic2VuY2VPZlNldHRlcldpdGhvdXRCYXJyaWVyKG9iamVjdCwg dWlkLCBwcm90b3R5cGUpOworICAgICAgICByZXR1cm4gYWJzZW5jZU9mU2V0RWZmZWN0V2l0aG91 dEJhcnJpZXIob2JqZWN0LCB1aWQsIHByb3RvdHlwZSk7CiAgICAgfQogICAgIAogICAgIHN0YXRp YyBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBlcXVpdmFsZW5jZVdpdGhvdXRCYXJyaWVyKApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdFByb3BlcnR5Q29uZGl0aW9u U2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2Jq ZWN0UHJvcGVydHlDb25kaXRpb25TZXQuY3BwCShyZXZpc2lvbiAyMTgyMDIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMDYsOCArMjA2LDggQEAgT2JqZWN0UHJvcGVydHlDb25kaXRpb24g Z2VuZXJhdGVDb25kaXRpbwogICAgICAgICAgICAgdm0sIG93bmVyLCBvYmplY3QsIHVpZCwgb2Jq ZWN0LT5zdHJ1Y3R1cmUoKS0+c3RvcmVkUHJvdG90eXBlT2JqZWN0KCkpOwogICAgICAgICBicmVh azsKICAgICB9Ci0gICAgY2FzZSBQcm9wZXJ0eUNvbmRpdGlvbjo6QWJzZW5jZU9mU2V0dGVyOiB7 Ci0gICAgICAgIHJlc3VsdCA9IE9iamVjdFByb3BlcnR5Q29uZGl0aW9uOjphYnNlbmNlT2ZTZXR0 ZXIoCisgICAgY2FzZSBQcm9wZXJ0eUNvbmRpdGlvbjo6QWJzZW5jZU9mU2V0RWZmZWN0OiB7Cisg ICAgICAgIHJlc3VsdCA9IE9iamVjdFByb3BlcnR5Q29uZGl0aW9uOjphYnNlbmNlT2ZTZXRFZmZl Y3QoCiAgICAgICAgICAgICB2bSwgb3duZXIsIG9iamVjdCwgdWlkLCBvYmplY3QtPnN0cnVjdHVy ZSgpLT5zdG9yZWRQcm90b3R5cGVPYmplY3QoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAg LTMzMyw3ICszMzMsNyBAQCBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvblNldCBnZW5lcmF0ZUNvbmRp CiAgICAgICAgIHZtLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIGhlYWRTdHJ1Y3R1cmUs IG51bGxwdHIsCiAgICAgICAgIFsmXSAoVmVjdG9yPE9iamVjdFByb3BlcnR5Q29uZGl0aW9uPiYg Y29uZGl0aW9ucywgSlNPYmplY3QqIG9iamVjdCkgLT4gYm9vbCB7CiAgICAgICAgICAgICBPYmpl Y3RQcm9wZXJ0eUNvbmRpdGlvbiByZXN1bHQgPQotICAgICAgICAgICAgICAgIGdlbmVyYXRlQ29u ZGl0aW9uKHZtLCBvd25lciwgb2JqZWN0LCB1aWQsIFByb3BlcnR5Q29uZGl0aW9uOjpBYnNlbmNl T2ZTZXR0ZXIpOworICAgICAgICAgICAgICAgIGdlbmVyYXRlQ29uZGl0aW9uKHZtLCBvd25lciwg b2JqZWN0LCB1aWQsIFByb3BlcnR5Q29uZGl0aW9uOjpBYnNlbmNlT2ZTZXRFZmZlY3QpOwogICAg ICAgICAgICAgaWYgKCFyZXN1bHQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICAgICAgY29uZGl0aW9ucy5hcHBlbmQocmVzdWx0KTsKQEAgLTQxMyw3ICs0MTMsNyBAQCBP YmplY3RQcm9wZXJ0eUNvbmRpdGlvblNldCBnZW5lcmF0ZUNvbmRpCiAgICAgICAgIHZtLCBnbG9i YWxPYmplY3QsIGhlYWRTdHJ1Y3R1cmUsIG51bGxwdHIsCiAgICAgICAgIFsmXSAoVmVjdG9yPE9i amVjdFByb3BlcnR5Q29uZGl0aW9uPiYgY29uZGl0aW9ucywgSlNPYmplY3QqIG9iamVjdCkgLT4g Ym9vbCB7CiAgICAgICAgICAgICBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiByZXN1bHQgPQotICAg ICAgICAgICAgICAgIGdlbmVyYXRlQ29uZGl0aW9uKHZtLCBudWxscHRyLCBvYmplY3QsIHVpZCwg UHJvcGVydHlDb25kaXRpb246OkFic2VuY2VPZlNldHRlcik7CisgICAgICAgICAgICAgICAgZ2Vu ZXJhdGVDb25kaXRpb24odm0sIG51bGxwdHIsIG9iamVjdCwgdWlkLCBQcm9wZXJ0eUNvbmRpdGlv bjo6QWJzZW5jZU9mU2V0RWZmZWN0KTsKICAgICAgICAgICAgIGlmICghcmVzdWx0KQogICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIGNvbmRpdGlvbnMuYXBwZW5kKHJl c3VsdCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHJvcGVydHlDb25k aXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Q cm9wZXJ0eUNvbmRpdGlvbi5jcHAJKHJldmlzaW9uIDIxODIwMykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Qcm9wZXJ0eUNvbmRpdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ3LDcgKzQ3LDcgQEAgdm9pZCBQcm9wZXJ0eUNvbmRpdGlvbjo6ZHVtcEluQ29udGV4dChQcgog ICAgICAgICBvdXQucHJpbnQoIiBhdCAiLCBvZmZzZXQoKSwgIiB3aXRoIGF0dHJpYnV0ZXMgIiwg YXR0cmlidXRlcygpKTsKICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQWJzZW5jZToKLSAgICBj YXNlIEFic2VuY2VPZlNldHRlcjoKKyAgICBjYXNlIEFic2VuY2VPZlNldEVmZmVjdDoKICAgICAg ICAgb3V0LnByaW50KCIgd2l0aCBwcm90b3R5cGUgIiwgaW5Db250ZXh0KEpTVmFsdWUocHJvdG90 eXBlKCkpLCBjb250ZXh0KSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIEVxdWl2YWxlbmNl OgpAQCAtMTI0LDcgKzEyNCw3IEBAIGJvb2wgUHJvcGVydHlDb25kaXRpb246OmlzU3RpbGxWYWxp ZEFzc3UKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIAotICAgIGNhc2UgQWJzZW5j ZU9mU2V0dGVyOiB7CisgICAgY2FzZSBBYnNlbmNlT2ZTZXRFZmZlY3Q6IHsKICAgICAgICAgaWYg KHN0cnVjdHVyZS0+aXNEaWN0aW9uYXJ5KCkpIHsKICAgICAgICAgICAgIGlmICh2ZXJib3NlKQog ICAgICAgICAgICAgICAgIGRhdGFMb2coIkludmFsaWQgYmVjYXVzZSBpdCdzIGEgZGljdGlvbmFy eS5cbiIpOwpAQCAtMTM0LDkgKzEzNCw2IEBAIGJvb2wgUHJvcGVydHlDb25kaXRpb246OmlzU3Rp bGxWYWxpZEFzc3UKICAgICAgICAgdW5zaWduZWQgY3VycmVudEF0dHJpYnV0ZXM7CiAgICAgICAg IFByb3BlcnR5T2Zmc2V0IGN1cnJlbnRPZmZzZXQgPSBzdHJ1Y3R1cmUtPmdldENvbmN1cnJlbnRs eSh1aWQoKSwgY3VycmVudEF0dHJpYnV0ZXMpOwogICAgICAgICBpZiAoY3VycmVudE9mZnNldCAh PSBpbnZhbGlkT2Zmc2V0KSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogR2l2ZW4gdGhlIGFkZGl0 aW9uIG9mIHRoZSBjaGVjayBmb3IgUmVhZE9ubHkgYXR0cmlidXRlcywgd2Ugc2hvdWxkIHJlZmFj dG9yCi0gICAgICAgICAgICAvLyBpbnN0YW5jZXMgb2YgQWJzZW5jZU9mU2V0dGVyLgotICAgICAg ICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzMyMiAt IFJlZmFjdG9yIEFic2VuY2VPZlNldHRlciB0byBzb21ldGhpbmcgbGlrZSBBYnNlbmNlT2ZTZXRF ZmZlY3RzCiAgICAgICAgICAgICBpZiAoY3VycmVudEF0dHJpYnV0ZXMgJiAoUmVhZE9ubHkgfCBB Y2Nlc3NvciB8IEN1c3RvbUFjY2Vzc29yKSkgewogICAgICAgICAgICAgICAgIGlmICh2ZXJib3Nl KSB7CiAgICAgICAgICAgICAgICAgICAgIGRhdGFMb2coCkBAIC0yMjMsNyArMjIwLDcgQEAgYm9v bCBQcm9wZXJ0eUNvbmRpdGlvbjo6aXNTdGlsbFZhbGlkKFN0cgogCiAgICAgLy8gQ3VycmVudGx5 IHdlIGFzc3VtZSB0aGF0IGFuIGltcHVyZSBwcm9wZXJ0eSBjYW4gY2F1c2UgYSBwcm9wZXJ0eSB0 byBhcHBlYXIsIGFuZCBjYW4gYWxzbwogICAgIC8vICJzaGFkb3ciIGFuIGV4aXN0aW5nIEpTIHBy b3BlcnR5IG9uIHRoZSBzYW1lIG9iamVjdC4gSGVuY2UgaXQgYWZmZWN0cyBib3RoIHByZXNlbmNl IGFuZAotICAgIC8vIGFic2VuY2UuIEl0IGRvZXNuJ3QgYWZmZWN0IEFic2VuY2VPZlNldHRlciBi ZWNhdXNlIGltcHVyZSBwcm9wZXJ0aWVzIGFyZW4ndCBldmVyIHNldHRlcnMuCisgICAgLy8gYWJz ZW5jZS4gSXQgZG9lc24ndCBhZmZlY3QgQWJzZW5jZU9mU2V0RWZmZWN0IGJlY2F1c2UgaW1wdXJl IHByb3BlcnRpZXMgYXJlbid0IGV2ZXIgc2V0dGVycy4KICAgICBzd2l0Y2ggKG1fa2luZCkgewog ICAgIGNhc2UgQWJzZW5jZToKICAgICAgICAgaWYgKHN0cnVjdHVyZS0+dHlwZUluZm8oKS5nZXRP d25Qcm9wZXJ0eVNsb3RJc0ltcHVyZSgpIHx8IHN0cnVjdHVyZS0+dHlwZUluZm8oKS5nZXRPd25Q cm9wZXJ0eVNsb3RJc0ltcHVyZUZvclByb3BlcnR5QWJzZW5jZSgpKQpAQCAtMzU0LDcgKzM1MSw3 IEBAIHZvaWQgcHJpbnRJbnRlcm5hbChQcmludFN0cmVhbSYgb3V0LCBKU0MKICAgICBjYXNlIEpT Qzo6UHJvcGVydHlDb25kaXRpb246OkFic2VuY2U6CiAgICAgICAgIG91dC5wcmludCgiQWJzZW5j ZSIpOwogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBKU0M6OlByb3BlcnR5Q29uZGl0aW9uOjpB YnNlbmNlT2ZTZXR0ZXI6CisgICAgY2FzZSBKU0M6OlByb3BlcnR5Q29uZGl0aW9uOjpBYnNlbmNl T2ZTZXRFZmZlY3Q6CiAgICAgICAgIG91dC5wcmludCgiQWJzZW5jZSIpOwogICAgICAgICByZXR1 cm47CiAgICAgY2FzZSBKU0M6OlByb3BlcnR5Q29uZGl0aW9uOjpFcXVpdmFsZW5jZToKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qcm9wZXJ0eUNvbmRpdGlvbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qcm9wZXJ0eUNvbmRpdGlv bi5oCShyZXZpc2lvbiAyMTgyMDIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv UHJvcGVydHlDb25kaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCBwdWJs aWM6CiAgICAgZW51bSBLaW5kIHsKICAgICAgICAgUHJlc2VuY2UsCiAgICAgICAgIEFic2VuY2Us Ci0gICAgICAgIEFic2VuY2VPZlNldHRlciwKKyAgICAgICAgQWJzZW5jZU9mU2V0RWZmZWN0LAog ICAgICAgICBFcXVpdmFsZW5jZSAvLyBBbiBhZGFwdGl2ZSB3YXRjaHBvaW50IG9uIHRoaXMgd2ls bCBiZSBhIHBhaXIgb2Ygd2F0Y2hwb2ludHMsIGFuZCB3aGVuIHRoZSBzdHJ1Y3R1cmUgdHJhbnNp dGlvbnMsIHdlIHdpbGwgc2V0IHRoZSByZXBsYWNlbWVudCB3YXRjaHBvaW50IG9uIHRoZSBuZXcg c3RydWN0dXJlLgogICAgIH07CiAgICAgCkBAIC04OSwyMiArODksMjIgQEAgcHVibGljOgogICAg ICAgICByZXR1cm4gYWJzZW5jZVdpdGhvdXRCYXJyaWVyKHVpZCwgcHJvdG90eXBlKTsKICAgICB9 CiAgICAgCi0gICAgc3RhdGljIFByb3BlcnR5Q29uZGl0aW9uIGFic2VuY2VPZlNldHRlcldpdGhv dXRCYXJyaWVyKAorICAgIHN0YXRpYyBQcm9wZXJ0eUNvbmRpdGlvbiBhYnNlbmNlT2ZTZXRFZmZl Y3RXaXRob3V0QmFycmllcigKICAgICAgICAgVW5pcXVlZFN0cmluZ0ltcGwqIHVpZCwgSlNPYmpl Y3QqIHByb3RvdHlwZSkKICAgICB7CiAgICAgICAgIFByb3BlcnR5Q29uZGl0aW9uIHJlc3VsdDsK ICAgICAgICAgcmVzdWx0Lm1fdWlkID0gdWlkOwotICAgICAgICByZXN1bHQubV9raW5kID0gQWJz ZW5jZU9mU2V0dGVyOworICAgICAgICByZXN1bHQubV9raW5kID0gQWJzZW5jZU9mU2V0RWZmZWN0 OwogICAgICAgICByZXN1bHQudS5hYnNlbmNlLnByb3RvdHlwZSA9IHByb3RvdHlwZTsKICAgICAg ICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCi0gICAgc3RhdGljIFByb3BlcnR5Q29uZGl0 aW9uIGFic2VuY2VPZlNldHRlcigKKyAgICBzdGF0aWMgUHJvcGVydHlDb25kaXRpb24gYWJzZW5j ZU9mU2V0RWZmZWN0KAogICAgICAgICBWTSYgdm0sIEpTQ2VsbCogb3duZXIsIFVuaXF1ZWRTdHJp bmdJbXBsKiB1aWQsIEpTT2JqZWN0KiBwcm90b3R5cGUpCiAgICAgewogICAgICAgICBpZiAob3du ZXIpCiAgICAgICAgICAgICB2bS5oZWFwLndyaXRlQmFycmllcihvd25lcik7Ci0gICAgICAgIHJl dHVybiBhYnNlbmNlT2ZTZXR0ZXJXaXRob3V0QmFycmllcih1aWQsIHByb3RvdHlwZSk7CisgICAg ICAgIHJldHVybiBhYnNlbmNlT2ZTZXRFZmZlY3RXaXRob3V0QmFycmllcih1aWQsIHByb3RvdHlw ZSk7CiAgICAgfQogICAgIAogICAgIHN0YXRpYyBQcm9wZXJ0eUNvbmRpdGlvbiBlcXVpdmFsZW5j ZVdpdGhvdXRCYXJyaWVyKApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0 dXJuIHUucHJlc2VuY2UuYXR0cmlidXRlczsKICAgICB9CiAgICAgCi0gICAgYm9vbCBoYXNQcm90 b3R5cGUoKSBjb25zdCB7IHJldHVybiAhISp0aGlzICYmIChtX2tpbmQgPT0gQWJzZW5jZSB8fCBt X2tpbmQgPT0gQWJzZW5jZU9mU2V0dGVyKTsgfQorICAgIGJvb2wgaGFzUHJvdG90eXBlKCkgY29u c3QgeyByZXR1cm4gISEqdGhpcyAmJiAobV9raW5kID09IEFic2VuY2UgfHwgbV9raW5kID09IEFi c2VuY2VPZlNldEVmZmVjdCk7IH0KICAgICBKU09iamVjdCogcHJvdG90eXBlKCkgY29uc3QKICAg ICB7CiAgICAgICAgIEFTU0VSVChoYXNQcm90b3R5cGUoKSk7CkBAIC0xNjksNyArMTY5LDcgQEAg cHVibGljOgogICAgICAgICAgICAgcmVzdWx0IF49IHUucHJlc2VuY2UuYXR0cmlidXRlczsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFic2VuY2U6Ci0gICAgICAgIGNhc2UgQWJz ZW5jZU9mU2V0dGVyOgorICAgICAgICBjYXNlIEFic2VuY2VPZlNldEVmZmVjdDoKICAgICAgICAg ICAgIHJlc3VsdCBePSBXVEY6OlB0ckhhc2g8SlNPYmplY3QqPjo6aGFzaCh1LmFic2VuY2UucHJv dG90eXBlKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEVxdWl2YWxlbmNlOgpA QCAtMTkwLDcgKzE5MCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiB1LnByZXNlbmNl Lm9mZnNldCA9PSBvdGhlci51LnByZXNlbmNlLm9mZnNldAogICAgICAgICAgICAgICAgICYmIHUu cHJlc2VuY2UuYXR0cmlidXRlcyA9PSBvdGhlci51LnByZXNlbmNlLmF0dHJpYnV0ZXM7CiAgICAg ICAgIGNhc2UgQWJzZW5jZToKLSAgICAgICAgY2FzZSBBYnNlbmNlT2ZTZXR0ZXI6CisgICAgICAg IGNhc2UgQWJzZW5jZU9mU2V0RWZmZWN0OgogICAgICAgICAgICAgcmV0dXJuIHUuYWJzZW5jZS5w cm90b3R5cGUgPT0gb3RoZXIudS5hYnNlbmNlLnByb3RvdHlwZTsKICAgICAgICAgY2FzZSBFcXVp dmFsZW5jZToKICAgICAgICAgICAgIHJldHVybiB1LmVxdWl2YWxlbmNlLnZhbHVlID09IG90aGVy LnUuZXF1aXZhbGVuY2UudmFsdWU7Cg==