154607 2016-02-23 13:56:06 -0800 [ES6] Implement Proxy.[[Delete]] 2016-02-24 12:43:45 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1167537 0 saam 2016-02-23 13:56:06 -0800 ... 1167610 1 272068 saam 2016-02-23 17:21:23 -0800 Created attachment 272068 patch 1167812 2 272068 mark.lam 2016-02-24 09:42:56 -0800 Comment on attachment 272068 patch View in context: https://bugs.webkit.org/attachment.cgi?id=272068&action=review r=me > Source/JavaScriptCore/ChangeLog:8 > + This patch implements Proxy.[[Construct]] with respect to section 9.5.10 of the ECMAScript spec. cut and paste error: should be [[Delete]]. > Source/JavaScriptCore/runtime/ProxyObject.cpp:466 > +bool ProxyObject::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName) Since this function is deletePropertyByIndex, I think a better name for "propertyName" would be "propertyIndex". 1167890 3 saam 2016-02-24 12:43:45 -0800 landed in: http://trac.webkit.org/changeset/197042 272068 2016-02-23 17:21:23 -0800 2016-02-24 09:42:56 -0800 patch c-backup.diff text/plain 15028 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3MDA3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE2LTAyLTIzICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFtFUzZdIEltcGxlbWVudCBQcm94eS5bW0RlbGV0ZV1dCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ2MDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGltcGxlbWVudHMgUHJveHkuW1tD b25zdHJ1Y3RdXSB3aXRoIHJlc3BlY3QgdG8gc2VjdGlvbiA5LjUuMTAgb2YgdGhlIEVDTUFTY3Jp cHQgc3BlYy4KKyAgICAgICAgaHR0cHM6Ly90YzM5LmdpdGh1Yi5pby9lY21hMjYyLyNzZWMtcHJv eHktb2JqZWN0LWludGVybmFsLW1ldGhvZHMtYW5kLWludGVybmFsLXNsb3RzLWRlbGV0ZS1wCisK KyAgICAgICAgKiBydW50aW1lL0FycmF5UHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6Z2V0 UHJvcGVydHkpOgorICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmplY3QuY3BwOgorICAgICAgICAo SlNDOjpQcm94eU9iamVjdDo6Z2V0Q29uc3RydWN0RGF0YSk6CisgICAgICAgIChKU0M6OlByb3h5 T2JqZWN0OjpwZXJmb3JtRGVsZXRlKToKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OmRlbGV0 ZVByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OmRlbGV0ZVByb3BlcnR5QnlJ bmRleCk6CisgICAgICAgICogcnVudGltZS9Qcm94eU9iamVjdC5oOgorICAgICAgICAqIHRlc3Rz L2VzNi55YW1sOgorICAgICAgICAqIHRlc3RzL3N0cmVzcy9wcm94eS1kZWxldGUuanM6IEFkZGVk LgorICAgICAgICAoYXNzZXJ0KToKKyAgICAgICAgKHRocm93Lm5ldy5FcnJvci5sZXQuaGFuZGxl ci5nZXQgZGVsZXRlUHJvcGVydHkpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yKToKKyAgICAg ICAgKGFzc2VydC5sZXQuaGFuZGxlci5kZWxldGVQcm9wZXJ0eSk6CisgICAgICAgIChsZXQuaGFu ZGxlci5kZWxldGVQcm9wZXJ0eSk6CisKIDIwMTYtMDItMjMgIEtlaXRoIE1pbGxlciAgPGtlaXRo X21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgSlNDIHN0cmVzcyB0ZXN0cycgc3RhbmRhbG9u ZS1wcmUuanMgc2hvdWxkIGV4aXQgb24gdGhlIGZpcnN0IGZhaWx1cmUgYnkgZGVmYXVsdApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQcm90b3R5cGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJvdG90eXBlLmNw cAkocmV2aXNpb24gMTk2OTk0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJy YXlQcm90b3R5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNyArMTUxLDggQEAgc3RhdGlj IEFMV0FZU19JTkxJTkUgSlNWYWx1ZSBnZXRQcm9wZXJ0eQogewogICAgIGlmIChKU1ZhbHVlIHJl c3VsdCA9IG9iamVjdC0+dHJ5R2V0SW5kZXhRdWlja2x5KGluZGV4KSkKICAgICAgICAgcmV0dXJu IHJlc3VsdDsKLSAgICBQcm9wZXJ0eVNsb3Qgc2xvdChvYmplY3QsIFByb3BlcnR5U2xvdDo6SW50 ZXJuYWxNZXRob2RUeXBlOjpHZXQpOworICAgIC8vIEV2ZW4gdGhvdWdoIHdlIHBlcmZvcm0gYSBn ZXRWYWx1ZSgpIGhlcmUsIHdlJ3JlIHJlYWxseSBwZXJmb3JtaW5nIHRoaXMgb3BlcmF0aW9uIGFz IGEgVk1JbnF1aXJ5LgorICAgIFByb3BlcnR5U2xvdCBzbG90KG9iamVjdCwgUHJvcGVydHlTbG90 OjpJbnRlcm5hbE1ldGhvZFR5cGU6OlZNSW5xdWlyeSk7CiAgICAgaWYgKCFvYmplY3QtPmdldFBy b3BlcnR5U2xvdChleGVjLCBpbmRleCwgc2xvdCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlKCk7 CiAgICAgcmV0dXJuIHNsb3QuZ2V0VmFsdWUoZXhlYywgaW5kZXgpOwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAkocmV2aXNpb24gMTk2OTk0 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00MDUsNCArNDA1LDc1IEBAIENvbnN0cnVjdFR5cGUgUHJveHlPYmplY3Q6 OmdldENvbnN0cnVjdEQKICAgICByZXR1cm4gQ29uc3RydWN0VHlwZUhvc3Q7CiB9CiAKK3RlbXBs YXRlIDx0eXBlbmFtZSBEZWZhdWx0RGVsZXRlRnVuY3Rpb24+Citib29sIFByb3h5T2JqZWN0Ojpw ZXJmb3JtRGVsZXRlKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwg RGVmYXVsdERlbGV0ZUZ1bmN0aW9uIGRlZmF1bHREZWxldGVGdW5jdGlvbikKK3sKKyAgICBWTSYg dm0gPSBleGVjLT52bSgpOworICAgIEpTVmFsdWUgaGFuZGxlclZhbHVlID0gdGhpcy0+aGFuZGxl cigpOworICAgIGlmIChoYW5kbGVyVmFsdWUuaXNOdWxsKCkpIHsKKyAgICAgICAgdGhyb3dWTVR5 cGVFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwoIlByb3h5ICdoYW5kbGVyJyBpcyBudWxsLiBJdCBz aG91bGQgYmUgYW4gT2JqZWN0LiIpKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwor ICAgIEpTT2JqZWN0KiBoYW5kbGVyID0ganNDYXN0PEpTT2JqZWN0Kj4oaGFuZGxlclZhbHVlKTsK KyAgICBDYWxsRGF0YSBjYWxsRGF0YTsKKyAgICBDYWxsVHlwZSBjYWxsVHlwZTsKKyAgICBKU1Zh bHVlIGRlbGV0ZVByb3BlcnR5TWV0aG9kID0gaGFuZGxlci0+Z2V0TWV0aG9kKGV4ZWMsIGNhbGxE YXRhLCBjYWxsVHlwZSwgbWFrZUlkZW50aWZpZXIodm0sICJkZWxldGVQcm9wZXJ0eSIpLCBBU0NJ SUxpdGVyYWwoIidkZWxldGVQcm9wZXJ0eScgcHJvcGVydHkgb2YgYSBQcm94eSdzIGhhbmRsZXIg c2hvdWxkIGJlIGNhbGxhYmxlLiIpKTsKKyAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBKU09iamVjdCogdGFyZ2V0ID0gdGhpcy0+dGFyZ2V0 KCk7CisgICAgaWYgKGRlbGV0ZVByb3BlcnR5TWV0aG9kLmlzVW5kZWZpbmVkKCkpCisgICAgICAg IHJldHVybiBkZWZhdWx0RGVsZXRlRnVuY3Rpb24oKTsKKworICAgIE1hcmtlZEFyZ3VtZW50QnVm ZmVyIGFyZ3VtZW50czsKKyAgICBhcmd1bWVudHMuYXBwZW5kKHRhcmdldCk7CisgICAgYXJndW1l bnRzLmFwcGVuZChpZGVudGlmaWVyVG9TYWZlUHVibGljSlNWYWx1ZSh2bSwgSWRlbnRpZmllcjo6 ZnJvbVVpZCgmdm0sIHByb3BlcnR5TmFtZS51aWQoKSkpKTsKKyAgICBKU1ZhbHVlIHRyYXBSZXN1 bHQgPSBjYWxsKGV4ZWMsIGRlbGV0ZVByb3BlcnR5TWV0aG9kLCBjYWxsVHlwZSwgY2FsbERhdGEs IGhhbmRsZXIsIGFyZ3VtZW50cyk7CisgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBib29sIHRyYXBSZXN1bHRBc0Jvb2wgPSB0cmFwUmVz dWx0LnRvQm9vbGVhbihleGVjKTsKKyAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghdHJhcFJlc3VsdEFzQm9vbCkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgUHJvcGVydHlEZXNjcmlwdG9yIGRlc2NyaXB0b3I7CisgICAg aWYgKHRhcmdldC0+Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGV4ZWMsIHByb3BlcnR5TmFtZSwg ZGVzY3JpcHRvcikpIHsKKyAgICAgICAgaWYgKCFkZXNjcmlwdG9yLmNvbmZpZ3VyYWJsZSgpKSB7 CisgICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiUHJveHkg aGFuZGxlcidzICdkZWxldGVQcm9wZXJ0eScgbWV0aG9kIHNob3VsZCByZXR1cm4gZmFsc2Ugd2hl biB0aGUgdGFyZ2V0J3MgcHJvcGVydHkgaXMgbm90IGNvbmZpZ3VyYWJsZS4iKSk7CisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoZXhlYy0+aGFk RXhjZXB0aW9uKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOwor fQorCitib29sIFByb3h5T2JqZWN0OjpkZWxldGVQcm9wZXJ0eShKU0NlbGwqIGNlbGwsIEV4ZWNT dGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKK3sKKyAgICBQcm94eU9iamVj dCogdGhpc09iamVjdCA9IGpzQ2FzdDxQcm94eU9iamVjdCo+KGNlbGwpOworICAgIGF1dG8gZGVm YXVsdERlbGV0ZSA9IFsmXSAoKSAtPiBib29sIHsKKyAgICAgICAgSlNPYmplY3QqIHRhcmdldCA9 IGpzQ2FzdDxKU09iamVjdCo+KHRoaXNPYmplY3QtPnRhcmdldCgpKTsKKyAgICAgICAgcmV0dXJu IHRhcmdldC0+bWV0aG9kVGFibGUoZXhlYy0+dm0oKSktPmRlbGV0ZVByb3BlcnR5KHRhcmdldCwg ZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICB9OworICAgIHJldHVybiB0aGlzT2JqZWN0LT5wZXJm b3JtRGVsZXRlKGV4ZWMsIHByb3BlcnR5TmFtZSwgZGVmYXVsdERlbGV0ZSk7Cit9CisKK2Jvb2wg UHJveHlPYmplY3Q6OmRlbGV0ZVByb3BlcnR5QnlJbmRleChKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0 ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlOYW1lKQoreworICAgIFByb3h5T2JqZWN0KiB0aGlz T2JqZWN0ID0ganNDYXN0PFByb3h5T2JqZWN0Kj4oY2VsbCk7CisgICAgSWRlbnRpZmllciBpZGVu dCA9IElkZW50aWZpZXI6OmZyb20oZXhlYywgcHJvcGVydHlOYW1lKTsgCisgICAgaWYgKGV4ZWMt PmhhZEV4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgYXV0byBkZWZhdWx0 RGVsZXRlID0gWyZdICgpIC0+IGJvb2wgeworICAgICAgICBKU09iamVjdCogdGFyZ2V0ID0ganND YXN0PEpTT2JqZWN0Kj4odGhpc09iamVjdC0+dGFyZ2V0KCkpOworICAgICAgICByZXR1cm4gdGFy Z2V0LT5tZXRob2RUYWJsZShleGVjLT52bSgpKS0+ZGVsZXRlUHJvcGVydHlCeUluZGV4KHRhcmdl dCwgZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICB9OworICAgIHJldHVybiB0aGlzT2JqZWN0LT5w ZXJmb3JtRGVsZXRlKGV4ZWMsIGlkZW50LmltcGwoKSwgZGVmYXVsdERlbGV0ZSk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJv eHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Q cm94eU9iamVjdC5oCShyZXZpc2lvbiAxOTY5OTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9Qcm94eU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC02MywxMSArNjMsMTUgQEAg cHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3RCeUluZGV4KEpTT2Jq ZWN0KiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmKTsK ICAgICBzdGF0aWMgQ2FsbFR5cGUgZ2V0Q2FsbERhdGEoSlNDZWxsKiwgQ2FsbERhdGEmKTsKICAg ICBzdGF0aWMgQ29uc3RydWN0VHlwZSBnZXRDb25zdHJ1Y3REYXRhKEpTQ2VsbCosIENvbnN0cnVj dERhdGEmKTsKKyAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwqLCBFeGVjU3Rh dGUqLCBQcm9wZXJ0eU5hbWUpOworICAgIHN0YXRpYyBib29sIGRlbGV0ZVByb3BlcnR5QnlJbmRl eChKU0NlbGwqLCBFeGVjU3RhdGUqLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpOwogICAgIHN0YXRp YyB2b2lkIHZpc2l0Q2hpbGRyZW4oSlNDZWxsKiwgU2xvdFZpc2l0b3ImKTsKIAogICAgIGJvb2wg Z2V0T3duUHJvcGVydHlTbG90Q29tbW9uKEV4ZWNTdGF0ZSosIFByb3BlcnR5TmFtZSwgUHJvcGVy dHlTbG90Jik7CiAgICAgYm9vbCBwZXJmb3JtSW50ZXJuYWxNZXRob2RHZXRPd25Qcm9wZXJ0eShF eGVjU3RhdGUqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogICAgIGJvb2wgcGVyZm9y bUhhc1Byb3BlcnR5KEV4ZWNTdGF0ZSosIFByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90Jik7Cisg ICAgdGVtcGxhdGUgPHR5cGVuYW1lIERlZmF1bHREZWxldGVGdW5jdGlvbj4KKyAgICBib29sIHBl cmZvcm1EZWxldGUoRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lLCBEZWZhdWx0RGVsZXRlRnVuY3Rp b24pOwogCiAgICAgV3JpdGVCYXJyaWVyPEpTT2JqZWN0PiBtX3RhcmdldDsKICAgICBXcml0ZUJh cnJpZXI8VW5rbm93bj4gbV9oYW5kbGVyOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rl c3RzL2VzNi55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9l czYueWFtbAkocmV2aXNpb24gMTk2OTk0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3Rz L2VzNi55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC05MTcsNyArOTE3LDcgQEAKIC0gcGF0aDogZXM2 L1Byb3h5X2RlZmluZVByb3BlcnR5X2hhbmRsZXIuanMKICAgY21kOiBydW5FUzYgOmZhaWwKIC0g cGF0aDogZXM2L1Byb3h5X2RlbGV0ZVByb3BlcnR5X2hhbmRsZXIuanMKLSAgY21kOiBydW5FUzYg OmZhaWwKKyAgY21kOiBydW5FUzYgOm5vcm1hbAogLSBwYXRoOiBlczYvUHJveHlfZW51bWVyYXRl X2hhbmRsZXIuanMKICAgY21kOiBydW5FUzYgOmZhaWwKIC0gcGF0aDogZXM2L1Byb3h5X2dldF9o YW5kbGVyLmpzCkBAIC05MzcsMTMgKzkzNywxMyBAQAogLSBwYXRoOiBlczYvUHJveHlfaW50ZXJu YWxfZGVmaW5lUHJvcGVydHlfY2FsbHNfU2V0SW50ZWdyaXR5TGV2ZWwuanMKICAgY21kOiBydW5F UzYgOmZhaWwKIC0gcGF0aDogZXM2L1Byb3h5X2ludGVybmFsX2RlbGV0ZVByb3BlcnR5X2NhbGxz X0FycmF5LnByb3RvdHlwZS5jb3B5V2l0aGluLmpzCi0gIGNtZDogcnVuRVM2IDpmYWlsCisgIGNt ZDogcnVuRVM2IDpub3JtYWwKIC0gcGF0aDogZXM2L1Byb3h5X2ludGVybmFsX2RlbGV0ZVByb3Bl cnR5X2NhbGxzX0FycmF5LnByb3RvdHlwZS5wb3AuanMKLSAgY21kOiBydW5FUzYgOmZhaWwKKyAg Y21kOiBydW5FUzYgOm5vcm1hbAogLSBwYXRoOiBlczYvUHJveHlfaW50ZXJuYWxfZGVsZXRlUHJv cGVydHlfY2FsbHNfQXJyYXkucHJvdG90eXBlLnJldmVyc2UuanMKICAgY21kOiBydW5FUzYgOmZh aWwKIC0gcGF0aDogZXM2L1Byb3h5X2ludGVybmFsX2RlbGV0ZVByb3BlcnR5X2NhbGxzX0FycmF5 LnByb3RvdHlwZS5zaGlmdC5qcwotICBjbWQ6IHJ1bkVTNiA6ZmFpbAorICBjbWQ6IHJ1bkVTNiA6 bm9ybWFsCiAtIHBhdGg6IGVzNi9Qcm94eV9pbnRlcm5hbF9kZWxldGVQcm9wZXJ0eV9jYWxsc19B cnJheS5wcm90b3R5cGUuc3BsaWNlLmpzCiAgIGNtZDogcnVuRVM2IDpmYWlsCiAtIHBhdGg6IGVz Ni9Qcm94eV9pbnRlcm5hbF9kZWxldGVQcm9wZXJ0eV9jYWxsc19BcnJheS5wcm90b3R5cGUudW5z aGlmdC5qcwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9wcm94eS1k ZWxldGUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVz cy9wcm94eS1kZWxldGUuanMJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv dGVzdHMvc3RyZXNzL3Byb3h5LWRlbGV0ZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDI3 NyBAQAorZnVuY3Rpb24gYXNzZXJ0KGIpIHsKKyAgICBpZiAoIWIpCisgICAgICAgIHRocm93IG5l dyBFcnJvcigiYmFkIGFzc2VydGlvbi4iKTsKK30KKworeworICAgIGxldCB0YXJnZXQgPSB7eDog MjB9OworICAgIGxldCBlcnJvciA9IG51bGw7CisgICAgbGV0IGhhbmRsZXIgPSB7CisgICAgICAg IGdldCBkZWxldGVQcm9wZXJ0eSgpIHsKKyAgICAgICAgICAgIGVycm9yID0gbmV3IEVycm9yOwor ICAgICAgICAgICAgdGhyb3cgZXJyb3I7CisgICAgICAgIH0KKyAgICB9OworICAgIGxldCBwcm94 eSA9IG5ldyBQcm94eSh0YXJnZXQsIGhhbmRsZXIpOworICAgIGZvciAobGV0IGkgPSAwOyBpIDwg NTAwOyBpKyspIHsKKyAgICAgICAgbGV0IHRocmV3ID0gZmFsc2U7CisgICAgICAgIHRyeSB7Cisg ICAgICAgICAgICBkZWxldGUgcHJveHkueDsKKyAgICAgICAgfSBjYXRjaChlKSB7CisgICAgICAg ICAgICBhc3NlcnQoZSA9PT0gZXJyb3IpOworICAgICAgICAgICAgdGhyZXcgPSB0cnVlOworICAg ICAgICB9CisgICAgICAgIGFzc2VydCh0aHJldyk7CisgICAgfQorfQorCit7CisgICAgbGV0IHRh cmdldCA9IHt4OiAyMH07CisgICAgbGV0IGVycm9yID0gbnVsbDsKKyAgICBsZXQgaGFuZGxlciA9 IHsKKyAgICAgICAgZGVsZXRlUHJvcGVydHk6IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgZXJy b3IgPSBuZXcgRXJyb3I7CisgICAgICAgICAgICB0aHJvdyBlcnJvcjsKKyAgICAgICAgfQorICAg IH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdldCwgaGFuZGxlcik7CisgICAgZm9y IChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAgICBsZXQgdGhyZXcgPSBmYWxzZTsK KyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGRlbGV0ZSBwcm94eS54OworICAgICAgICB9IGNh dGNoKGUpIHsKKyAgICAgICAgICAgIGFzc2VydChlID09PSBlcnJvcik7CisgICAgICAgICAgICB0 aHJldyA9IHRydWU7CisgICAgICAgIH0KKyAgICAgICAgYXNzZXJ0KHRocmV3KTsKKyAgICB9Cit9 CisKK3sKKyAgICBsZXQgdGFyZ2V0ID0ge3g6IDIwfTsKKyAgICBsZXQgZXJyb3IgPSBudWxsOwor ICAgIGxldCBoYW5kbGVyID0geworICAgICAgICBkZWxldGVQcm9wZXJ0eTogNDUKKyAgICB9Owor ICAgIGxldCBwcm94eSA9IG5ldyBQcm94eSh0YXJnZXQsIGhhbmRsZXIpOworICAgIGZvciAobGV0 IGkgPSAwOyBpIDwgNTAwOyBpKyspIHsKKyAgICAgICAgbGV0IHRocmV3ID0gZmFsc2U7CisgICAg ICAgIHRyeSB7CisgICAgICAgICAgICBkZWxldGUgcHJveHkueDsKKyAgICAgICAgfSBjYXRjaChl KSB7CisgICAgICAgICAgICBhc3NlcnQoZS50b1N0cmluZygpID09PSAiVHlwZUVycm9yOiAnZGVs ZXRlUHJvcGVydHknIHByb3BlcnR5IG9mIGEgUHJveHkncyBoYW5kbGVyIHNob3VsZCBiZSBjYWxs YWJsZS4iKTsKKyAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBh c3NlcnQodGhyZXcpOworICAgIH0KK30KKworeworICAgIGxldCB0YXJnZXQgPSB7fTsKKyAgICBP YmplY3QuZGVmaW5lUHJvcGVydHkodGFyZ2V0LCAieCIsIHsKKyAgICAgICAgY29uZmlndXJhYmxl OiBmYWxzZSwKKyAgICAgICAgdmFsdWU6IDI1CisgICAgfSk7CisgICAgbGV0IGVycm9yID0gbnVs bDsKKyAgICBsZXQgaGFuZGxlciA9IHsKKyAgICAgICAgZGVsZXRlUHJvcGVydHk6IGZ1bmN0aW9u KHRoZVRhcmdldCwgcHJvcE5hbWUpIHsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGVUYXJnZXRbcHJv cE5hbWVdOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICB9OworICAg IGxldCBwcm94eSA9IG5ldyBQcm94eSh0YXJnZXQsIGhhbmRsZXIpOworICAgIGZvciAobGV0IGkg PSAwOyBpIDwgNTAwOyBpKyspIHsKKyAgICAgICAgbGV0IHRocmV3ID0gZmFsc2U7CisgICAgICAg IHRyeSB7CisgICAgICAgICAgICBkZWxldGUgcHJveHkueDsKKyAgICAgICAgfSBjYXRjaChlKSB7 CisgICAgICAgICAgICBhc3NlcnQoZS50b1N0cmluZygpID09PSAiVHlwZUVycm9yOiBQcm94eSBo YW5kbGVyJ3MgJ2RlbGV0ZVByb3BlcnR5JyBtZXRob2Qgc2hvdWxkIHJldHVybiBmYWxzZSB3aGVu IHRoZSB0YXJnZXQncyBwcm9wZXJ0eSBpcyBub3QgY29uZmlndXJhYmxlLiIpOworICAgICAgICAg ICAgdGhyZXcgPSB0cnVlOworICAgICAgICB9CisgICAgICAgIGFzc2VydCh0aHJldyk7CisgICAg fQorfQorCit7CisgICAgbGV0IHRhcmdldCA9IHt9OworICAgIGxldCBlcnJvciA9IG51bGw7Cisg ICAgbGV0IGhhbmRsZXIgPSB7CisgICAgICAgIGRlbGV0ZVByb3BlcnR5OiBudWxsCisgICAgfTsK KyAgICBsZXQgcHJveHkgPSBuZXcgUHJveHkodGFyZ2V0LCBoYW5kbGVyKTsKKyAgICBmb3IgKGxl dCBpID0gMDsgaSA8IDUwMDsgaSsrKSB7CisgICAgICAgIHRhcmdldC54ID0gaTsKKyAgICAgICAg YXNzZXJ0KHByb3h5LnggPT09IGkpOworICAgICAgICBsZXQgcmVzdWx0ID0gZGVsZXRlIHByb3h5 Lng7CisgICAgICAgIGFzc2VydChyZXN1bHQpOworICAgICAgICBhc3NlcnQocHJveHkueCA9PT0g dW5kZWZpbmVkKTsKKyAgICB9Cit9CisKK3sKKyAgICBsZXQgdGFyZ2V0ID0ge307CisgICAgbGV0 IGVycm9yID0gbnVsbDsKKyAgICBsZXQgaGFuZGxlciA9IHsKKyAgICAgICAgZGVsZXRlUHJvcGVy dHk6IHVuZGVmaW5lZAorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdldCwg aGFuZGxlcik7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAgICB0 YXJnZXRbaV0gPSBpOworICAgICAgICBhc3NlcnQocHJveHlbaV0gPT09IGkpOworICAgICAgICBs ZXQgcmVzdWx0ID0gZGVsZXRlIHByb3h5W2ldOworICAgICAgICBhc3NlcnQocmVzdWx0KTsKKyAg ICAgICAgYXNzZXJ0KHByb3h5W2ldID09PSB1bmRlZmluZWQpOworICAgIH0KK30KKworeworICAg IGxldCB0YXJnZXQgPSB7fTsKKyAgICBsZXQgY2FsbGVkID0gZmFsc2U7CisgICAgbGV0IGhhbmRs ZXIgPSB7CisgICAgICAgIGRlbGV0ZVByb3BlcnR5OiBmdW5jdGlvbih0aGVUYXJnZXQsIHByb3BO YW1lKSB7CisgICAgICAgICAgICBjYWxsZWQgPSB0cnVlOworICAgICAgICAgICAgYXNzZXJ0KHRo ZVRhcmdldCA9PT0gdGFyZ2V0KTsKKyAgICAgICAgICAgIGFzc2VydChwcm9wTmFtZSA9PT0gIngi KTsKKyAgICAgICAgICAgIHJldHVybiBkZWxldGUgdGhlVGFyZ2V0W3Byb3BOYW1lXTsKKyAgICAg ICAgfQorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdldCwgaGFuZGxlcik7 CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAgICB0YXJnZXQueCA9 IGk7CisgICAgICAgIGFzc2VydChwcm94eS54ID09PSBpKTsKKyAgICAgICAgbGV0IHJlc3VsdCA9 IGRlbGV0ZSBwcm94eS54OworICAgICAgICBhc3NlcnQocmVzdWx0KTsKKyAgICAgICAgYXNzZXJ0 KHByb3h5LnggPT09IHVuZGVmaW5lZCk7CisgICAgICAgIGFzc2VydCh0YXJnZXQueCA9PT0gdW5k ZWZpbmVkKTsKKyAgICAgICAgYXNzZXJ0KGNhbGxlZCk7CisgICAgICAgIGNhbGxlZCA9IGZhbHNl OworICAgIH0KK30KKworeworICAgIGxldCB0YXJnZXQgPSB7fTsKKyAgICBsZXQgY2FsbGVkID0g ZmFsc2U7CisgICAgbGV0IGhhbmRsZXIgPSB7CisgICAgICAgIGRlbGV0ZVByb3BlcnR5OiBmdW5j dGlvbih0aGVUYXJnZXQsIHByb3BOYW1lKSB7CisgICAgICAgICAgICBjYWxsZWQgPSB0cnVlOwor ICAgICAgICAgICAgYXNzZXJ0KHRoZVRhcmdldCA9PT0gdGFyZ2V0KTsKKyAgICAgICAgICAgIGFz c2VydChwcm9wTmFtZSA9PT0gIngiKTsKKyAgICAgICAgICAgIHJldHVybiBkZWxldGUgdGhlVGFy Z2V0W3Byb3BOYW1lXTsKKyAgICAgICAgfQorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFBy b3h5KHRhcmdldCwgaGFuZGxlcik7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykg eworICAgICAgICB0YXJnZXQueCA9IGk7CisgICAgICAgIGFzc2VydChwcm94eS54ID09PSBpKTsK KyAgICAgICAgbGV0IHJlc3VsdCA9IGRlbGV0ZSBwcm94eVsieCJdOworICAgICAgICBhc3NlcnQo cmVzdWx0KTsKKyAgICAgICAgYXNzZXJ0KHByb3h5LnggPT09IHVuZGVmaW5lZCk7CisgICAgICAg IGFzc2VydCh0YXJnZXQueCA9PT0gdW5kZWZpbmVkKTsKKyAgICAgICAgYXNzZXJ0KGNhbGxlZCk7 CisgICAgICAgIGNhbGxlZCA9IGZhbHNlOworICAgIH0KK30KKworeworICAgIGxldCB0YXJnZXQg PSB7fTsKKyAgICBsZXQgY2FsbGVkID0gZmFsc2U7CisgICAgbGV0IGhhbmRsZXIgPSB7CisgICAg ICAgIGRlbGV0ZVByb3BlcnR5OiBmdW5jdGlvbih0aGVUYXJnZXQsIHByb3BOYW1lKSB7CisgICAg ICAgICAgICBjYWxsZWQgPSB0cnVlOworICAgICAgICAgICAgYXNzZXJ0KHRoZVRhcmdldCA9PT0g dGFyZ2V0KTsKKyAgICAgICAgICAgIHJldHVybiBkZWxldGUgdGhlVGFyZ2V0W3Byb3BOYW1lXTsK KyAgICAgICAgfQorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdldCwgaGFu ZGxlcik7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAgICB0YXJn ZXRbaV0gPSBpOworICAgICAgICBhc3NlcnQocHJveHlbaV0gPT09IGkpOworICAgICAgICBsZXQg cmVzdWx0ID0gZGVsZXRlIHByb3h5W2ldOworICAgICAgICBhc3NlcnQocmVzdWx0KTsKKyAgICAg ICAgYXNzZXJ0KHByb3h5W2ldID09PSB1bmRlZmluZWQpOworICAgICAgICBhc3NlcnQodGFyZ2V0 W2ldID09PSB1bmRlZmluZWQpOworICAgICAgICBhc3NlcnQoY2FsbGVkKTsKKyAgICAgICAgY2Fs bGVkID0gZmFsc2U7CisgICAgfQorfQorCit7CisgICAgbGV0IHRhcmdldCA9IHt9OworICAgIGxl dCBjYWxsZWQgPSBmYWxzZTsKKyAgICBsZXQgaGFuZGxlciA9IHsKKyAgICAgICAgZGVsZXRlUHJv cGVydHk6IGZ1bmN0aW9uKHRoZVRhcmdldCwgcHJvcE5hbWUpIHsKKyAgICAgICAgICAgIGNhbGxl ZCA9IHRydWU7CisgICAgICAgICAgICBhc3NlcnQodGhlVGFyZ2V0ID09PSB0YXJnZXQpOworICAg ICAgICAgICAgZGVsZXRlIHRoZVRhcmdldFtwcm9wTmFtZV07CisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7IC8vIFdlJ3JlIGxpYXJzLgorICAgICAgICB9CisgICAgfTsKKyAgICBsZXQgcHJveHkg PSBuZXcgUHJveHkodGFyZ2V0LCBoYW5kbGVyKTsKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8IDUw MDsgaSsrKSB7CisgICAgICAgIHRhcmdldFtpXSA9IGk7CisgICAgICAgIGFzc2VydChwcm94eVtp XSA9PT0gaSk7CisgICAgICAgIGxldCByZXN1bHQgPSBkZWxldGUgcHJveHlbaV07CisgICAgICAg IGFzc2VydCghcmVzdWx0KTsKKyAgICAgICAgYXNzZXJ0KHByb3h5W2ldID09PSB1bmRlZmluZWQp OworICAgICAgICBhc3NlcnQodGFyZ2V0W2ldID09PSB1bmRlZmluZWQpOworICAgICAgICBhc3Nl cnQoY2FsbGVkKTsKKyAgICAgICAgY2FsbGVkID0gZmFsc2U7CisgICAgfQorfQorCit7CisgICAg bGV0IHRhcmdldCA9IHt9OworICAgIGxldCBlcnJvciA9IG51bGw7CisgICAgbGV0IGNhbGxlZCA9 IGZhbHNlOworICAgIGxldCBoYW5kbGVyID0geworICAgICAgICBkZWxldGVQcm9wZXJ0eTogZnVu Y3Rpb24odGhlVGFyZ2V0LCBwcm9wTmFtZSkgeworICAgICAgICAgICAgY2FsbGVkID0gdHJ1ZTsK KyAgICAgICAgICAgIHJldHVybiBkZWxldGUgdGhlVGFyZ2V0W3Byb3BOYW1lXTsKKyAgICAgICAg fQorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdldCwgaGFuZGxlcik7Cisg ICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAgICBPYmplY3QuZGVmaW5l UHJvcGVydHkodGFyZ2V0LCAieCIsIHsKKyAgICAgICAgICAgIGNvbmZpZ3VyYWJsZTogdHJ1ZSwK KyAgICAgICAgICAgIHdyaXRhYmxlOiBmYWxzZSwKKyAgICAgICAgICAgIHZhbHVlOiAyNQorICAg ICAgICB9KTsKKyAgICAgICAgdGFyZ2V0LnggPSAzMDsKKyAgICAgICAgYXNzZXJ0KHRhcmdldC54 ID09PSAyNSk7CisgICAgICAgIGFzc2VydChwcm94eS54ID09PSAyNSk7CisgICAgICAgIGRlbGV0 ZSBwcm94eS54OworICAgICAgICBhc3NlcnQodGFyZ2V0LnggPT09IHVuZGVmaW5lZCk7CisgICAg ICAgIGFzc2VydChwcm94eS54ID09PSB1bmRlZmluZWQpOworICAgICAgICBhc3NlcnQoISgieCIg aW4gcHJveHkpKTsKKyAgICAgICAgYXNzZXJ0KCEoIngiIGluIHRhcmdldCkpOworICAgICAgICBh c3NlcnQoY2FsbGVkKTsKKyAgICAgICAgY2FsbGVkID0gZmFsc2U7CisgICAgfQorfQorCit7Cisg ICAgbGV0IHRhcmdldCA9IHt9OworICAgIGxldCBlcnJvciA9IG51bGw7CisgICAgT2JqZWN0LmRl ZmluZVByb3BlcnR5KHRhcmdldCwgIngiLCB7CisgICAgICAgIGNvbmZpZ3VyYWJsZTogZmFsc2Us CisgICAgICAgIHdyaXRhYmxlOiBmYWxzZSwKKyAgICAgICAgdmFsdWU6IDI1CisgICAgfSk7Cisg ICAgbGV0IGNhbGxlZCA9IGZhbHNlOworICAgIGxldCBoYW5kbGVyID0geworICAgICAgICBkZWxl dGVQcm9wZXJ0eTogZnVuY3Rpb24odGhlVGFyZ2V0LCBwcm9wTmFtZSkgeworICAgICAgICAgICAg Y2FsbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBkZWxldGUgdGhlVGFyZ2V0W3Byb3BO YW1lXTsKKyAgICAgICAgfQorICAgIH07CisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHRhcmdl dCwgaGFuZGxlcik7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7IGkrKykgeworICAgICAg ICB0YXJnZXQueCA9IDMwOworICAgICAgICBhc3NlcnQodGFyZ2V0LnggPT09IDI1KTsKKyAgICAg ICAgYXNzZXJ0KHByb3h5LnggPT09IDI1KTsKKyAgICAgICAgbGV0IHJlc3VsdCA9IGRlbGV0ZSBw cm94eS54OworICAgICAgICBhc3NlcnQoIXJlc3VsdCk7CisgICAgICAgIGFzc2VydChjYWxsZWQp OworICAgICAgICBjYWxsZWQgPSBmYWxzZTsKKyAgICB9Cit9Cg==