64023 2011-07-06 13:10:42 -0700 DFG JIT op_call implementation will flush registers even when those registers are dead 2011-07-06 14:40:29 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 fpizlo webkit-unassigned webkit.review.bot oldest_to_newest 432965 0 fpizlo 2011-07-06 13:10:42 -0700 The DFG JIT op_call implementation invokes flushRegisters() to ensure that any live registers are spilled and later refilled on-demand, since in our calling convention all registers are caller-save. However, in the current implementation flushRegisters() may also flush registers that are killed by the call. 432981 1 99870 fpizlo 2011-07-06 13:29:26 -0700 Created attachment 99870 the patch 433045 2 99870 webkit.review.bot 2011-07-06 14:40:25 -0700 Comment on attachment 99870 the patch Clearing flags on attachment: 99870 Committed r90502: <http://trac.webkit.org/changeset/90502> 433046 3 webkit.review.bot 2011-07-06 14:40:29 -0700 All reviewed patches have been landed. Closing bug. 99870 2011-07-06 13:29:26 -0700 2011-07-06 14:40:25 -0700 the patch callflush_patch_1.diff text/plain 9101 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTA0ODMpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTEtMDctMDYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICBE RkcgSklUIG9wX2NhbGwgaW1wbGVtZW50YXRpb24gd2lsbCBmbHVzaCByZWdpc3RlcnMgZXZlbiB3 aGVuIHRob3NlIHJlZ2lzdGVycyBhcmUgZGVhZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGRmZy9ERkdKSVRDb2RlR2VuZXJhdG9yLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpKSVRDb2RlR2VuZXJhdG9yOjplbWl0Q2FsbCk6CisgICAgICAgICogZGZn L0RGR0pJVENvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb2RlR2VuZXJh dG9yOjppbnRlZ2VyUmVzdWx0KToKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb2RlR2VuZXJhdG9y Ojpub1Jlc3VsdCk6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29kZUdlbmVyYXRvcjo6Y2VsbFJl c3VsdCk6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29kZUdlbmVyYXRvcjo6anNWYWx1ZVJlc3Vs dCk6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29kZUdlbmVyYXRvcjo6ZG91YmxlUmVzdWx0KToK KyAgICAgICAgKiBkZmcvREZHTm9uU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6Ok5vblNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3Vs YXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxl KToKKwogMjAxMS0wNy0wNiAgRG1pdHJpeSBWeXVrb3YgIDxkdnl1a292QGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDkwNDgz KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2RlR2VuZXJhdG9yLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDMwLDggKzQzMCwxMyBAQCB2b2lkIEpJVENvZGVHZW5lcmF0b3I6 OmNhY2hlZFB1dEJ5SWQoR1BSCiAgICAgbV9qaXQuYWRkUHJvcGVydHlBY2Nlc3MoZnVuY3Rpb25D YWxsLCBjaGVja0ltbVRvQ2FsbCwgY2FsbFRvQ2hlY2ssIGNhbGxUb1N0b3JlLCBjYWxsVG9TbG93 Q2FzZSwgY2FsbFRvRG9uZSwgc3RhdGljX2Nhc3Q8aW50OF90PihiYXNlR1BSKSwgc3RhdGljX2Nh c3Q8aW50OF90Pih2YWx1ZUdQUiksIHN0YXRpY19jYXN0PGludDhfdD4oc2NyYXRjaEdQUikpOwog fQogCi12b2lkIEpJVENvZGVHZW5lcmF0b3I6OmVtaXRDYWxsKE5vZGUmIG5vZGUsIEdQUlJlZyB0 YXJnZXRHUFIpCit2b2lkIEpJVENvZGVHZW5lcmF0b3I6OmVtaXRDYWxsKE5vZGUmIG5vZGUpCiB7 CisgICAgTm9kZUluZGV4IGNhbGxlZU5vZGVJbmRleCA9IG1faml0LmdyYXBoKCkubV92YXJBcmdD aGlsZHJlbltub2RlLmZpcnN0Q2hpbGQoKV07CisgICAgSlNWYWx1ZU9wZXJhbmQgY2FsbGVlKHRo aXMsIGNhbGxlZU5vZGVJbmRleCk7CisgICAgR1BSUmVnIGNhbGxlZUdQUiA9IGNhbGxlZS5ncHIo KTsKKyAgICB1c2UoY2FsbGVlTm9kZUluZGV4KTsKKyAgICAKICAgICAvLyB0aGUgY2FsbCBpbnN0 cnVjdGlvbidzIGZpcnN0IGNoaWxkIGlzIGVpdGhlciB0aGUgZnVuY3Rpb24gKG5vcm1hbCBjYWxs KSBvciB0aGUKICAgICAvLyByZWNlaXZlciAobWV0aG9kIGNhbGwpLiBzdWJzZXF1ZW50IGNoaWxk cmVuIGFyZSB0aGUgYXJndW1lbnRzLgogICAgIGludCBudW1BcmdzID0gbm9kZS5udW1DaGlsZHJl bigpIC0gMTsKQEAgLTQ1MCwxNSArNDU1LDE3IEBAIHZvaWQgSklUQ29kZUdlbmVyYXRvcjo6ZW1p dENhbGwoTm9kZSYgbm8KICAgICBtX2ppdC5zdG9yZVB0cihHUFJJbmZvOjpjYWxsRnJhbWVSZWdp c3RlciwgYWRkcmVzc09mQ2FsbERhdGEoUmVnaXN0ZXJGaWxlOjpDYWxsZXJGcmFtZSkpOwogICAg IAogICAgIGZvciAoaW50IGFyZ0lkeCA9IDA7IGFyZ0lkeCA8IG51bUFyZ3M7IGFyZ0lkeCsrKSB7 Ci0gICAgICAgIEpTVmFsdWVPcGVyYW5kIGFyZyh0aGlzLCBtX2ppdC5ncmFwaCgpLm1fdmFyQXJn Q2hpbGRyZW5bbm9kZS5maXJzdENoaWxkKCkgKyAxICsgYXJnSWR4XSk7CisgICAgICAgIE5vZGVJ bmRleCBhcmdOb2RlSW5kZXggPSBtX2ppdC5ncmFwaCgpLm1fdmFyQXJnQ2hpbGRyZW5bbm9kZS5m aXJzdENoaWxkKCkgKyAxICsgYXJnSWR4XTsKKyAgICAgICAgSlNWYWx1ZU9wZXJhbmQgYXJnKHRo aXMsIGFyZ05vZGVJbmRleCk7CiAgICAgICAgIEdQUlJlZyBhcmdHUFIgPSBhcmcuZ3ByKCk7Cisg ICAgICAgIHVzZShhcmdOb2RlSW5kZXgpOwogICAgICAgICAKICAgICAgICAgbV9qaXQuc3RvcmVQ dHIoYXJnR1BSLCBhZGRyZXNzT2ZDYWxsRGF0YSgtY2FsbERhdGFTaXplICsgYXJnSWR4KSk7CiAg ICAgfQogICAgIAogICAgIHN3aXRjaCAobm9kZS5vcCkgewogICAgIGNhc2UgQ2FsbDoKLSAgICAg ICAgbV9qaXQuc3RvcmVQdHIodGFyZ2V0R1BSLCBhZGRyZXNzT2ZDYWxsRGF0YShSZWdpc3RlckZp bGU6OkNhbGxlZSkpOworICAgICAgICBtX2ppdC5zdG9yZVB0cihjYWxsZWVHUFIsIGFkZHJlc3NP ZkNhbGxEYXRhKFJlZ2lzdGVyRmlsZTo6Q2FsbGVlKSk7CiAgICAgICAgIGJyZWFrOwogICAgICAg ICAKICAgICBkZWZhdWx0OgpAQCAtNDc1LDggKzQ4Miw4IEBAIHZvaWQgSklUQ29kZUdlbmVyYXRv cjo6ZW1pdENhbGwoTm9kZSYgbm8KICAgICAKICAgICBzd2l0Y2ggKG5vZGUub3ApIHsKICAgICBj YXNlIENhbGw6Ci0gICAgICAgIHNsb3dQYXRoID0gbV9qaXQuYnJhbmNoUHRyV2l0aFBhdGNoKE1h Y3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgdGFyZ2V0R1BSLCB0YXJnZXRUb0NoZWNrLCBNYWNyb0Fz c2VtYmxlcjo6VHJ1c3RlZEltbVB0cihKU1ZhbHVlOjplbmNvZGUoSlNWYWx1ZSgpKSkpOwotICAg ICAgICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHRhcmdldEdQUiwgT0JK RUNUX09GRlNFVE9GKEpTRnVuY3Rpb24sIG1fc2NvcGVDaGFpbikpLCByZXN1bHRHUFIpOworICAg ICAgICBzbG93UGF0aCA9IG1faml0LmJyYW5jaFB0cldpdGhQYXRjaChNYWNyb0Fzc2VtYmxlcjo6 Tm90RXF1YWwsIGNhbGxlZUdQUiwgdGFyZ2V0VG9DaGVjaywgTWFjcm9Bc3NlbWJsZXI6OlRydXN0 ZWRJbW1QdHIoSlNWYWx1ZTo6ZW5jb2RlKEpTVmFsdWUoKSkpKTsKKyAgICAgICAgbV9qaXQubG9h ZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhjYWxsZWVHUFIsIE9CSkVDVF9PRkZTRVRPRihK U0Z1bmN0aW9uLCBtX3Njb3BlQ2hhaW4pKSwgcmVzdWx0R1BSKTsKICAgICAgICAgbV9qaXQuc3Rv cmVQdHIocmVzdWx0R1BSLCBhZGRyZXNzT2ZDYWxsRGF0YShSZWdpc3RlckZpbGU6OlNjb3BlQ2hh aW4pKTsKICAgICAgICAgYnJlYWs7CiAgICAgICAgIApAQCAtNTAzLDcgKzUxMCw3IEBAIHZvaWQg SklUQ29kZUdlbmVyYXRvcjo6ZW1pdENhbGwoTm9kZSYgbm8KICAgICAKICAgICBtX2ppdC5tb3Zl KEdQUkluZm86OnJldHVyblZhbHVlR1BSLCByZXN1bHRHUFIpOwogICAgIAotICAgIGpzVmFsdWVS ZXN1bHQocmVzdWx0R1BSLCBtX2NvbXBpbGVJbmRleCk7CisgICAganNWYWx1ZVJlc3VsdChyZXN1 bHRHUFIsIG1fY29tcGlsZUluZGV4LCBEYXRhRm9ybWF0SlMsIFVzZUNoaWxkcmVuQ2FsbGVkRXhw bGljaXRseSk7CiAgICAgCiAgICAgbV9qaXQuYWRkSlNDYWxsKGZhc3RDYWxsLCBzbG93Q2FsbCwg dGFyZ2V0VG9DaGVjaywgdHJ1ZSwgbV9qaXQuZ3JhcGgoKVttX2NvbXBpbGVJbmRleF0uZXhjZXB0 aW9uSW5mbyk7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGVH ZW5lcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJ VENvZGVHZW5lcmF0b3IuaAkocmV2aXNpb24gOTA0ODMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNjQsNiArNjQs OCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIFNwaWxsT3JkZXJJbnRlZ2VyID0gNSwgIC8vIG5lZWRz IHNwaWxsIGFuZCBib3gKICAgICAgICAgU3BpbGxPcmRlckRvdWJsZSA9IDYsICAgLy8gbmVlZHMg c3BpbGwgYW5kIGNvbnZlcnQKICAgICB9OworICAgIAorICAgIGVudW0gVXNlQ2hpbGRyZW5Nb2Rl IHsgQ2FsbFVzZUNoaWxkcmVuLCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxpY2l0bHkgfTsKIAogCiBw dWJsaWM6CkBAIC01MjgsNyArNTMwLDcgQEAgcHJvdGVjdGVkOgogICAgICAgICByZXR1cm4gTWFj cm9Bc3NlbWJsZXI6OkFkZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIChtX2ppdC5j b2RlQmxvY2soKS0+bV9udW1DYWxsZWVSZWdpc3RlcnMgKyBpZHgpICogc3RhdGljX2Nhc3Q8aW50 PihzaXplb2YoUmVnaXN0ZXIpKSk7CiAgICAgfQogICAgIAotICAgIHZvaWQgZW1pdENhbGwoTm9k ZSYsIEdQUlJlZyB0YXJnZXRHUFIpOworICAgIHZvaWQgZW1pdENhbGwoTm9kZSYpOwogCiAgICAg Ly8gQ2FsbGVkIG9uY2UgYSBub2RlIGhhcyBjb21wbGV0ZWQgY29kZSBnZW5lcmF0aW9uIGJ1dCBw cmlvciB0byBzZXR0aW5nCiAgICAgLy8gaXRzIHJlc3VsdCwgdG8gZnJlZSB1cCBpdHMgY2hpbGRy ZW4uIChUaGlzIG11c3QgaGFwcGVuIHByaW9yIHRvIHNldHRpbmcKQEAgLTUzOCwxMCArNTQwLDEx IEBAIHByb3RlY3RlZDoKIAogICAgIC8vIFRoZXNlIG1ldGhvZCBjYWxsZWQgdG8gaW5pdGlhbGl6 ZSB0aGUgdGhlIEdlbmVyYXRpb25JbmZvCiAgICAgLy8gdG8gZGVzY3JpYmUgdGhlIHJlc3VsdCBv ZiBhbiBvcGVyYXRpb24uCi0gICAgdm9pZCBpbnRlZ2VyUmVzdWx0KEdQUlJlZyByZWcsIE5vZGVJ bmRleCBub2RlSW5kZXgsIERhdGFGb3JtYXQgZm9ybWF0ID0gRGF0YUZvcm1hdEludGVnZXIpCisg ICAgdm9pZCBpbnRlZ2VyUmVzdWx0KEdQUlJlZyByZWcsIE5vZGVJbmRleCBub2RlSW5kZXgsIERh dGFGb3JtYXQgZm9ybWF0ID0gRGF0YUZvcm1hdEludGVnZXIsIFVzZUNoaWxkcmVuTW9kZSBtb2Rl ID0gQ2FsbFVzZUNoaWxkcmVuKQogICAgIHsKICAgICAgICAgTm9kZSYgbm9kZSA9IG1faml0Lmdy YXBoKClbbm9kZUluZGV4XTsKLSAgICAgICAgdXNlQ2hpbGRyZW4obm9kZSk7CisgICAgICAgIGlm IChtb2RlID09IENhbGxVc2VDaGlsZHJlbikKKyAgICAgICAgICAgIHVzZUNoaWxkcmVuKG5vZGUp OwogCiAgICAgICAgIFZpcnR1YWxSZWdpc3RlciB2aXJ0dWFsUmVnaXN0ZXIgPSBub2RlLnZpcnR1 YWxSZWdpc3RlcigpOwogICAgICAgICBHZW5lcmF0aW9uSW5mbyYgaW5mbyA9IG1fZ2VuZXJhdGlv bkluZm9bdmlydHVhbFJlZ2lzdGVyXTsKQEAgLTU1NywzOCArNTYwLDQzIEBAIHByb3RlY3RlZDoK ICAgICAgICAgICAgIGluZm8uaW5pdEpTVmFsdWUobm9kZUluZGV4LCBub2RlLnJlZkNvdW50KCks IHJlZywgZm9ybWF0KTsKICAgICAgICAgfQogICAgIH0KLSAgICB2b2lkIG5vUmVzdWx0KE5vZGVJ bmRleCBub2RlSW5kZXgpCisgICAgdm9pZCBub1Jlc3VsdChOb2RlSW5kZXggbm9kZUluZGV4LCBV c2VDaGlsZHJlbk1vZGUgbW9kZSA9IENhbGxVc2VDaGlsZHJlbikKICAgICB7CisgICAgICAgIGlm IChtb2RlID09IFVzZUNoaWxkcmVuQ2FsbGVkRXhwbGljaXRseSkKKyAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgTm9kZSYgbm9kZSA9IG1faml0LmdyYXBoKClbbm9kZUluZGV4XTsKICAgICAg ICAgdXNlQ2hpbGRyZW4obm9kZSk7CiAgICAgfQotICAgIHZvaWQgY2VsbFJlc3VsdChHUFJSZWcg cmVnLCBOb2RlSW5kZXggbm9kZUluZGV4KQorICAgIHZvaWQgY2VsbFJlc3VsdChHUFJSZWcgcmVn LCBOb2RlSW5kZXggbm9kZUluZGV4LCBVc2VDaGlsZHJlbk1vZGUgbW9kZSA9IENhbGxVc2VDaGls ZHJlbikKICAgICB7CiAgICAgICAgIE5vZGUmIG5vZGUgPSBtX2ppdC5ncmFwaCgpW25vZGVJbmRl eF07Ci0gICAgICAgIHVzZUNoaWxkcmVuKG5vZGUpOworICAgICAgICBpZiAobW9kZSA9PSBDYWxs VXNlQ2hpbGRyZW4pCisgICAgICAgICAgICB1c2VDaGlsZHJlbihub2RlKTsKIAogICAgICAgICBW aXJ0dWFsUmVnaXN0ZXIgdmlydHVhbFJlZ2lzdGVyID0gbm9kZS52aXJ0dWFsUmVnaXN0ZXIoKTsK ICAgICAgICAgbV9ncHJzLnJldGFpbihyZWcsIHZpcnR1YWxSZWdpc3RlciwgU3BpbGxPcmRlckNl bGwpOwogICAgICAgICBHZW5lcmF0aW9uSW5mbyYgaW5mbyA9IG1fZ2VuZXJhdGlvbkluZm9bdmly dHVhbFJlZ2lzdGVyXTsKICAgICAgICAgaW5mby5pbml0Q2VsbChub2RlSW5kZXgsIG5vZGUucmVm Q291bnQoKSwgcmVnKTsKICAgICB9Ci0gICAgdm9pZCBqc1ZhbHVlUmVzdWx0KEdQUlJlZyByZWcs IE5vZGVJbmRleCBub2RlSW5kZXgsIERhdGFGb3JtYXQgZm9ybWF0ID0gRGF0YUZvcm1hdEpTKQor ICAgIHZvaWQganNWYWx1ZVJlc3VsdChHUFJSZWcgcmVnLCBOb2RlSW5kZXggbm9kZUluZGV4LCBE YXRhRm9ybWF0IGZvcm1hdCA9IERhdGFGb3JtYXRKUywgVXNlQ2hpbGRyZW5Nb2RlIG1vZGUgPSBD YWxsVXNlQ2hpbGRyZW4pCiAgICAgewogICAgICAgICBpZiAoZm9ybWF0ID09IERhdGFGb3JtYXRK U0ludGVnZXIpCiAgICAgICAgICAgICBtX2ppdC5qaXRBc3NlcnRJc0pTSW50MzIocmVnKTsKICAg ICAgICAgCiAgICAgICAgIE5vZGUmIG5vZGUgPSBtX2ppdC5ncmFwaCgpW25vZGVJbmRleF07Ci0g ICAgICAgIHVzZUNoaWxkcmVuKG5vZGUpOworICAgICAgICBpZiAobW9kZSA9PSBDYWxsVXNlQ2hp bGRyZW4pCisgICAgICAgICAgICB1c2VDaGlsZHJlbihub2RlKTsKIAogICAgICAgICBWaXJ0dWFs UmVnaXN0ZXIgdmlydHVhbFJlZ2lzdGVyID0gbm9kZS52aXJ0dWFsUmVnaXN0ZXIoKTsKICAgICAg ICAgbV9ncHJzLnJldGFpbihyZWcsIHZpcnR1YWxSZWdpc3RlciwgU3BpbGxPcmRlckpTKTsKICAg ICAgICAgR2VuZXJhdGlvbkluZm8mIGluZm8gPSBtX2dlbmVyYXRpb25JbmZvW3ZpcnR1YWxSZWdp c3Rlcl07CiAgICAgICAgIGluZm8uaW5pdEpTVmFsdWUobm9kZUluZGV4LCBub2RlLnJlZkNvdW50 KCksIHJlZywgZm9ybWF0KTsKICAgICB9Ci0gICAgdm9pZCBkb3VibGVSZXN1bHQoRlBSUmVnIHJl ZywgTm9kZUluZGV4IG5vZGVJbmRleCkKKyAgICB2b2lkIGRvdWJsZVJlc3VsdChGUFJSZWcgcmVn LCBOb2RlSW5kZXggbm9kZUluZGV4LCBVc2VDaGlsZHJlbk1vZGUgbW9kZSA9IENhbGxVc2VDaGls ZHJlbikKICAgICB7CiAgICAgICAgIE5vZGUmIG5vZGUgPSBtX2ppdC5ncmFwaCgpW25vZGVJbmRl eF07Ci0gICAgICAgIHVzZUNoaWxkcmVuKG5vZGUpOworICAgICAgICBpZiAobW9kZSA9PSBDYWxs VXNlQ2hpbGRyZW4pCisgICAgICAgICAgICB1c2VDaGlsZHJlbihub2RlKTsKIAogICAgICAgICBW aXJ0dWFsUmVnaXN0ZXIgdmlydHVhbFJlZ2lzdGVyID0gbm9kZS52aXJ0dWFsUmVnaXN0ZXIoKTsK ICAgICAgICAgbV9mcHJzLnJldGFpbihyZWcsIHZpcnR1YWxSZWdpc3RlciwgU3BpbGxPcmRlckRv dWJsZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZl SklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNw ZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24gOTA0ODMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1NCw5 ICsxMDU0LDcgQEAgdm9pZCBOb25TcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShTcGVjdWxhdAogICAg ICAgICBicmVhazsKICAgICAgICAgCiAgICAgY2FzZSBDYWxsOgotICAgICAgICBKU1ZhbHVlT3Bl cmFuZCBjYWxsZWUodGhpcywgbV9qaXQuZ3JhcGgoKS5tX3ZhckFyZ0NoaWxkcmVuW25vZGUuZmly c3RDaGlsZCgpXSk7Ci0gICAgICAgIEdQUlJlZyBjYWxsZWVHUFIgPSBjYWxsZWUuZ3ByKCk7Ci0g ICAgICAgIGVtaXRDYWxsKG5vZGUsIGNhbGxlZUdQUik7CisgICAgICAgIGVtaXRDYWxsKG5vZGUp OwogICAgICAgICBicmVhazsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiA5MDQ4MykKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMTI4LDkgKzExMjgsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUm IG5vZGUpCiAgICAgICAgIGJyZWFrOwogICAgICAgICAKICAgICBjYXNlIENhbGw6Ci0gICAgICAg IEpTVmFsdWVPcGVyYW5kIGNhbGxlZSh0aGlzLCBtX2ppdC5ncmFwaCgpLm1fdmFyQXJnQ2hpbGRy ZW5bbm9kZS5maXJzdENoaWxkKCldKTsKLSAgICAgICAgR1BSUmVnIGNhbGxlZUdQUiA9IGNhbGxl ZS5ncHIoKTsKLSAgICAgICAgZW1pdENhbGwobm9kZSwgY2FsbGVlR1BSKTsKKyAgICAgICAgZW1p dENhbGwobm9kZSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAo=