157120 2016-04-27 22:44:38 -0700 The GetterSetter structure needs a globalObject. 2016-04-27 23:55:10 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin fpizlo ggaren joepeck keith_miller msaboff saam webkit-bug-importer oldest_to_newest 1188138 0 mark.lam 2016-04-27 22:44:38 -0700 In r199170: <http://trac.webkit.org/changeset/199170>, GetterSetter was promoted from a JSCell to a JSObject. JSObject methods expect their structure to have a globalObject. For example, see JSObject::calculatedClassName(). GetterSetter was previously using a singleton getterSetterStructure owned by the VM. That singleton getterSetterStructure is not associated with any globalObjects. As a result, JSObject::calculatedClassName() will run into a null globalObject when it is called on a GetterSetter object. This patch removes the VM singleton getterSetterStructure, and instead, creates a getterSetterStructure for each JSGlobalObject. 1188139 1 mark.lam 2016-04-27 22:45:10 -0700 <rdar://problem/25965945> 1188141 2 277595 mark.lam 2016-04-27 22:50:55 -0700 Created attachment 277595 proposed patch. 1188152 3 mark.lam 2016-04-27 23:55:10 -0700 Thanks for the review. Landed in r200177: <http://trac.webkit.org/r200177>. 277595 2016-04-27 22:50:55 -0700 2016-04-27 23:01:06 -0700 proposed patch. bug-157120.patch text/plain 9357 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwMTcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDE2LTA0LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBU aGUgR2V0dGVyU2V0dGVyIHN0cnVjdHVyZSBuZWVkcyBhIGdsb2JhbE9iamVjdC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzEyMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHIxOTkxNzA6IDxodHRw Oi8vdHJhYy53ZWJraXQub3JnL3IxOTkxNzA+LCBHZXR0ZXJTZXR0ZXIgd2FzIHByb21vdGVkIGZy b20KKyAgICAgICAgYmVpbmcgYSBKU0NlbGwgdG8gYSBKU09iamVjdC4gIEpTT2JqZWN0IG1ldGhv ZHMgZXhwZWN0IHRoZWlyIHN0cnVjdHVyZSB0byBoYXZlIGEKKyAgICAgICAgZ2xvYmFsT2JqZWN0 LiAgRm9yIGV4YW1wbGUsIHNlZSBKU09iamVjdDo6Y2FsY3VsYXRlZENsYXNzTmFtZSgpLiAgR2V0 dGVyU2V0dGVyCisgICAgICAgIHdhcyBwcmV2aW91c2x5IHVzaW5nIGEgc2luZ2xldG9uIGdldHRl clNldHRlclN0cnVjdHVyZSBvd25lZCBieSB0aGUgVk0uICBUaGF0CisgICAgICAgIHNpbmdsZXRv biBnZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmUgaXMgbm90IGFzc29jaWF0ZWQgd2l0aCBhbnkgZ2xvYmFs T2JqZWN0cy4gIEFzIGEKKyAgICAgICAgcmVzdWx0LCBKU09iamVjdDo6Y2FsY3VsYXRlZENsYXNz TmFtZSgpIHdpbGwgcnVuIGludG8gYSBudWxsIGdsb2JhbE9iamVjdCB3aGVuIGl0CisgICAgICAg IGlzIGNhbGxlZCBvbiBhIEdldHRlclNldHRlciBvYmplY3QuCisKKyAgICAgICAgVGhpcyBwYXRj aCByZW1vdmVzIHRoZSBWTSBzaW5nbGV0b24gZ2V0dGVyU2V0dGVyU3RydWN0dXJlLCBhbmQgaW5z dGVhZCwgY3JlYXRlcworICAgICAgICBhIGdldHRlclNldHRlclN0cnVjdHVyZSBmb3IgZWFjaCBK U0dsb2JhbE9iamVjdC4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5s aW5lcy5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RT dGF0ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6CisgICAgICAgICogZGZnL0RGR1N0cnVjdHVyZVJl Z2lzdHJhdGlvblBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTdHJ1Y3R1cmVSZWdpc3Ry YXRpb25QaGFzZTo6cnVuKToKKyAgICAgICAgKiBydW50aW1lL0dldHRlclNldHRlci5oOgorICAg ICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpKU0dsb2Jh bE9iamVjdDo6aW5pdCk6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0Ojp2aXNpdENoaWxk cmVuKToKKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFsT2JqZWN0Lmg6CisgICAgICAgIChKU0M6 OkpTR2xvYmFsT2JqZWN0OjpmdW5jdGlvblN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6OkpTR2xv YmFsT2JqZWN0Ojpib3VuZEZ1bmN0aW9uU3RydWN0dXJlKToKKyAgICAgICAgKEpTQzo6SlNHbG9i YWxPYmplY3Q6OmJvdW5kU2xvdEJhc2VGdW5jdGlvblN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6 OkpTR2xvYmFsT2JqZWN0OjpnZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpK U0dsb2JhbE9iamVjdDo6bmF0aXZlU3RkRnVuY3Rpb25TdHJ1Y3R1cmUpOgorICAgICAgICAoSlND OjpKU0dsb2JhbE9iamVjdDo6bmFtZWRGdW5jdGlvblN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6 OkpTR2xvYmFsT2JqZWN0OjpmdW5jdGlvbk5hbWVPZmZzZXQpOgorICAgICAgICAqIHJ1bnRpbWUv Vk0uY3BwOgorICAgICAgICAoSlNDOjpWTTo6Vk0pOgorICAgICAgICAqIHJ1bnRpbWUvVk0uaDoK KwogMjAxNi0wNC0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCBSZXZlcnQgcjE5OTM5NyBkdWUgdG8gUExUIHJlZ3Jlc3Npb25z CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJ bmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0 cmFjdEludGVycHJldGVySW5saW5lcy5oCShyZXZpc2lvbiAyMDAxNzEpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTIzNzEsNyArMjM3MSw3IEBAIGJvb2wgQWJzdHJhY3RJbnRlcnByZXRlcjxBYnN0 cmFjdFN0YXRlVHkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIAotICAg ICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBoLCBtX2dyYXBoLm1fdm0uZ2V0dGVyU2V0dGVy U3RydWN0dXJlLmdldCgpKTsKKyAgICAgICAgZm9yTm9kZShub2RlKS5zZXQobV9ncmFwaCwgbV9n cmFwaC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKS0+Z2V0dGVyU2V0dGVy U3RydWN0dXJlKCkpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgICAgIApJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJ1Y3R1cmVSZWdpc3RyYXRpb25QaGFzZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJ1Y3R1cmVSZWdp c3RyYXRpb25QaGFzZS5jcHAJKHJldmlzaW9uIDIwMDE3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3RydWN0dXJlUmVnaXN0cmF0aW9uUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02Miw3ICs2Miw2IEBAIHB1YmxpYzoKICAgICAgICAgcmVnaXN0ZXJTdHJ1Y3R1cmUobV9n cmFwaC5tX3ZtLnN0cnVjdHVyZVN0cnVjdHVyZS5nZXQoKSk7CiAgICAgICAgIHJlZ2lzdGVyU3Ry dWN0dXJlKG1fZ3JhcGgubV92bS5zdHJpbmdTdHJ1Y3R1cmUuZ2V0KCkpOwogICAgICAgICByZWdp c3RlclN0cnVjdHVyZShtX2dyYXBoLm1fdm0uc3ltYm9sU3RydWN0dXJlLmdldCgpKTsKLSAgICAg ICAgcmVnaXN0ZXJTdHJ1Y3R1cmUobV9ncmFwaC5tX3ZtLmdldHRlclNldHRlclN0cnVjdHVyZS5n ZXQoKSk7CiAgICAgICAgIAogICAgICAgICBmb3IgKEZyb3plblZhbHVlKiB2YWx1ZSA6IG1fZ3Jh cGgubV9mcm96ZW5WYWx1ZXMpCiAgICAgICAgICAgICBhc3NlcnRJc1JlZ2lzdGVyZWQodmFsdWUt PnN0cnVjdHVyZSgpKTsKQEAgLTkyLDcgKzkxLDExIEBAIHB1YmxpYzoKICAgICAgICAgICAgICAg ICAgICAgcmVnaXN0ZXJTdHJ1Y3R1cmUobm9kZS0+dHJhbnNpdGlvbigpLT5wcmV2aW91cyk7CiAg ICAgICAgICAgICAgICAgICAgIHJlZ2lzdGVyU3RydWN0dXJlKG5vZGUtPnRyYW5zaXRpb24oKS0+ bmV4dCk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAK KworICAgICAgICAgICAgICAgIGNhc2UgR2V0R2V0dGVyU2V0dGVyQnlPZmZzZXQ6CisgICAgICAg ICAgICAgICAgICAgIHJlZ2lzdGVyU3RydWN0dXJlKG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG5v ZGUtPm9yaWdpbi5zZW1hbnRpYyktPmdldHRlclNldHRlclN0cnVjdHVyZSgpKTsKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisKICAgICAgICAgICAgICAgICBjYXNlIE11bHRpR2V0QnlPZmZz ZXQ6CiAgICAgICAgICAgICAgICAgICAgIGZvciAoY29uc3QgTXVsdGlHZXRCeU9mZnNldENhc2Um IGdldENhc2UgOiBub2RlLT5tdWx0aUdldEJ5T2Zmc2V0RGF0YSgpLmNhc2VzKQogICAgICAgICAg ICAgICAgICAgICAgICAgcmVnaXN0ZXJTdHJ1Y3R1cmVzKGdldENhc2Uuc2V0KCkpOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2V0dGVyU2V0dGVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2V0dGVyU2V0dGVyLmgJKHJldmlzaW9u IDIwMDE3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dldHRlclNldHRlci5o CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIEdldHRlclNldHRlciBmaW5h bCA6IHB1YmxpYyBKU05vbkYKICAgICB0eXBlZGVmIEpTTm9uRmluYWxPYmplY3QgQmFzZTsKIHBy aXZhdGU6CiAgICAgR2V0dGVyU2V0dGVyKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCkKLSAgICAgICAgOiBCYXNlKHZtLCB2bS5nZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmUuZ2V0KCkp CisgICAgICAgIDogQmFzZSh2bSwgZ2xvYmFsT2JqZWN0LT5nZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmUo KSkKICAgICB7CiAgICAgICAgIG1fZ2V0dGVyLnNldCh2bSwgdGhpcywgZ2xvYmFsT2JqZWN0LT5u dWxsR2V0dGVyRnVuY3Rpb24oKSk7CiAgICAgICAgIG1fc2V0dGVyLnNldCh2bSwgdGhpcywgZ2xv YmFsT2JqZWN0LT5udWxsU2V0dGVyRnVuY3Rpb24oKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCShyZXZpc2lvbiAyMDAxNzEp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI5NCw2ICsyOTQsNyBAQCB2b2lkIEpTR2xvYmFsT2JqZWN0Ojppbml0 KFZNJiB2bSkKICAgICBtX2Z1bmN0aW9uU3RydWN0dXJlLnNldCh2bSwgdGhpcywgSlNGdW5jdGlv bjo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBtX2Z1bmN0aW9uUHJvdG90eXBlLmdldCgpKSk7 CiAgICAgbV9ib3VuZFNsb3RCYXNlRnVuY3Rpb25TdHJ1Y3R1cmUuc2V0KHZtLCB0aGlzLCBKU0Jv dW5kU2xvdEJhc2VGdW5jdGlvbjo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBtX2Z1bmN0aW9u UHJvdG90eXBlLmdldCgpKSk7CiAgICAgbV9ib3VuZEZ1bmN0aW9uU3RydWN0dXJlLnNldCh2bSwg dGhpcywgSlNCb3VuZEZ1bmN0aW9uOjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1fZnVuY3Rp b25Qcm90b3R5cGUuZ2V0KCkpKTsKKyAgICBtX2dldHRlclNldHRlclN0cnVjdHVyZS5zZXQodm0s IHRoaXMsIEdldHRlclNldHRlcjo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBqc051bGwoKSkp OwogICAgIG1fbmF0aXZlU3RkRnVuY3Rpb25TdHJ1Y3R1cmUuc2V0KHZtLCB0aGlzLCBKU05hdGl2 ZVN0ZEZ1bmN0aW9uOjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1fZnVuY3Rpb25Qcm90b3R5 cGUuZ2V0KCkpKTsKICAgICBtX25hbWVkRnVuY3Rpb25TdHJ1Y3R1cmUuc2V0KHZtLCB0aGlzLCBT dHJ1Y3R1cmU6OmFkZFByb3BlcnR5VHJhbnNpdGlvbih2bSwgbV9mdW5jdGlvblN0cnVjdHVyZS5n ZXQoKSwgdm0ucHJvcGVydHlOYW1lcy0+bmFtZSwgRG9udERlbGV0ZSB8IFJlYWRPbmx5IHwgRG9u dEVudW0sIG1fZnVuY3Rpb25OYW1lT2Zmc2V0KSk7CiAgICAgbV9pbnRlcm5hbEZ1bmN0aW9uU3Ry dWN0dXJlLnNldCh2bSwgdGhpcywgSW50ZXJuYWxGdW5jdGlvbjo6Y3JlYXRlU3RydWN0dXJlKHZt LCB0aGlzLCBtX2Z1bmN0aW9uUHJvdG90eXBlLmdldCgpKSk7CkBAIC05NzYsNiArOTc3LDcgQEAg dm9pZCBKU0dsb2JhbE9iamVjdDo6dmlzaXRDaGlsZHJlbihKU0NlbAogICAgIHZpc2l0b3IuYXBw ZW5kKCZ0aGlzT2JqZWN0LT5tX2Z1bmN0aW9uU3RydWN0dXJlKTsKICAgICB2aXNpdG9yLmFwcGVu ZCgmdGhpc09iamVjdC0+bV9ib3VuZFNsb3RCYXNlRnVuY3Rpb25TdHJ1Y3R1cmUpOwogICAgIHZp c2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX2JvdW5kRnVuY3Rpb25TdHJ1Y3R1cmUpOworICAg IHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX2dldHRlclNldHRlclN0cnVjdHVyZSk7CiAg ICAgdmlzaXRvci5hcHBlbmQoJnRoaXNPYmplY3QtPm1fbmF0aXZlU3RkRnVuY3Rpb25TdHJ1Y3R1 cmUpOwogICAgIHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX25hbWVkRnVuY3Rpb25TdHJ1 Y3R1cmUpOwogICAgIHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX3N5bWJvbE9iamVjdFN0 cnVjdHVyZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9i amVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xv YmFsT2JqZWN0LmgJKHJldmlzaW9uIDIwMDE3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTR2xvYmFsT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3Myw2ICsyNzMsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9mdW5jdGlvblN0cnVj dHVyZTsKICAgICBXcml0ZUJhcnJpZXI8U3RydWN0dXJlPiBtX2JvdW5kRnVuY3Rpb25TdHJ1Y3R1 cmU7CiAgICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9ib3VuZFNsb3RCYXNlRnVuY3Rpb25T dHJ1Y3R1cmU7CisgICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9nZXR0ZXJTZXR0ZXJTdHJ1 Y3R1cmU7CiAgICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9uYXRpdmVTdGRGdW5jdGlvblN0 cnVjdHVyZTsKICAgICBXcml0ZUJhcnJpZXI8U3RydWN0dXJlPiBtX25hbWVkRnVuY3Rpb25TdHJ1 Y3R1cmU7CiAgICAgUHJvcGVydHlPZmZzZXQgbV9mdW5jdGlvbk5hbWVPZmZzZXQ7CkBAIC01MzEs NiArNTMyLDcgQEAgcHVibGljOgogICAgIFN0cnVjdHVyZSogZnVuY3Rpb25TdHJ1Y3R1cmUoKSBj b25zdCB7IHJldHVybiBtX2Z1bmN0aW9uU3RydWN0dXJlLmdldCgpOyB9CiAgICAgU3RydWN0dXJl KiBib3VuZEZ1bmN0aW9uU3RydWN0dXJlKCkgY29uc3QgeyByZXR1cm4gbV9ib3VuZEZ1bmN0aW9u U3RydWN0dXJlLmdldCgpOyB9CiAgICAgU3RydWN0dXJlKiBib3VuZFNsb3RCYXNlRnVuY3Rpb25T dHJ1Y3R1cmUoKSBjb25zdCB7IHJldHVybiBtX2JvdW5kU2xvdEJhc2VGdW5jdGlvblN0cnVjdHVy ZS5nZXQoKTsgfQorICAgIFN0cnVjdHVyZSogZ2V0dGVyU2V0dGVyU3RydWN0dXJlKCkgY29uc3Qg eyByZXR1cm4gbV9nZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmUuZ2V0KCk7IH0KICAgICBTdHJ1Y3R1cmUq IG5hdGl2ZVN0ZEZ1bmN0aW9uU3RydWN0dXJlKCkgY29uc3QgeyByZXR1cm4gbV9uYXRpdmVTdGRG dW5jdGlvblN0cnVjdHVyZS5nZXQoKTsgfQogICAgIFN0cnVjdHVyZSogbmFtZWRGdW5jdGlvblN0 cnVjdHVyZSgpIGNvbnN0IHsgcmV0dXJuIG1fbmFtZWRGdW5jdGlvblN0cnVjdHVyZS5nZXQoKTsg fQogICAgIFByb3BlcnR5T2Zmc2V0IGZ1bmN0aW9uTmFtZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJu IG1fZnVuY3Rpb25OYW1lT2Zmc2V0OyB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9WTS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv Vk0uY3BwCShyZXZpc2lvbiAyMDAxNzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9WTS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNyw3ICsyMTcsNiBAQCBWTTo6Vk0oVk1UeXBl IHZtVHlwZSwgSGVhcFR5cGUgaGVhcFR5cGUpCiAgICAgdGVybWluYXRlZEV4ZWN1dGlvbkVycm9y U3RydWN0dXJlLnNldCgqdGhpcywgVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjpjcmVhdGVTdHJ1 Y3R1cmUoKnRoaXMsIDAsIGpzTnVsbCgpKSk7CiAgICAgc3RyaW5nU3RydWN0dXJlLnNldCgqdGhp cywgSlNTdHJpbmc6OmNyZWF0ZVN0cnVjdHVyZSgqdGhpcywgMCwganNOdWxsKCkpKTsKICAgICBw cm9wZXJ0eU5hbWVFbnVtZXJhdG9yU3RydWN0dXJlLnNldCgqdGhpcywgSlNQcm9wZXJ0eU5hbWVF bnVtZXJhdG9yOjpjcmVhdGVTdHJ1Y3R1cmUoKnRoaXMsIDAsIGpzTnVsbCgpKSk7Ci0gICAgZ2V0 dGVyU2V0dGVyU3RydWN0dXJlLnNldCgqdGhpcywgR2V0dGVyU2V0dGVyOjpjcmVhdGVTdHJ1Y3R1 cmUoKnRoaXMsIDAsIGpzTnVsbCgpKSk7CiAgICAgY3VzdG9tR2V0dGVyU2V0dGVyU3RydWN0dXJl LnNldCgqdGhpcywgQ3VzdG9tR2V0dGVyU2V0dGVyOjpjcmVhdGVTdHJ1Y3R1cmUoKnRoaXMsIDAs IGpzTnVsbCgpKSk7CiAgICAgc2NvcGVkQXJndW1lbnRzVGFibGVTdHJ1Y3R1cmUuc2V0KCp0aGlz LCBTY29wZWRBcmd1bWVudHNUYWJsZTo6Y3JlYXRlU3RydWN0dXJlKCp0aGlzLCAwLCBqc051bGwo KSkpOwogICAgIGFwaVdyYXBwZXJTdHJ1Y3R1cmUuc2V0KCp0aGlzLCBKU0FQSVZhbHVlV3JhcHBl cjo6Y3JlYXRlU3RydWN0dXJlKCp0aGlzLCAwLCBqc051bGwoKSkpOwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9WTS5oCShyZXZpc2lvbiAyMDAxNzEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9WTS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODgsNyArMjg4LDYgQEAgcHVi bGljOgogICAgIFN0cm9uZzxTdHJ1Y3R1cmU+IHN0cmluZ1N0cnVjdHVyZTsKICAgICBTdHJvbmc8 U3RydWN0dXJlPiBwcm9wZXJ0eU5hbWVJdGVyYXRvclN0cnVjdHVyZTsKICAgICBTdHJvbmc8U3Ry dWN0dXJlPiBwcm9wZXJ0eU5hbWVFbnVtZXJhdG9yU3RydWN0dXJlOwotICAgIFN0cm9uZzxTdHJ1 Y3R1cmU+IGdldHRlclNldHRlclN0cnVjdHVyZTsKICAgICBTdHJvbmc8U3RydWN0dXJlPiBjdXN0 b21HZXR0ZXJTZXR0ZXJTdHJ1Y3R1cmU7CiAgICAgU3Ryb25nPFN0cnVjdHVyZT4gc2NvcGVkQXJn dW1lbnRzVGFibGVTdHJ1Y3R1cmU7CiAgICAgU3Ryb25nPFN0cnVjdHVyZT4gYXBpV3JhcHBlclN0 cnVjdHVyZTsK