69017 2011-09-28 12:15:53 -0700 Merge bug#68580, bug#68932 for DFG JIT with JSVALUE32_64 2011-09-28 23:40:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned oldest_to_newest 474900 0 barraclough 2011-09-28 12:15:53 -0700 . 474907 1 109054 barraclough 2011-09-28 12:27:09 -0700 Created attachment 109054 Fix 475256 2 barraclough 2011-09-28 23:40:48 -0700 Fixed in r 96247 109054 2011-09-28 12:27:09 -0700 2011-09-28 12:44:06 -0700 Fix 69017.patch text/plain 15164 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTYyNDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDktMjggIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIE1lcmdlIGJ1ZyM2ODU4MCwgYnVnIzY4OTMyIGZvciBERkcgSklUIHdpdGggSlNW QUxVRTMyXzY0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02OTAxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6REZHOjpjYWxsT3Bl cmF0aW9uKToKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogZGZn L0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgor ICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0QWxsb2NhdGVKU0ZpbmFsT2Jq ZWN0KToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIw MTEtMDktMjggIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDY3OQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2RlR2VuZXJhdG9yLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2RlR2VuZXJhdG9yLmgJ KHJldmlzaW9uIDk2MjM4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2Rl R2VuZXJhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMDAsNiArMTIwMCwxNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgICAgIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uKTsKICAg ICAgICAgc2V0dXBSZXN1bHRzKHJlc3VsdFRhZywgcmVzdWx0UGF5bG9hZCk7CiAgICAgfQorICAg IHZvaWQgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJhdGlvbl9FU1Mgb3BlcmF0aW9uLCBHUFJSZWcg cmVzdWx0VGFnLCBHUFJSZWcgcmVzdWx0UGF5bG9hZCwgaW50IHN0YXJ0Q29uc3RhbnQsIGludCBu dW1Db25zdGFudHMpCisgICAgeworICAgICAgICBBU1NFUlQoaXNGbHVzaGVkKCkpOworCisgICAg ICAgIG1faml0LnB1c2goSklUQ29tcGlsZXI6OlRydXN0ZWRJbW0zMihudW1Db25zdGFudHMpKTsK KyAgICAgICAgbV9qaXQucHVzaChKSVRDb21waWxlcjo6VHJ1c3RlZEltbTMyKHN0YXJ0Q29uc3Rh bnQpKTsKKyAgICAgICAgbV9qaXQucHVzaChHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3Rlcik7CisK KyAgICAgICAgYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVjayhvcGVyYXRpb24pOworICAgICAg ICBzZXR1cFJlc3VsdHMocmVzdWx0VGFnLCByZXN1bHRQYXlsb2FkKTsKKyAgICB9CiAgICAgdm9p ZCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VKUCBvcGVyYXRpb24sIEdQUlJlZyByZXN1 bHRUYWcsIEdQUlJlZyByZXN1bHRQYXlsb2FkLCBHUFJSZWcgYXJnMVRhZywgR1BSUmVnIGFyZzFQ YXlsb2FkLCB2b2lkKiBwb2ludGVyKQogICAgIHsKICAgICAgICAgQVNTRVJUKGlzRmx1c2hlZCgp KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAko cmV2aXNpb24gOTYyMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlv bnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MTUsNyArODE1LDcgQEAgRW5jb2RlZEpTVmFsdWUg b3BlcmF0aW9uTmV3UmVnZXhwKEV4ZWNTdAogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2Rl KGpzVW5kZWZpbmVkKCkpOwogICAgIH0KICAgICAKLSAgICByZXR1cm4gUmVnRXhwT2JqZWN0Ojpj cmVhdGUoZXhlYy0+Z2xvYmFsRGF0YSgpLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIGV4 ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKS0+cmVnRXhwU3RydWN0dXJlKCksIHJlZ2V4cCk7Cisg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShSZWdFeHBPYmplY3Q6OmNyZWF0ZShleGVjLT5nbG9i YWxEYXRhKCksIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSwgZXhlYy0+bGV4aWNhbEdsb2Jh bE9iamVjdCgpLT5yZWdFeHBTdHJ1Y3R1cmUoKSwgcmVnZXhwKSk7CiB9CiAKIHZvaWQgb3BlcmF0 aW9uVGhyb3dIYXNJbnN0YW5jZUVycm9yKEV4ZWNTdGF0ZSogZXhlYywgRW5jb2RlZEpTVmFsdWUg ZW5jb2RlZEJhc2UpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklUMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHJldmlzaW9uIDk2MjM4KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTkxLDYgKzU5MSwzNiBAQCBib29sIFNwZWN1bGF0aXZlSklUOjpjb21wYXJlKE5vZGUm IG5vZGUsCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPgordm9p ZCBTcGVjdWxhdGl2ZUpJVDo6ZW1pdEFsbG9jYXRlSlNGaW5hbE9iamVjdChUIHN0cnVjdHVyZSwg R1BSUmVnIHJlc3VsdEdQUiwgR1BSUmVnIHNjcmF0Y2hHUFIsIE1hY3JvQXNzZW1ibGVyOjpKdW1w TGlzdCYgc2xvd1BhdGgpCit7CisgICAgTWFya2VkU3BhY2U6OlNpemVDbGFzcyogc2l6ZUNsYXNz ID0gJm1faml0Lmdsb2JhbERhdGEoKS0+aGVhcC5zaXplQ2xhc3NGb3JPYmplY3Qoc2l6ZW9mKEpT RmluYWxPYmplY3QpKTsKKyAgICAKKyAgICBtX2ppdC5sb2FkUHRyKCZzaXplQ2xhc3MtPmZpcnN0 RnJlZUNlbGwsIHJlc3VsdEdQUik7CisgICAgc2xvd1BhdGguYXBwZW5kKG1faml0LmJyYW5jaFRl c3RQdHIoTWFjcm9Bc3NlbWJsZXI6Olplcm8sIHJlc3VsdEdQUikpOworICAgIAorICAgIC8vIFRo ZSBvYmplY3QgaXMgaGFsZi1hbGxvY2F0ZWQ6IHdlIGhhdmUgd2hhdCB3ZSBrbm93IGlzIGEgZnJl c2ggb2JqZWN0LCBidXQKKyAgICAvLyBpdCdzIHN0aWxsIG9uIHRoZSBHQydzIGZyZWUgbGlzdC4K KyAgICAKKyAgICAvLyBEaXRjaCB0aGUgc3RydWN0dXJlIGJ5IHBsYWNpbmcgaXQgaW50byB0aGUg c3RydWN0dXJlIHNsb3QsIHNvIHRoYXQgd2UgY2FuIHJldXNlCisgICAgLy8gc2NyYXRjaEdQUi4K KyAgICBtX2ppdC5zdG9yZVB0cihzdHJ1Y3R1cmUsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJl c3VsdEdQUiwgSlNPYmplY3Q6OnN0cnVjdHVyZU9mZnNldCgpKSk7CisgICAgCisgICAgLy8gTm93 IHRoYXQgd2UgaGF2ZSBzY3JhdGNoR1BSIGJhY2ssIHJlbW92ZSB0aGUgb2JqZWN0IGZyb20gdGhl IGZyZWUgbGlzdAorICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MocmVz dWx0R1BSKSwgc2NyYXRjaEdQUik7CisgICAgbV9qaXQuc3RvcmVQdHIoc2NyYXRjaEdQUiwgJnNp emVDbGFzcy0+Zmlyc3RGcmVlQ2VsbCk7CisgICAgCisgICAgLy8gSW5pdGlhbGl6ZSB0aGUgb2Jq ZWN0J3MgdnRhYmxlCisgICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJ bW1QdHIobV9qaXQuZ2xvYmFsRGF0YSgpLT5qc0ZpbmFsT2JqZWN0VlB0ciksIE1hY3JvQXNzZW1i bGVyOjpBZGRyZXNzKHJlc3VsdEdQUikpOworICAgIAorICAgIC8vIEluaXRpYWxpemUgdGhlIG9i amVjdCdzIGluaGVyaXRvcklELgorICAgIG1faml0LnN0b3JlUHRyKE1hY3JvQXNzZW1ibGVyOjpU cnVzdGVkSW1tUHRyKDApLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIEpTT2Jq ZWN0OjpvZmZzZXRPZkluaGVyaXRvcklEKCkpKTsKKyAgICAKKyAgICAvLyBJbml0aWFsaXplIHRo ZSBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlIHBvaW50ZXIuCisgICAgbV9qaXQuYWRkUHRyKE1h Y3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoc2l6ZW9mKEpTT2JqZWN0KSksIHJlc3VsdEdQUiwg c2NyYXRjaEdQUik7CisgICAgbV9qaXQuc3RvcmVQdHIoc2NyYXRjaEdQUiwgTWFjcm9Bc3NlbWJs ZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBKU0ZpbmFsT2JqZWN0OjpvZmZzZXRPZlByb3BlcnR5U3Rv cmFnZSgpKSk7Cit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkK IHsKICAgICBOb2RlVHlwZSBvcCA9IG5vZGUub3A7CkBAIC0xMjc4LDggKzEzMDgsNyBAQCB2b2lk IFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAKICAgICAgICAgLy8gQ2hlY2sg dGhhdCBiYXNlIGlzIGFuIGFycmF5LCBhbmQgdGhhdCBwcm9wZXJ0eSBpcyBjb250YWluZWQgd2l0 aGluIG1fdmVjdG9yICg8IG1fdmVjdG9yTGVuZ3RoKS4KICAgICAgICAgLy8gSWYgd2UgaGF2ZSBw cmVkaWN0ZWQgdGhlIGJhc2UgdG8gYmUgdHlwZSBhcnJheSwgd2UgY2FuIHNraXAgdGhlIGNoZWNr LgotICAgICAgICBOb2RlJiBiYXNlTm9kZSA9IG1faml0LmdyYXBoKClbbm9kZS5jaGlsZDEoKV07 Ci0gICAgICAgIGlmIChiYXNlTm9kZS5vcCAhPSBHZXRMb2NhbCB8fCAhaXNBcnJheVByZWRpY3Rp b24obV9qaXQuZ3JhcGgoKS5nZXRQcmVkaWN0aW9uKGJhc2VOb2RlLmxvY2FsKCkpKSkKKyAgICAg ICAgaWYgKCFpc0tub3duQXJyYXkobm9kZS5jaGlsZDEoKSkpCiAgICAgICAgICAgICBzcGVjdWxh dGlvbkNoZWNrKG1faml0LmJyYW5jaFB0cihNYWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWwsIE1hY3Jv QXNzZW1ibGVyOjpBZGRyZXNzKGJhc2VSZWcpLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0 cihtX2ppdC5nbG9iYWxEYXRhKCktPmpzQXJyYXlWUHRyKSkpOwogICAgICAgICBzcGVjdWxhdGlv bkNoZWNrKG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpBYm92ZU9yRXF1YWwsIHByb3Bl cnR5UmVnLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0FycmF5Ojp2ZWN0b3JM ZW5ndGhPZmZzZXQoKSkpKTsKIApAQCAtMTMxNCw4ICsxMzQzLDcgQEAgdm9pZCBTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZShOb2RlJiBub2RlKQogCiAgICAgICAgIC8vIENoZWNrIHRoYXQgYmFzZSBp cyBhbiBhcnJheSwgYW5kIHRoYXQgcHJvcGVydHkgaXMgY29udGFpbmVkIHdpdGhpbiBtX3ZlY3Rv ciAoPCBtX3ZlY3Rvckxlbmd0aCkuCiAgICAgICAgIC8vIElmIHdlIGhhdmUgcHJlZGljdGVkIHRo ZSBiYXNlIHRvIGJlIHR5cGUgYXJyYXksIHdlIGNhbiBza2lwIHRoZSBjaGVjay4KLSAgICAgICAg Tm9kZSYgYmFzZU5vZGUgPSBtX2ppdC5ncmFwaCgpW25vZGUuY2hpbGQxKCldOwotICAgICAgICBp ZiAoYmFzZU5vZGUub3AgIT0gR2V0TG9jYWwgfHwgIWlzQXJyYXlQcmVkaWN0aW9uKG1faml0Lmdy YXBoKCkuZ2V0UHJlZGljdGlvbihiYXNlTm9kZS5sb2NhbCgpKSkpCisgICAgICAgIGlmICghaXNL bm93bkFycmF5KG5vZGUuY2hpbGQxKCkpKQogICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayht X2ppdC5icmFuY2hQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBNYWNyb0Fzc2VtYmxlcjo6 QWRkcmVzcyhiYXNlUmVnKSwgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuZ2xv YmFsRGF0YSgpLT5qc0FycmF5VlB0cikpKTsKIAogICAgICAgICBiYXNlLnVzZSgpOwpAQCAtMTUy OSw5ICsxNTU3LDEwIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkK ICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgICAgICAKLSAgICBjYXNlIFN0ckNhdDogewotICAg ICAgICAvLyBXZSByZWFsbHkgZG9uJ3Qgd2FudCB0byBncm93IHRoZSByZWdpc3RlciBmaWxlIGp1 c3QgdG8gZG8gYSBTdHJDYXQuIFNheSB3ZQotICAgICAgICAvLyBoYXZlIDUwIGZ1bmN0aW9ucyBv biB0aGUgc3RhY2sgdGhhdCBhbGwgaGF2ZSBhIFN0ckNhdCBpbiB0aGVtIHRoYXQgaGFzCisgICAg Y2FzZSBTdHJDYXQ6CisgICAgY2FzZSBOZXdBcnJheTogeworICAgICAgICAvLyBXZSByZWFsbHkg ZG9uJ3Qgd2FudCB0byBncm93IHRoZSByZWdpc3RlciBmaWxlIGp1c3QgdG8gZG8gYSBTdHJDYXQg b3IgTmV3QXJyYXkuCisgICAgICAgIC8vIFNheSB3ZSBoYXZlIDUwIGZ1bmN0aW9ucyBvbiB0aGUg c3RhY2sgdGhhdCBhbGwgaGF2ZSBhIFN0ckNhdCBpbiB0aGVtIHRoYXQgaGFzCiAgICAgICAgIC8v IHVwd2FyZHMgb2YgMTAgb3BlcmFuZHMuIEluIHRoZSBERkcgdGhpcyB3b3VsZCBtZWFuIHRoYXQg ZWFjaCBvbmUgZ2V0cwogICAgICAgICAvLyBzb21lIHJhbmRvbSB2aXJ0dWFsIHJlZ2lzdGVyLCBh bmQgdGhlbiB0byBkbyB0aGUgU3RyQ2F0IHdlJ2QgbmVlZCBhIHNlY29uZAogICAgICAgICAvLyBz cGFuIG9mIDEwIG9wZXJhbmRzIGp1c3QgdG8gaGF2ZSBzb21ld2hlcmUgdG8gY29weSB0aGUgMTAg b3BlcmFuZHMgdG8sIHdoZXJlCkBAIC0xNTY0LDEyICsxNTkzLDM3IEBAIHZvaWQgU3BlY3VsYXRp dmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAgICAgR1BSUmVzdWx0IHJlc3VsdFBheWxv YWQodGhpcyk7CiAgICAgICAgIEdQUlJlc3VsdDIgcmVzdWx0VGFnKHRoaXMpOwogICAgICAgICAK LSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25TdHJDYXQsIHJlc3VsdFRhZy5ncHIoKSwg cmVzdWx0UGF5bG9hZC5ncHIoKSwgYnVmZmVyLCBub2RlLm51bUNoaWxkcmVuKCkpOwotICAgICAg ICAKLSAgICAgICAganNWYWx1ZVJlc3VsdChyZXN1bHRUYWcuZ3ByKCksIHJlc3VsdFBheWxvYWQu Z3ByKCksIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxpY2l0bHkpOworICAg ICAgICBjYWxsT3BlcmF0aW9uKG9wID09IFN0ckNhdCA/IG9wZXJhdGlvblN0ckNhdCA6IG9wZXJh dGlvbk5ld0FycmF5LCByZXN1bHRUYWcuZ3ByKCksIHJlc3VsdFBheWxvYWQuZ3ByKCksIGJ1ZmZl ciwgbm9kZS5udW1DaGlsZHJlbigpKTsKKworICAgICAgICAvLyBGSVhNRTogbWFrZSB0aGUgY2Fs bE9wZXJhdGlvbiBhYm92ZSBleHBsaWNpdGx5IHJldHVybiBhIGNlbGwgcmVzdWx0LCBvciBqaXRB c3NlcnQgdGhlIHRhZyBpcyBhIGNlbGwgdGFnLgorICAgICAgICBjZWxsUmVzdWx0KHJlc3VsdFBh eWxvYWQuZ3ByKCksIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxpY2l0bHkp OwogICAgICAgICBicmVhazsKICAgICB9CiAKKyAgICBjYXNlIE5ld0FycmF5QnVmZmVyOiB7Cisg ICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIEdQUlJlc3VsdCByZXN1bHRQYXlsb2Fk KHRoaXMpOworICAgICAgICBHUFJSZXN1bHQyIHJlc3VsdFRhZyh0aGlzKTsKKyAgICAgICAgCisg ICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uTmV3QXJyYXlCdWZmZXIsIHJlc3VsdFRhZy5n cHIoKSwgcmVzdWx0UGF5bG9hZC5ncHIoKSwgbm9kZS5zdGFydENvbnN0YW50KCksIG5vZGUubnVt Q29uc3RhbnRzKCkpOworICAgICAgICAKKyAgICAgICAgLy8gRklYTUU6IG1ha2UgdGhlIGNhbGxP cGVyYXRpb24gYWJvdmUgZXhwbGljaXRseSByZXR1cm4gYSBjZWxsIHJlc3VsdCwgb3Igaml0QXNz ZXJ0IHRoZSB0YWcgaXMgYSBjZWxsIHRhZy4KKyAgICAgICAgY2VsbFJlc3VsdChyZXN1bHRQYXls b2FkLmdwcigpLCBtX2NvbXBpbGVJbmRleCk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICAg ICAgCisgICAgY2FzZSBOZXdSZWdleHA6IHsKKyAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKKyAg ICAgICAgR1BSUmVzdWx0IHJlc3VsdFBheWxvYWQodGhpcyk7CisgICAgICAgIEdQUlJlc3VsdDIg cmVzdWx0VGFnKHRoaXMpOworICAgICAgICAKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRp b25OZXdSZWdleHAsIHJlc3VsdFRhZy5ncHIoKSwgcmVzdWx0UGF5bG9hZC5ncHIoKSwgbV9qaXQu Y29kZUJsb2NrKCktPnJlZ2V4cChub2RlLnJlZ2V4cEluZGV4KCkpKTsKKyAgICAgICAgCisgICAg ICAgIC8vIEZJWE1FOiBtYWtlIHRoZSBjYWxsT3BlcmF0aW9uIGFib3ZlIGV4cGxpY2l0bHkgcmV0 dXJuIGEgY2VsbCByZXN1bHQsIG9yIGppdEFzc2VydCB0aGUgdGFnIGlzIGEgY2VsbCB0YWcuCisg ICAgICAgIGNlbGxSZXN1bHQocmVzdWx0UGF5bG9hZC5ncHIoKSwgbV9jb21waWxlSW5kZXgpOwor ICAgICAgICBicmVhazsKKyAgICB9CisgICAgICAgIAogICAgIGNhc2UgQ29udmVydFRoaXM6IHsK ICAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgdGhpc1ZhbHVlKHRoaXMsIG5vZGUuY2hpbGQx KCkpOwogCkBAIC0xNjEzLDUwICsxNjY3LDUyIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGUoTm9kZSYgbm9kZSkKICAgICAgICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRk cmVzcyhwcm90b0dQUiwgSlNPYmplY3Q6Om9mZnNldE9mSW5oZXJpdG9ySUQoKSksIHNjcmF0Y2hH UFIpOwogICAgICAgICBzbG93UGF0aC5hcHBlbmQobV9qaXQuYnJhbmNoVGVzdFB0cihNYWNyb0Fz c2VtYmxlcjo6WmVybywgc2NyYXRjaEdQUikpOwogICAgICAgICAKLSAgICAgICAgTWFya2VkU3Bh Y2U6OlNpemVDbGFzcyogc2l6ZUNsYXNzID0gJm1faml0Lmdsb2JhbERhdGEoKS0+aGVhcC5zaXpl Q2xhc3NGb3JPYmplY3Qoc2l6ZW9mKEpTRmluYWxPYmplY3QpKTsKKyAgICAgICAgZW1pdEFsbG9j YXRlSlNGaW5hbE9iamVjdChzY3JhdGNoR1BSLCByZXN1bHRHUFIsIHNjcmF0Y2hHUFIsIHNsb3dQ YXRoKTsKICAgICAgICAgCi0gICAgICAgIG1faml0LmxvYWRQdHIoJnNpemVDbGFzcy0+Zmlyc3RG cmVlQ2VsbCwgcmVzdWx0R1BSKTsKLSAgICAgICAgc2xvd1BhdGguYXBwZW5kKG1faml0LmJyYW5j aFRlc3RQdHIoTWFjcm9Bc3NlbWJsZXI6Olplcm8sIHJlc3VsdEdQUikpOworICAgICAgICBNYWNy b0Fzc2VtYmxlcjo6SnVtcCBkb25lID0gbV9qaXQuanVtcCgpOwogICAgICAgICAKLSAgICAgICAg Ly8gVGhlIG9iamVjdCBpcyBoYWxmLWFsbG9jYXRlZDogd2UgaGF2ZSB3aGF0IHdlIGtub3cgaXMg YSBmcmVzaCBvYmplY3QsIGJ1dAotICAgICAgICAvLyBpdCdzIHN0aWxsIG9uIHRoZSBHQydzIGZy ZWUgbGlzdC4KKyAgICAgICAgc2xvd1BhdGgubGluaygmbV9qaXQpOwogICAgICAgICAKLSAgICAg ICAgLy8gRGl0Y2ggdGhlIGluaGVyaXRvcklEIGJ5IHBsYWNpbmcgaXQgaW50byB0aGUgc3RydWN0 dXJlLCBzbyB0aGF0IHdlIGNhbiByZXVzZQotICAgICAgICAvLyBzY3JhdGNoR1BSLgotICAgICAg ICBtX2ppdC5zdG9yZVB0cihzY3JhdGNoR1BSLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhyZXN1 bHRHUFIsIEpTT2JqZWN0OjpzdHJ1Y3R1cmVPZmZzZXQoKSkpOworICAgICAgICBzaWxlbnRTcGls bEFsbFJlZ2lzdGVycyhyZXN1bHRHUFIpOworICAgICAgICBtX2ppdC5tb3ZlKHByb3RvR1BSLCBH UFJJbmZvOjphcmd1bWVudEdQUjEpOworICAgICAgICBtX2ppdC5tb3ZlKEdQUkluZm86OmNhbGxG cmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgICAgICBhcHBlbmRDYWxs V2l0aEV4Y2VwdGlvbkNoZWNrKG9wZXJhdGlvbkNyZWF0ZVRoaXMpOworICAgICAgICBtX2ppdC5t b3ZlKEdQUkluZm86OnJldHVyblZhbHVlR1BSLCByZXN1bHRHUFIpOworICAgICAgICBzaWxlbnRG aWxsQWxsUmVnaXN0ZXJzKHJlc3VsdEdQUik7CisgICAgICAgIAorICAgICAgICBkb25lLmxpbmso Jm1faml0KTsKICAgICAgICAgCi0gICAgICAgIC8vIE5vdyB0aGF0IHdlIGhhdmUgc2NyYXRjaEdQ UiBiYWNrLCByZW1vdmUgdGhlIG9iamVjdCBmcm9tIHRoZSBmcmVlIGxpc3QKLSAgICAgICAgbV9q aXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIpLCBzY3JhdGNoR1BS KTsKLSAgICAgICAgbV9qaXQuc3RvcmVQdHIoc2NyYXRjaEdQUiwgJnNpemVDbGFzcy0+Zmlyc3RG cmVlQ2VsbCk7CisgICAgICAgIGNlbGxSZXN1bHQocmVzdWx0R1BSLCBtX2NvbXBpbGVJbmRleCwg VXNlQ2hpbGRyZW5DYWxsZWRFeHBsaWNpdGx5KTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorCisg ICAgY2FzZSBOZXdPYmplY3Q6IHsKKyAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzKTsK KyAgICAgICAgR1BSVGVtcG9yYXJ5IHNjcmF0Y2godGhpcyk7CiAgICAgICAgIAotICAgICAgICAv LyBJbml0aWFsaXplIHRoZSBvYmplY3QncyB2dGFibGUKLSAgICAgICAgbV9qaXQuc3RvcmVQdHIo TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuZ2xvYmFsRGF0YSgpLT5qc0ZpbmFs T2JqZWN0VlB0ciksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3VsdEdQUikpOworICAgICAg ICBHUFJSZWcgcmVzdWx0R1BSID0gcmVzdWx0LmdwcigpOworICAgICAgICBHUFJSZWcgc2NyYXRj aEdQUiA9IHNjcmF0Y2guZ3ByKCk7CiAgICAgICAgIAotICAgICAgICAvLyBJbml0aWFsaXplIHRo ZSBvYmplY3QncyBpbmhlcml0b3JJRC4KLSAgICAgICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3Nl bWJsZXI6OlRydXN0ZWRJbW1QdHIoMCksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3VsdEdQ UiwgSlNPYmplY3Q6Om9mZnNldE9mSW5oZXJpdG9ySUQoKSkpOworICAgICAgICBNYWNyb0Fzc2Vt Ymxlcjo6SnVtcExpc3Qgc2xvd1BhdGg7CiAgICAgICAgIAotICAgICAgICAvLyBJbml0aWFsaXpl IHRoZSBvYmplY3QncyBwcm9wZXJ0eSBzdG9yYWdlIHBvaW50ZXIuCi0gICAgICAgIG1faml0LmFk ZFB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKHNpemVvZihKU09iamVjdCkpLCByZXN1 bHRHUFIsIHNjcmF0Y2hHUFIpOwotICAgICAgICBtX2ppdC5zdG9yZVB0cihzY3JhdGNoR1BSLCBN YWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIEpTRmluYWxPYmplY3Q6Om9mZnNldE9m UHJvcGVydHlTdG9yYWdlKCkpKTsKKyAgICAgICAgZW1pdEFsbG9jYXRlSlNGaW5hbE9iamVjdChN YWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihtX2ppdC5jb2RlQmxvY2soKS0+Z2xvYmFsT2Jq ZWN0KCktPmVtcHR5T2JqZWN0U3RydWN0dXJlKCkpLCByZXN1bHRHUFIsIHNjcmF0Y2hHUFIsIHNs b3dQYXRoKTsKICAgICAgICAgCiAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wIGRvbmUgPSBt X2ppdC5qdW1wKCk7CiAgICAgICAgIAogICAgICAgICBzbG93UGF0aC5saW5rKCZtX2ppdCk7CiAg ICAgICAgIAogICAgICAgICBzaWxlbnRTcGlsbEFsbFJlZ2lzdGVycyhyZXN1bHRHUFIpOwotICAg ICAgICBtX2ppdC5wdXNoKFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSk7Ci0gICAgICAg IG1faml0LnB1c2gocHJvdG9HUFIpOwotICAgICAgICBtX2ppdC5wdXNoKEdQUkluZm86OmNhbGxG cmFtZVJlZ2lzdGVyKTsKLSAgICAgICAgYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVjayhvcGVy YXRpb25DcmVhdGVUaGlzKTsKKyAgICAgICAgbV9qaXQubW92ZShHUFJJbmZvOjpjYWxsRnJhbWVS ZWdpc3RlciwgR1BSSW5mbzo6YXJndW1lbnRHUFIwKTsKKyAgICAgICAgYXBwZW5kQ2FsbFdpdGhF eGNlcHRpb25DaGVjayhvcGVyYXRpb25OZXdPYmplY3QpOwogICAgICAgICBtX2ppdC5tb3ZlKEdQ UkluZm86OnJldHVyblZhbHVlR1BSLCByZXN1bHRHUFIpOwogICAgICAgICBzaWxlbnRGaWxsQWxs UmVnaXN0ZXJzKHJlc3VsdEdQUik7CiAgICAgICAgIAogICAgICAgICBkb25lLmxpbmsoJm1faml0 KTsKICAgICAgICAgCi0gICAgICAgIGNlbGxSZXN1bHQocmVzdWx0R1BSLCBtX2NvbXBpbGVJbmRl eCwgVXNlQ2hpbGRyZW5DYWxsZWRFeHBsaWNpdGx5KTsKKyAgICAgICAgY2VsbFJlc3VsdChyZXN1 bHRHUFIsIG1fY29tcGlsZUluZGV4KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgICAgICAK KwogICAgIGNhc2UgR2V0Q2FsbGVlOiB7CiAgICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhp cyk7CiAgICAgICAgIG1faml0LmxvYWRQdHIoSklUQ29tcGlsZXI6OmFkZHJlc3NGb3Ioc3RhdGlj X2Nhc3Q8VmlydHVhbFJlZ2lzdGVyPihSZWdpc3RlckZpbGU6OkNhbGxlZSkpLCByZXN1bHQuZ3By KCkpOwpAQCAtMTczNCw3ICsxNzkwLDI2IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUo Tm9kZSYgbm9kZSkKICAgICAgICAganNWYWx1ZVJlc3VsdChyZXN1bHRUYWdHUFIsIHJlc3VsdFBh eWxvYWRHUFIsIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxpY2l0bHkpOwog ICAgICAgICBicmVhazsKICAgICB9CisKKyAgICBjYXNlIEdldEFycmF5TGVuZ3RoOiB7CisgICAg ICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGJhc2UodGhpcywgbm9kZS5jaGlsZDEoKSk7CisgICAg ICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcyk7CiAgICAgICAgIAorICAgICAgICBHUFJSZWcg YmFzZUdQUiA9IGJhc2UuZ3ByKCk7CisgICAgICAgIEdQUlJlZyByZXN1bHRHUFIgPSByZXN1bHQu Z3ByKCk7CisgICAgICAgIAorICAgICAgICBpZiAoIWlzS25vd25BcnJheShub2RlLmNoaWxkMSgp KSkKKyAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2sobV9qaXQuYnJhbmNoUHRyKE1hY3JvQXNz ZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYmFzZUdQUiksIE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0Lmdsb2JhbERhdGEoKS0+anNBcnJheVZQdHIp KSk7CisgICAgICAgIAorICAgICAgICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRy ZXNzKGJhc2VHUFIsIEpTQXJyYXk6OnN0b3JhZ2VPZmZzZXQoKSksIHJlc3VsdEdQUik7CisgICAg ICAgIG1faml0LmxvYWQzMihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIE9CSkVD VF9PRkZTRVRPRihBcnJheVN0b3JhZ2UsIG1fbGVuZ3RoKSksIHJlc3VsdEdQUik7CisgICAgICAg IAorICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVy OjpMZXNzVGhhbiwgcmVzdWx0R1BSLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDApKSk7 CisgICAgICAgIAorICAgICAgICBpbnRlZ2VyUmVzdWx0KHJlc3VsdEdQUiwgbV9jb21waWxlSW5k ZXgpOworICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBjYXNlIENoZWNrU3RydWN0dXJlOiB7 CiAgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGJhc2UodGhpcywgbm9kZS5jaGlsZDEoKSk7 CiAgICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcywgYmFzZSk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24g OTYyMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTczMiw3ICsxNzMyLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAgICAgICBjZWxsUmVzdWx0KHRoaXNWYWx1ZS5ncHIo KSwgbV9jb21waWxlSW5kZXgpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgICAgIAorCiAg ICAgY2FzZSBDcmVhdGVUaGlzOiB7CiAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGVyZSBpcyBub3Qg c28gbXVjaCBwcm9maXQgdG8gc3BlY3VsYXRlIGhlcmUuIFRoZSBvbmx5IHRoaW5ncyB3ZQogICAg ICAgICAvLyBzcGVjdWxhdGUgb24gYXJlICgxKSB0aGF0IGl0J3MgYSBjZWxsLCBzaW5jZSB0aGF0 IGVsaW1pbmF0ZXMgY2VsbCBjaGVja3MKQEAgLTE3ODUsNyArMTc4NSw3IEBAIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAgICAgY2VsbFJlc3VsdChyZXN1bHRH UFIsIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxpY2l0bHkpOwogICAgICAg ICBicmVhazsKICAgICB9Ci0gICAgICAgIAorCiAgICAgY2FzZSBOZXdPYmplY3Q6IHsKICAgICAg ICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzKTsKICAgICAgICAgR1BSVGVtcG9yYXJ5IHNjcmF0 Y2godGhpcyk7CkBAIC0xODEyLDcgKzE4MTIsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21w aWxlKE5vZGUmIG5vZGUpCiAgICAgICAgIGNlbGxSZXN1bHQocmVzdWx0R1BSLCBtX2NvbXBpbGVJ bmRleCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICAgICAgCisKICAgICBjYXNlIEdldENh bGxlZTogewogICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMpOwogICAgICAgICBtX2pp dC5sb2FkUHRyKEpJVENvbXBpbGVyOjphZGRyZXNzRm9yKHN0YXRpY19jYXN0PFZpcnR1YWxSZWdp c3Rlcj4oUmVnaXN0ZXJGaWxlOjpDYWxsZWUpKSwgcmVzdWx0LmdwcigpKTsKQEAgLTE4ODMsNyAr MTg4Myw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAg ICAganNWYWx1ZVJlc3VsdChyZXN1bHRHUFIsIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNh bGxlZEV4cGxpY2l0bHkpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgICAgIAorCiAgICAg Y2FzZSBHZXRBcnJheUxlbmd0aDogewogICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBiYXNl KHRoaXMsIG5vZGUuY2hpbGQxKCkpOwogICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMp Owo=