68704 2011-09-23 10:38:16 -0700 Implement op_resolve_global in the DFG JIT 2011-09-23 11:52:14 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned oldest_to_newest 472316 0 barraclough 2011-09-23 10:38:16 -0700 This is performance neutral, but increases coverage. 472319 1 108490 barraclough 2011-09-23 10:39:51 -0700 Created attachment 108490 Fix 472330 2 108490 oliver 2011-09-23 10:52:42 -0700 Comment on attachment 108490 Fix r=me 472336 3 108490 mrowe 2011-09-23 10:57:12 -0700 Comment on attachment 108490 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=108490&action=review > Source/JavaScriptCore/ChangeLog:37 > +2011-09-22 Gavin Barraclough <barraclough@apple.com> > + > + Need a short description and bug URL (OOPS!) > + > + Reviewed by NOBODY (OOPS!). > + > + * dfg/DFGByteCodeParser.cpp: > + (JSC::DFG::ByteCodeParser::ByteCodeParser): > + (JSC::DFG::ByteCodeParser::parseBlock): > + * dfg/DFGNode.h: > + (JSC::DFG::Node::hasIdentifier): > + (JSC::DFG::Node::resolveInfoIndex): > + * dfg/DFGOperations.cpp: > + * dfg/DFGOperations.h: > + * dfg/DFGSpeculativeJIT.cpp: > + (JSC::DFG::SpeculativeJIT::compile): > + I don’t think you want to include this bit. 472383 4 barraclough 2011-09-23 11:52:14 -0700 Opps! - yep. Fixed in r95840. 108490 2011-09-23 10:39:51 -0700 2011-09-23 10:57:11 -0700 Fix 68704.patch text/plain 9071 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTU4MzEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDAgQEAK KzIwMTEtMDktMjMgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIEltcGxlbWVudCBvcF9yZXNvbHZlX2dsb2JhbCBpbiB0aGUgREZHIEpJVAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg3MDQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHBlcmZv cm1hbmNlIG5ldXRyYWwsIGJ1dCBpbmNyZWFzZXMgY292ZXJhZ2UuCisKKyAgICAgICAgKiBkZmcv REZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2Vy OjpCeXRlQ29kZVBhcnNlcik6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBh cnNlQmxvY2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6 Tm9kZTo6aGFzSWRlbnRpZmllcik6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6cmVzb2x2ZUlu Zm9JbmRleCk6CisgICAgICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3BwOgorICAgICAgICAqIGRm Zy9ERkdPcGVyYXRpb25zLmg6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKKzIwMTEtMDkt MjIgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAg IE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAoT09QUyEpCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQ YXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpCeXRlQ29kZVBh cnNlcik6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2spOgor ICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6aGFzSWRl bnRpZmllcik6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6cmVzb2x2ZUluZm9JbmRleCk6Cisg ICAgICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3BwOgorICAgICAgICAqIGRmZy9ERkdPcGVyYXRp b25zLmg6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTEtMDktMjIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBXZSBzaG91bGQgYWRkIHN1 cHBvcnQgZm9yIE9WRVJSSURFIGFuZCBGSU5BTCBhbm5vdGF0aW9ucwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDk1 NzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDcgQEAgcHVibGljOgogICAgICAgICAsIG1fcHJl c2VydmVkVmFycyhjb2RlQmxvY2stPm1fbnVtVmFycykKICAgICAgICAgLCBtX3BhcmFtZXRlclNs b3RzKDApCiAgICAgICAgICwgbV9udW1QYXNzZWRWYXJBcmdzKDApCisgICAgICAgICwgbV9nbG9i YWxSZXNvbHZlTnVtYmVyKDApCiAgICAgewogICAgICAgICBBU1NFUlQobV9wcm9maWxlZEJsb2Nr KTsKICAgICB9CkBAIC02MTUsNiArNjE2LDggQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3Bh cmFtZXRlclNsb3RzOwogICAgIC8vIFRoZSBudW1iZXIgb2YgdmFyIGFyZ3MgcGFzc2VkIHRvIHRo ZSBuZXh0IHZhciBhcmcgbm9kZS4KICAgICB1bnNpZ25lZCBtX251bVBhc3NlZFZhckFyZ3M7Cisg ICAgLy8gVGhlIGluZGV4IGluIHRoZSBnbG9iYWwgcmVzb2x2ZSBpbmZvLgorICAgIHVuc2lnbmVk IG1fZ2xvYmFsUmVzb2x2ZU51bWJlcjsKIAogICAgIHN0cnVjdCBQaGlTdGFja0VudHJ5IHsKICAg ICAgICAgUGhpU3RhY2tFbnRyeShCYXNpY0Jsb2NrKiBibG9jaywgTm9kZUluZGV4IHBoaSwgdW5z aWduZWQgdmFyTm8pCkBAIC0xNDI2LDYgKzE0MjksMTUgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6 cGFyc2VCbG9jayh1bnNpZ25lZAogICAgICAgICAgICAgTkVYVF9PUENPREUob3BfcmVzb2x2ZV9i YXNlKTsKICAgICAgICAgfQogICAgICAgICAgICAgCisgICAgICAgIGNhc2Ugb3BfcmVzb2x2ZV9n bG9iYWw6IHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGlkZW50aWZpZXIgPSBjdXJyZW50SW5zdHJ1 Y3Rpb25bMl0udS5vcGVyYW5kOworCisgICAgICAgICAgICBOb2RlSW5kZXggcmVzb2x2ZSA9IGFk ZFRvR3JhcGgoUmVzb2x2ZUdsb2JhbCwgT3BJbmZvKGlkZW50aWZpZXIpLCBPcEluZm8obV9nbG9i YWxSZXNvbHZlTnVtYmVyKyspKTsKKyAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25b MV0udS5vcGVyYW5kLCByZXNvbHZlKTsKKworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfcmVz b2x2ZV9nbG9iYWwpOworICAgICAgICB9CisKICAgICAgICAgY2FzZSBvcF9sb29wX2hpbnQ6IHsK ICAgICAgICAgICAgIC8vIEJhc2VsaW5lLT5ERkcgT1NSIGp1bXBzIGJldHdlZW4gbG9vcCBoaW50 cy4gVGhlIERGRyBhc3N1bWVzIHRoYXQgQmFzZWxpbmUtPkRGRwogICAgICAgICAgICAgLy8gT1NS IGNhbiBvbmx5IGhhcHBlbiBhdCBiYXNpYyBibG9jayBib3VuZGFyaWVzLiBBc3NlcnQgdGhhdCB0 aGVzZSB0d28gc3RhdGVtZW50cwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdO b2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgJ KHJldmlzaW9uIDk1NzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI5MCw2ICsyOTAsNyBAQCBzdGF0aWMgaW5saW5lIGNvbnN0IGNo YXIqIGFyaXRoTm9kZUZsYWdzCiAgICAgbWFjcm8oUmVzb2x2ZSwgTm9kZVJlc3VsdEpTIHwgTm9k ZU11c3RHZW5lcmF0ZSB8IE5vZGVDbG9iYmVyc1dvcmxkKSBcCiAgICAgbWFjcm8oUmVzb2x2ZUJh c2UsIE5vZGVSZXN1bHRKUyB8IE5vZGVNdXN0R2VuZXJhdGUgfCBOb2RlQ2xvYmJlcnNXb3JsZCkg XAogICAgIG1hY3JvKFJlc29sdmVCYXNlU3RyaWN0UHV0LCBOb2RlUmVzdWx0SlMgfCBOb2RlTXVz dEdlbmVyYXRlIHwgTm9kZUNsb2JiZXJzV29ybGQpIFwKKyAgICBtYWNybyhSZXNvbHZlR2xvYmFs LCBOb2RlUmVzdWx0SlMgfCBOb2RlTXVzdEdlbmVyYXRlIHwgTm9kZUNsb2JiZXJzV29ybGQpIFwK ICAgICBcCiAgICAgLyogTm9kZXMgZm9yIG1pc2Mgb3BlcmF0aW9ucy4gKi9cCiAgICAgbWFjcm8o QnJlYWtwb2ludCwgTm9kZU11c3RHZW5lcmF0ZSB8IE5vZGVDbG9iYmVyc1dvcmxkKSBcCkBAIC00 NjYsNiArNDY3LDcgQEAgc3RydWN0IE5vZGUgewogICAgICAgICBjYXNlIFJlc29sdmU6CiAgICAg ICAgIGNhc2UgUmVzb2x2ZUJhc2U6CiAgICAgICAgIGNhc2UgUmVzb2x2ZUJhc2VTdHJpY3RQdXQ6 CisgICAgICAgIGNhc2UgUmVzb2x2ZUdsb2JhbDoKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNDc5LDYgKzQ4 MSwxMiBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAgICAgIHJldHVybiBtX29wSW5mbzsKICAgICB9CiAg ICAgCisgICAgdW5zaWduZWQgcmVzb2x2ZUluZm9JbmRleCgpCisgICAgeworICAgICAgICBBU1NF UlQob3AgPT0gUmVzb2x2ZUdsb2JhbCk7CisgICAgICAgIHJldHVybiBtX29wSW5mbzI7CisgICAg fQorCiAgICAgYm9vbCBoYXNBcml0aE5vZGVGbGFncygpCiAgICAgewogICAgICAgICBzd2l0Y2gg KG9wKSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5j cHAJKHJldmlzaW9uIDk1NzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVy YXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjc0LDYgKzY3NCwyNSBAQCBFbmNvZGVkSlNW YWx1ZSBvcGVyYXRpb25SZXNvbHZlQmFzZVN0cmljCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShiYXNlKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgb3BlcmF0aW9uUmVzb2x2ZUdsb2JhbChFeGVj U3RhdGUqIGV4ZWMsIEdsb2JhbFJlc29sdmVJbmZvKiByZXNvbHZlSW5mbywgSWRlbnRpZmllciog cHJvcGVydHlOYW1lKQoreworICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBleGVj LT5sZXhpY2FsR2xvYmFsT2JqZWN0KCk7CisKKyAgICBQcm9wZXJ0eVNsb3Qgc2xvdChnbG9iYWxP YmplY3QpOworICAgIGlmIChnbG9iYWxPYmplY3QtPmdldFByb3BlcnR5U2xvdChleGVjLCAqcHJv cGVydHlOYW1lLCBzbG90KSkgeworICAgICAgICBKU1ZhbHVlIHJlc3VsdCA9IHNsb3QuZ2V0VmFs dWUoZXhlYywgKnByb3BlcnR5TmFtZSk7CisKKyAgICAgICAgaWYgKHNsb3QuaXNDYWNoZWFibGVW YWx1ZSgpICYmICFnbG9iYWxPYmplY3QtPnN0cnVjdHVyZSgpLT5pc1VuY2FjaGVhYmxlRGljdGlv bmFyeSgpICYmIHNsb3Quc2xvdEJhc2UoKSA9PSBnbG9iYWxPYmplY3QpIHsKKyAgICAgICAgICAg IHJlc29sdmVJbmZvLT5zdHJ1Y3R1cmUuc2V0KGV4ZWMtPmdsb2JhbERhdGEoKSwgZXhlYy0+Y29k ZUJsb2NrKCktPm93bmVyRXhlY3V0YWJsZSgpLCBnbG9iYWxPYmplY3QtPnN0cnVjdHVyZSgpKTsK KyAgICAgICAgICAgIHJlc29sdmVJbmZvLT5vZmZzZXQgPSBzbG90LmNhY2hlZE9mZnNldCgpOwor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShyZXN1bHQpOworICAg IH0KKworICAgIHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVW5kZWZpbmVkVmFyaWFi bGVFcnJvcihleGVjLCAqcHJvcGVydHlOYW1lKSk7Cit9CisKIEVuY29kZWRKU1ZhbHVlIG9wZXJh dGlvblRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSogZXhlYywgRW5jb2RlZEpTVmFsdWUgdmFsdWUpCiB7 CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShKU1ZhbHVlOjpkZWNvZGUodmFsdWUpLnRvUHJp bWl0aXZlKGV4ZWMpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5oCShyZXZpc2lvbiA5NTc2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCwxMSBAQAogCiAjaW5jbHVk ZSA8ZGZnL0RGR0pJVENvbXBpbGVyLmg+CiAKLW5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgREZH IHsKK25hbWVzcGFjZSBKU0MgeworCitzdHJ1Y3QgR2xvYmFsUmVzb2x2ZUluZm87CisKK25hbWVz cGFjZSBERkcgewogCiBlbnVtIFB1dEtpbmQgeyBEaXJlY3QsIE5vdERpcmVjdCB9OwogCkBAIC03 NSw2ICs3OSw3IEBAIEVuY29kZWRKU1ZhbHVlIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1MKIEVu Y29kZWRKU1ZhbHVlIG9wZXJhdGlvblJlc29sdmUoRXhlY1N0YXRlKiwgSWRlbnRpZmllciopOwog RW5jb2RlZEpTVmFsdWUgb3BlcmF0aW9uUmVzb2x2ZUJhc2UoRXhlY1N0YXRlKiwgSWRlbnRpZmll ciopOwogRW5jb2RlZEpTVmFsdWUgb3BlcmF0aW9uUmVzb2x2ZUJhc2VTdHJpY3RQdXQoRXhlY1N0 YXRlKiwgSWRlbnRpZmllciopOworRW5jb2RlZEpTVmFsdWUgb3BlcmF0aW9uUmVzb2x2ZUdsb2Jh bChFeGVjU3RhdGUqLCBHbG9iYWxSZXNvbHZlSW5mbyosIElkZW50aWZpZXIqKTsKIEVuY29kZWRK U1ZhbHVlIG9wZXJhdGlvblRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlKTsK IEVuY29kZWRKU1ZhbHVlIG9wZXJhdGlvblN0ckNhdChFeGVjU3RhdGUqLCB2b2lkKiBzdGFydCwg c2l6ZV90KTsKIHZvaWQgb3BlcmF0aW9uVGhyb3dIYXNJbnN0YW5jZUVycm9yKEV4ZWNTdGF0ZSos IEVuY29kZWRKU1ZhbHVlIGJhc2UpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDk1NzY2KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIwNDMsNyArMjA0Myw0NiBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5v ZGUpCiAgICAgICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCk7 CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICAgICAgCisKKyAgICBjYXNlIFJlc29sdmVHbG9i YWw6IHsKKyAgICAgICAgR1BSVGVtcG9yYXJ5IGdsb2JhbE9iamVjdCh0aGlzKTsKKyAgICAgICAg R1BSVGVtcG9yYXJ5IHJlc29sdmVJbmZvKHRoaXMpOworICAgICAgICBHUFJUZW1wb3JhcnkgcmVz dWx0KHRoaXMpOworCisgICAgICAgIEdQUlJlZyBnbG9iYWxPYmplY3RHUFIgPSBnbG9iYWxPYmpl Y3QuZ3ByKCk7CisgICAgICAgIEdQUlJlZyByZXNvbHZlSW5mb0dQUiA9IHJlc29sdmVJbmZvLmdw cigpOworICAgICAgICBHUFJSZWcgcmVzdWx0R1BSID0gcmVzdWx0LmdwcigpOworCisgICAgICAg IEdsb2JhbFJlc29sdmVJbmZvKiByZXNvbHZlSW5mb0FkZHJlc3MgPSAmKG1faml0LmNvZGVCbG9j aygpLT5nbG9iYWxSZXNvbHZlSW5mbyhub2RlLnJlc29sdmVJbmZvSW5kZXgoKSkpOworCisgICAg ICAgIC8vIENoZWNrIFN0cnVjdHVyZSBvZiBnbG9iYWwgb2JqZWN0CisgICAgICAgIG1faml0Lm1v dmUoSklUQ29tcGlsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuY29kZUJsb2NrKCktPmdsb2JhbE9i amVjdCgpKSwgZ2xvYmFsT2JqZWN0R1BSKTsKKyAgICAgICAgbV9qaXQubW92ZShKSVRDb21waWxl cjo6VHJ1c3RlZEltbVB0cihyZXNvbHZlSW5mb0FkZHJlc3MpLCByZXNvbHZlSW5mb0dQUik7Cisg ICAgICAgIG1faml0LmxvYWRQdHIoSklUQ29tcGlsZXI6OkFkZHJlc3MocmVzb2x2ZUluZm9HUFIs IE9CSkVDVF9PRkZTRVRPRihHbG9iYWxSZXNvbHZlSW5mbywgc3RydWN0dXJlKSksIHJlc3VsdEdQ Uik7CisgICAgICAgIEpJVENvbXBpbGVyOjpKdW1wIHN0cnVjdHVyZXNNYXRjaCA9IG1faml0LmJy YW5jaFB0cihKSVRDb21waWxlcjo6RXF1YWwsIHJlc3VsdEdQUiwgSklUQ29tcGlsZXI6OkFkZHJl c3MoZ2xvYmFsT2JqZWN0R1BSLCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgpKSk7CisKKyAgICAg ICAgc2lsZW50U3BpbGxBbGxSZWdpc3RlcnMocmVzdWx0R1BSKTsKKyAgICAgICAgbV9qaXQubW92 ZShyZXNvbHZlSW5mb0dQUiwgR1BSSW5mbzo6YXJndW1lbnRHUFIxKTsKKyAgICAgICAgbV9qaXQu bW92ZShKSVRDb21waWxlcjo6VHJ1c3RlZEltbVB0cigmbV9qaXQuY29kZUJsb2NrKCktPmlkZW50 aWZpZXIobm9kZS5pZGVudGlmaWVyTnVtYmVyKCkpKSwgR1BSSW5mbzo6YXJndW1lbnRHUFIyKTsK KyAgICAgICAgbV9qaXQubW92ZShHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6 YXJndW1lbnRHUFIwKTsKKyAgICAgICAgSklUQ29tcGlsZXI6OkNhbGwgZnVuY3Rpb25DYWxsID0g YXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVjayhvcGVyYXRpb25SZXNvbHZlR2xvYmFsKTsKKyAg ICAgICAgbV9qaXQubW92ZShHUFJJbmZvOjpyZXR1cm5WYWx1ZUdQUiwgcmVzdWx0R1BSKTsKKyAg ICAgICAgc2lsZW50RmlsbEFsbFJlZ2lzdGVycyhyZXN1bHRHUFIpOworCisgICAgICAgIEpJVENv bXBpbGVyOjpKdW1wIHdhc1Nsb3cgPSBtX2ppdC5qdW1wKCk7CisKKyAgICAgICAgLy8gRmFzdCBj YXNlCisgICAgICAgIHN0cnVjdHVyZXNNYXRjaC5saW5rKCZtX2ppdCk7CisgICAgICAgIG1faml0 LmxvYWRQdHIoSklUQ29tcGlsZXI6OkFkZHJlc3MoZ2xvYmFsT2JqZWN0R1BSLCBKU09iamVjdDo6 b2Zmc2V0T2ZQcm9wZXJ0eVN0b3JhZ2UoKSksIHJlc3VsdEdQUik7CisgICAgICAgIG1faml0Lmxv YWQzMihKSVRDb21waWxlcjo6QWRkcmVzcyhyZXNvbHZlSW5mb0dQUiwgT0JKRUNUX09GRlNFVE9G KEdsb2JhbFJlc29sdmVJbmZvLCBvZmZzZXQpKSwgcmVzb2x2ZUluZm9HUFIpOworICAgICAgICBt X2ppdC5sb2FkUHRyKEpJVENvbXBpbGVyOjpCYXNlSW5kZXgocmVzdWx0R1BSLCByZXNvbHZlSW5m b0dQUiwgSklUQ29tcGlsZXI6OlNjYWxlUHRyKSwgcmVzdWx0R1BSKTsKKworICAgICAgICB3YXNT bG93LmxpbmsoJm1faml0KTsKKworICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3VsdEdQUiwgbV9j b21waWxlSW5kZXgpOworICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBjYXNlIFBoYW50b206 CiAgICAgICAgIC8vIFRoaXMgaXMgYSBuby1vcC4KICAgICAgICAgbm9SZXN1bHQobV9jb21waWxl SW5kZXgpOwo=