150773 2015-11-01 06:03:22 -0800 Rename op_put_getter_setter to op_put_getter_setter_by_id 2015-11-02 11:12:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 150780 1 ysuzuki ysuzuki benjamin commit-queue fpizlo ggaren keith_miller mark.lam msaboff saam oldest_to_newest 1138302 0 ysuzuki 2015-11-01 06:03:22 -0800 Rename op_put_getter_setter to op_put_getter_setter_by_id 1138303 1 264514 ysuzuki 2015-11-01 06:04:32 -0800 Created attachment 264514 Patch 1138307 2 264514 mark.lam 2015-11-01 06:38:22 -0800 Comment on attachment 264514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264514&action=review r=me > Source/JavaScriptCore/ChangeLog:8 > + Renaming op_put_getter_setter to op_put_getter_setter_by_id makes this op name consistent to "consistent to" ==> "consistent with" 1138318 3 264514 ysuzuki 2015-11-01 08:12:10 -0800 Comment on attachment 264514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264514&action=review Thank you for your review :D >> Source/JavaScriptCore/ChangeLog:8 >> + Renaming op_put_getter_setter to op_put_getter_setter_by_id makes this op name consistent to > > "consistent to" ==> "consistent with" Thanks! Fixed. 1138319 4 ysuzuki 2015-11-01 08:18:49 -0800 Committed r191858: <http://trac.webkit.org/changeset/191858> 1138369 5 ap 2015-11-01 14:34:14 -0800 This broke 32-bit build: https://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/13856/steps/compile-webkit/logs/stdio Undefined symbols for architecture i386: "_llint_slow_path_put_getter_setter", referenced from: _llint_entry in LowLevelInterpreter.o (maybe you meant: _llint_slow_path_put_getter_setter_by_id) 1138371 6 commit-queue 2015-11-01 14:37:52 -0800 Re-opened since this is blocked by bug 150780 1138376 7 ap 2015-11-01 14:44:41 -0800 Rolling out. Even if this just needs a can rebuild, the right fix is to fix the dependencies. 1138432 8 ysuzuki 2015-11-01 17:42:49 -0800 Hm, ``` offlineasm: Parsing /Volumes/Data/slave/mavericks-32bitJSC-debug/build/Source/JavaScriptCore/llint/LowLevelInterpreter.asm and creating offset extractor /Volumes/Data/slave/mavericks-32bitJSC-debug/build/WebKitBuild/Debug/LLIntOffsets/LLIntDesiredOffsets.h. offlineasm: Nothing changed. ``` ``` offlineasm: Parsing JavaScriptCore/llint/LowLevelInterpreter.asm and /Volumes/Data/slave/mavericks-32bitJSC-debug/build/WebKitBuild/Debug/JSCLLIntOffsetsExtractor and creating assembly file LLIntAssembly.h. offlineasm: Nothing changed. ``` LowLevelInterpreter.asm is updated in the patch, but the output seems not updated. 1138453 9 ysuzuki 2015-11-01 21:02:57 -0800 Alexey, I think the patch itself is correct. It changes all the existing getter_setter signature to getter_setter_by_id. Seeing the log, https://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/13853/steps/compile-webkit/logs/stdio LowLevelInterpreter.o is not recompiled regardless of change of LLIntAssembly.h. Do you know how XCode handles header change? I'm not sure that Xcode correctly handles changes of headers. One possible workaround is, adding white space line to LowLevelInterpreter.cpp. 1138456 10 ysuzuki 2015-11-01 21:26:53 -0800 (In reply to comment #9) > One possible workaround is, adding white space line to > LowLevelInterpreter.cpp. But if do so, just issuing a clean build is preferable I think. 1138582 11 ysuzuki 2015-11-02 09:30:56 -0800 After investigating a little bit, I think adding LLIntAssembly.h into Xcode project file may solve this issue. 1138598 12 ysuzuki 2015-11-02 10:22:34 -0800 Discussed with Alexey on IRC. We will include LLIntAssembly.h into Xcode project file, land the patch and watch on buildbot! 1138607 13 ysuzuki 2015-11-02 10:33:52 -0800 Committed r191897: <http://trac.webkit.org/changeset/191897> 1138619 14 ysuzuki 2015-11-02 11:12:25 -0800 Yay! https://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/13879 264514 2015-11-01 06:04:32 -0800 2015-11-01 06:38:22 -0800 Patch bug-150773-20151101230337.patch text/plain 12513 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj MDgzMDAxZWExZTk1OWFiNDNlM2ZiMWI0ZGEyMWU3ZjUyOTQyYTRjLi4yNDVjN2RlMmU0OGIzM2M5 Mjk3OTZhMGE4NzRjNjNmMDhkNzZjMDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAxNS0xMS0wMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBSZW5hbWUgb3BfcHV0X2dldHRlcl9zZXR0ZXIgdG8gb3BfcHV0X2dl dHRlcl9zZXR0ZXJfYnlfaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MDc3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbmFtaW5nIG9wX3B1dF9nZXR0ZXJfc2V0dGVyIHRvIG9wX3B1dF9nZXR0ZXJf c2V0dGVyX2J5X2lkIG1ha2VzIHRoaXMgb3AgbmFtZSBjb25zaXN0ZW50IHRvCisgICAgICAgIHRo ZSBvdGhlciBvcHMnIG5hbWVzIGxpa2Ugb3BfcHV0X2dldHRlcl9ieV9pZCBldGMuCisKKyAgICAg ICAgKiBieXRlY29kZS9CeXRlY29kZUxpc3QuanNvbjoKKyAgICAgICAgKiBieXRlY29kZS9CeXRl Y29kZVVzZURlZi5oOgorICAgICAgICAoSlNDOjpjb21wdXRlVXNlc0ZvckJ5dGVjb2RlT2Zmc2V0 KToKKyAgICAgICAgKEpTQzo6Y29tcHV0ZURlZnNGb3JCeXRlY29kZU9mZnNldCk6CisgICAgICAg ICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpkdW1w Qnl0ZWNvZGUpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6 CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UHV0R2V0dGVyU2V0dGVyKToK KyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6 OkJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKToKKyAgICAgICAgKiBkZmcvREZHQ2FwYWJpbGl0 aWVzLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpjYXBhYmlsaXR5TGV2ZWwpOgorICAgICAgICAq IGppdC9KSVQuY3BwOgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlTWFpblBhc3Mp OgorICAgICAgICAqIGppdC9KSVQuaDoKKyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3Mu Y3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQp OgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcHV0X2dldHRlcl9zZXR0ZXIpOiBEZWxldGVk LgorICAgICAgICAqIGppdC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjplbWl0X29wX3B1dF9nZXR0ZXJfc2V0dGVyX2J5X2lkKToKKyAgICAgICAgKEpTQzo6 SklUOjplbWl0X29wX3B1dF9nZXR0ZXJfc2V0dGVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBsbGlu dC9MTEludFNsb3dQYXRocy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50OjpMTElOVF9TTE9XX1BB VEhfREVDTCk6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMuaDoKKyAgICAgICAgKiBs bGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbToKKwogMjAxNS0xMC0zMSAgQW5kcmVhcyBLbGlu ZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgZGVidWcgb3ZlcmxheSB3aXRo IGluZm9ybWF0aW9uIGFib3V0IHdlYiBwcm9jZXNzIHJlc291cmNlIHVzYWdlLgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uCmluZGV4IDg1NGJm NjFjNmJkZjVhZjM5NGMxMjgzY2YwOGRkMTQ0YWIwYjg2NWUuLmNlODJlZGQ4NGNiMTdhYzRkZGZj MzhhYTBkMTg2OTM1MjgwOWFhOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9CeXRlY29kZUxpc3QuanNvbgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvQnl0ZWNvZGVMaXN0Lmpzb24KQEAgLTY3LDcgKzY3LDcgQEAKICAgICAgICAgICAgIHsg Im5hbWUiIDogIm9wX3B1dF9ieV9pbmRleCIsICJsZW5ndGgiIDogNCB9LAogICAgICAgICAgICAg eyAibmFtZSIgOiAib3BfcHV0X2dldHRlcl9ieV9pZCIsICJsZW5ndGgiIDogNSB9LAogICAgICAg ICAgICAgeyAibmFtZSIgOiAib3BfcHV0X3NldHRlcl9ieV9pZCIsICJsZW5ndGgiIDogNSB9LAot ICAgICAgICAgICAgeyAibmFtZSIgOiAib3BfcHV0X2dldHRlcl9zZXR0ZXIiLCAibGVuZ3RoIiA6 IDYgfSwKKyAgICAgICAgICAgIHsgIm5hbWUiIDogIm9wX3B1dF9nZXR0ZXJfc2V0dGVyX2J5X2lk IiwgImxlbmd0aCIgOiA2IH0sCiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9wdXRfZ2V0dGVy X2J5X3ZhbCIsICJsZW5ndGgiIDogNSB9LAogICAgICAgICAgICAgeyAibmFtZSIgOiAib3BfcHV0 X3NldHRlcl9ieV92YWwiLCAibGVuZ3RoIiA6IDUgfSwKICAgICAgICAgICAgIHsgIm5hbWUiIDog Im9wX2ptcCIsICJsZW5ndGgiIDogMiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0J5dGVjb2RlVXNlRGVmLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvQnl0ZWNvZGVVc2VEZWYuaAppbmRleCBmNzdhODcyYmE0OTI5YjA3MmY5YTMwZWVkNTNi MzY2NGI0Yzk2NjczLi4wODNlODZiMGUxY2EzZTA4MjY1MGY0NjYzNTE3ZWUyNDI1MTRlZmJhIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVVc2VEZWYu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVVc2VEZWYuaApA QCAtMTA2LDcgKzEwNiw3IEBAIHZvaWQgY29tcHV0ZVVzZXNGb3JCeXRlY29kZU9mZnNldCgKICAg ICAgICAgZnVuY3Rvcihjb2RlQmxvY2ssIGluc3RydWN0aW9uLCBvcGNvZGVJRCwgaW5zdHJ1Y3Rp b25bNF0udS5vcGVyYW5kKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBjYXNlIG9wX3B1 dF9nZXR0ZXJfc2V0dGVyOiB7CisgICAgY2FzZSBvcF9wdXRfZ2V0dGVyX3NldHRlcl9ieV9pZDog ewogICAgICAgICBmdW5jdG9yKGNvZGVCbG9jaywgaW5zdHJ1Y3Rpb24sIG9wY29kZUlELCBpbnN0 cnVjdGlvblsxXS51Lm9wZXJhbmQpOwogICAgICAgICBmdW5jdG9yKGNvZGVCbG9jaywgaW5zdHJ1 Y3Rpb24sIG9wY29kZUlELCBpbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpOwogICAgICAgICBmdW5j dG9yKGNvZGVCbG9jaywgaW5zdHJ1Y3Rpb24sIG9wY29kZUlELCBpbnN0cnVjdGlvbls1XS51Lm9w ZXJhbmQpOwpAQCAtMjc1LDcgKzI3NSw3IEBAIHZvaWQgY29tcHV0ZURlZnNGb3JCeXRlY29kZU9m ZnNldChDb2RlQmxvY2sqIGNvZGVCbG9jaywgdW5zaWduZWQgYnl0ZWNvZGVPZmZzZXQsCiAgICAg Y2FzZSBvcF9wdXRfYnlfaWQ6CiAgICAgY2FzZSBvcF9wdXRfZ2V0dGVyX2J5X2lkOgogICAgIGNh c2Ugb3BfcHV0X3NldHRlcl9ieV9pZDoKLSAgICBjYXNlIG9wX3B1dF9nZXR0ZXJfc2V0dGVyOgor ICAgIGNhc2Ugb3BfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQ6CiAgICAgY2FzZSBvcF9wdXRfZ2V0 dGVyX2J5X3ZhbDoKICAgICBjYXNlIG9wX3B1dF9zZXR0ZXJfYnlfdmFsOgogICAgIGNhc2Ugb3Bf cHV0X2J5X3ZhbDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2suY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5j cHAKaW5kZXggMzA4NTUzNTgxODkxNmYxZGVhMTE0ZThjOTY0MGViMGNjNzA0MTA5OS4uNThjZjA1 OTVlZjdlNDc5NmY3NWFkNjg4MjNkNzRhZmNlMjY1OWNjMCAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKQEAgLTEwNzYsMTMgKzEwNzYsMTMgQEAgdm9p ZCBDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSgKICAgICAgICAgICAgIG91dC5wcmludGYoIiVzLCAl cywgJWQsICVzIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIGlkTmFtZShpZDAsIGlkZW50aWZp ZXIoaWQwKSkuZGF0YSgpLCBuMCwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCkpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgY2FzZSBvcF9wdXRfZ2V0dGVyX3NldHRlcjog eworICAgICAgICBjYXNlIG9wX3B1dF9nZXR0ZXJfc2V0dGVyX2J5X2lkOiB7CiAgICAgICAgICAg ICBpbnQgcjAgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGludCBpZDAgPSAoKytp dCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGludCBuMCA9ICgrK2l0KS0+dS5vcGVyYW5kOwog ICAgICAgICAgICAgaW50IHIxID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBpbnQg cjIgPSAoKytpdCktPnUub3BlcmFuZDsKLSAgICAgICAgICAgIHByaW50TG9jYXRpb25BbmRPcChv dXQsIGV4ZWMsIGxvY2F0aW9uLCBpdCwgInB1dF9nZXR0ZXJfc2V0dGVyIik7CisgICAgICAgICAg ICBwcmludExvY2F0aW9uQW5kT3Aob3V0LCBleGVjLCBsb2NhdGlvbiwgaXQsICJwdXRfZ2V0dGVy X3NldHRlcl9ieV9pZCIpOwogICAgICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzLCAlZCwgJXMs ICVzIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIGlkTmFtZShpZDAsIGlkZW50aWZpZXIoaWQw KSkuZGF0YSgpLCBuMCwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMiku ZGF0YSgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCmlu ZGV4IDE3YmYxYzQyZTM0MmI5Yjg1NDJkNjAwNjdmMTQ5MWM3NGQxMmQ2OWIuLjc2MTY1YjJhOWM5 OTA2MjYxMTVjOGFlODgxYzg0OTA1Mzg5ZTNlYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC0yMTcw LDcgKzIxNzAsNyBAQCB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UHV0R2V0dGVyU2V0dGVy KFJlZ2lzdGVySUQqIGJhc2UsIGNvbnN0IElkZW50aWZpZXImCiAKICAgICBtX3N0YXRpY1Byb3Bl cnR5QW5hbHl6ZXIucHV0QnlJZChiYXNlLT5pbmRleCgpLCBwcm9wZXJ0eUluZGV4KTsKIAotICAg IGVtaXRPcGNvZGUob3BfcHV0X2dldHRlcl9zZXR0ZXIpOworICAgIGVtaXRPcGNvZGUob3BfcHV0 X2dldHRlcl9zZXR0ZXJfYnlfaWQpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChiYXNlLT5p bmRleCgpKTsKICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQocHJvcGVydHlJbmRleCk7CiAgICAg aW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKGF0dHJpYnV0ZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAppbmRleCBhN2ZjYjJhNmUwZGM0ODQ5MDEx YzY4ZDY1ZDhjZmE3ODZmOTcxNWQyLi5mNTkxMmQ2NzQ2NGRjZGU3NDlhOGViOTdkNTI1NzhjZGIy NDliZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2Rl UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFy c2VyLmNwcApAQCAtMzc2MCwxNCArMzc2MCwxNCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJz ZUJsb2NrKHVuc2lnbmVkIGxpbWl0KQogICAgICAgICAgICAgTkVYVF9PUENPREUob3BfcHV0X2dl dHRlcl9ieV9pZCk7CiAgICAgICAgIH0KIAotICAgICAgICBjYXNlIG9wX3B1dF9nZXR0ZXJfc2V0 dGVyOiB7CisgICAgICAgIGNhc2Ugb3BfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQ6IHsKICAgICAg ICAgICAgIE5vZGUqIGJhc2UgPSBnZXQoVmlydHVhbFJlZ2lzdGVyKGN1cnJlbnRJbnN0cnVjdGlv blsxXS51Lm9wZXJhbmQpKTsKICAgICAgICAgICAgIHVuc2lnbmVkIGlkZW50aWZpZXJOdW1iZXIg PSBtX2lubGluZVN0YWNrVG9wLT5tX2lkZW50aWZpZXJSZW1hcFtjdXJyZW50SW5zdHJ1Y3Rpb25b Ml0udS5vcGVyYW5kXTsKICAgICAgICAgICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXMgPSBjdXJyZW50 SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kOwogICAgICAgICAgICAgTm9kZSogZ2V0dGVyID0gZ2V0 KFZpcnR1YWxSZWdpc3RlcihjdXJyZW50SW5zdHJ1Y3Rpb25bNF0udS5vcGVyYW5kKSk7CiAgICAg ICAgICAgICBOb2RlKiBzZXR0ZXIgPSBnZXQoVmlydHVhbFJlZ2lzdGVyKGN1cnJlbnRJbnN0cnVj dGlvbls1XS51Lm9wZXJhbmQpKTsKICAgICAgICAgICAgIGFkZFRvR3JhcGgoUHV0R2V0dGVyU2V0 dGVyQnlJZCwgT3BJbmZvKGlkZW50aWZpZXJOdW1iZXIpLCBPcEluZm8oYXR0cmlidXRlcyksIGJh c2UsIGdldHRlciwgc2V0dGVyKTsKLSAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3B1dF9nZXR0 ZXJfc2V0dGVyKTsKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3B1dF9nZXR0ZXJfc2V0dGVy X2J5X2lkKTsKICAgICAgICAgfQogCiAgICAgICAgIGNhc2Ugb3BfcHV0X2dldHRlcl9ieV92YWw6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NhcGFiaWxpdGllcy5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NhcGFiaWxpdGllcy5jcHAKaW5kZXgg OTc4OGE0ODRhMTNhYmEyZjkxZWUxMTMwNTBlNmU1OWFjNmFiODQzMS4uY2RhMTRjMzk5NzVmZDZj ODBlNmZiODkyYTljYWVhM2JiZDlkZWQyYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdDYXBhYmlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQ2FwYWJpbGl0aWVzLmNwcApAQCAtMTU2LDcgKzE1Niw3IEBAIENhcGFiaWxpdHlMZXZl bCBjYXBhYmlsaXR5TGV2ZWwoT3Bjb2RlSUQgb3Bjb2RlSUQsIENvZGVCbG9jayogY29kZUJsb2Nr LCBJbnN0cnVjCiAgICAgY2FzZSBvcF9wdXRfYnlfaWQ6CiAgICAgY2FzZSBvcF9wdXRfZ2V0dGVy X2J5X2lkOgogICAgIGNhc2Ugb3BfcHV0X3NldHRlcl9ieV9pZDoKLSAgICBjYXNlIG9wX3B1dF9n ZXR0ZXJfc2V0dGVyOgorICAgIGNhc2Ugb3BfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQ6CiAgICAg Y2FzZSBvcF9wdXRfZ2V0dGVyX2J5X3ZhbDoKICAgICBjYXNlIG9wX3B1dF9zZXR0ZXJfYnlfdmFs OgogICAgIGNhc2Ugb3Bfam1wOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCmluZGV4IDVmYWQ4 NWJlNTc0NzY3ZDUyMzczMjkyOTM3MTJlNmIzZjI3MmRkNDMuLmNiNTVhZGMyNTc3ZjAxMmVlMTY1 YTJkYjMzNzgwOTBjYmZmNjNmYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKQEAgLTI3 OCw3ICsyNzgsNyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcygpCiAgICAgICAg IERFRklORV9PUChvcF9wdXRfYnlfdmFsKQogICAgICAgICBERUZJTkVfT1Aob3BfcHV0X2dldHRl cl9ieV9pZCkKICAgICAgICAgREVGSU5FX09QKG9wX3B1dF9zZXR0ZXJfYnlfaWQpCi0gICAgICAg IERFRklORV9PUChvcF9wdXRfZ2V0dGVyX3NldHRlcikKKyAgICAgICAgREVGSU5FX09QKG9wX3B1 dF9nZXR0ZXJfc2V0dGVyX2J5X2lkKQogICAgICAgICBERUZJTkVfT1Aob3BfcHV0X2dldHRlcl9i eV92YWwpCiAgICAgICAgIERFRklORV9PUChvcF9wdXRfc2V0dGVyX2J5X3ZhbCkKIApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklULmgKaW5kZXggNDEwYThjYmJhNGNjY2MxZTRkNjFkZDJkODgzYzRmMDNiNjY5 NDdlYS4uZTRjMDI4YzI0YWUwY2Y1NTU5MTQ1YjY2MDk4N2E2NDE5NjEyZDMwZiAxMDA3NTUKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVC5oCkBAIC01NjAsNyArNTYwLDcgQEAKICAgICAgICAgdm9pZCBlbWl0X29w X3B1dF9ieV92YWwoSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAgdm9pZCBlbWl0X29wX3B1dF9nZXR0 ZXJfYnlfaWQoSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAgdm9pZCBlbWl0X29wX3B1dF9zZXR0ZXJf YnlfaWQoSW5zdHJ1Y3Rpb24qKTsKLSAgICAgICAgdm9pZCBlbWl0X29wX3B1dF9nZXR0ZXJfc2V0 dGVyKEluc3RydWN0aW9uKik7CisgICAgICAgIHZvaWQgZW1pdF9vcF9wdXRfZ2V0dGVyX3NldHRl cl9ieV9pZChJbnN0cnVjdGlvbiopOwogICAgICAgICB2b2lkIGVtaXRfb3BfcHV0X2dldHRlcl9i eV92YWwoSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAgdm9pZCBlbWl0X29wX3B1dF9zZXR0ZXJfYnlf dmFsKEluc3RydWN0aW9uKik7CiAgICAgICAgIHZvaWQgZW1pdF9vcF9yZXQoSW5zdHJ1Y3Rpb24q KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nl c3MuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAK aW5kZXggMzE3OWY5OGU1ODAzMGQ2MWYwZWI2Y2ExNGY5YjMyNDg2YTQ0NDRiNC4uOGIzYmI4YjAy MmQ3ZGJiNGI3OGRmM2U5MDVhNWY1YmU2OGIyZmVjNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKQEAgLTUwMyw3ICs1MDMsNyBAQCB2b2lk IEpJVDo6ZW1pdF9vcF9wdXRfc2V0dGVyX2J5X2lkKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1 Y3Rpb24pCiAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25QdXRTZXR0ZXJCeUlkLCByZWdUMCwg bV9jb2RlQmxvY2stPmlkZW50aWZpZXIoY3VycmVudEluc3RydWN0aW9uWzJdLnUub3BlcmFuZCku aW1wbCgpLCBvcHRpb25zLCByZWdUMSk7CiB9CiAKLXZvaWQgSklUOjplbWl0X29wX3B1dF9nZXR0 ZXJfc2V0dGVyKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCit2b2lkIEpJVDo6ZW1p dF9vcF9wdXRfZ2V0dGVyX3NldHRlcl9ieV9pZChJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0 aW9uKQogewogICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIoY3VycmVudEluc3RydWN0aW9uWzFd LnUub3BlcmFuZCwgcmVnVDApOwogICAgIGludDMyX3QgYXR0cmlidXRlID0gY3VycmVudEluc3Ry dWN0aW9uWzNdLnUub3BlcmFuZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUUHJvcGVydHlBY2Nlc3MzMl82NC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVFByb3BlcnR5QWNjZXNzMzJfNjQuY3BwCmluZGV4IDY4OTJlMDk2MDBkMTFlODU5M2NkODA4 YjVkNjhhZWE2NmUyYjRlMWMuLmNlOTNkNDE0MGRmZGEwYmRhZjMzMmM3MzAyNzU2ODI1ZWFmMjQ0 NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nl c3MzMl82NC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFj Y2VzczMyXzY0LmNwcApAQCAtODEsNyArODEsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9wdXRfc2V0 dGVyX2J5X2lkKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgY2FsbE9wZXJh dGlvbihvcGVyYXRpb25QdXRTZXR0ZXJCeUlkLCByZWdUMSwgbV9jb2RlQmxvY2stPmlkZW50aWZp ZXIocHJvcGVydHkpLmltcGwoKSwgb3B0aW9ucywgcmVnVDMpOwogfQogCi12b2lkIEpJVDo6ZW1p dF9vcF9wdXRfZ2V0dGVyX3NldHRlcihJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQor dm9pZCBKSVQ6OmVtaXRfb3BfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQoSW5zdHJ1Y3Rpb24qIGN1 cnJlbnRJbnN0cnVjdGlvbikKIHsKICAgICBpbnQgYmFzZSA9IGN1cnJlbnRJbnN0cnVjdGlvblsx XS51Lm9wZXJhbmQ7CiAgICAgaW50IHByb3BlcnR5ID0gY3VycmVudEluc3RydWN0aW9uWzJdLnUu b3BlcmFuZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNs b3dQYXRocy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMu Y3BwCmluZGV4IGUxODdmNjFjNGZjNjdhNjgxYTE2YjdmNmQ1MGEzMWQ1MWE0ZmJlMDkuLjc2NWYx OTc5NTBlMzIzZjA1NjZlNzJjNzNiNGVlZDYzZTNiMjA4YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcApAQCAtODYxLDcgKzg2MSw3IEBAIGlu bGluZSBKU1ZhbHVlIGdldEJ5VmFsKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBiYXNlVmFsdWUs IEpTVmFsdWUgc3Vic2NyaXB0KQogICAgIExMSU5UX0VORCgpOwogfQogCi1MTElOVF9TTE9XX1BB VEhfREVDTChzbG93X3BhdGhfcHV0X2dldHRlcl9zZXR0ZXIpCitMTElOVF9TTE9XX1BBVEhfREVD TChzbG93X3BhdGhfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQpCiB7CiAgICAgTExJTlRfQkVHSU4o KTsKICAgICBBU1NFUlQoTExJTlRfT1AoMSkuanNWYWx1ZSgpLmlzT2JqZWN0KCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuaAppbmRleCAzMjc5MGRiM2E1 MWMzOTVjM2E3MDcyZjJlZTIyYjgxNDMxODNmNWExLi5lMjQ0ODI5ZmRkMWUyZjE1MDZhMzVkMTBh NGViODFmY2JlMzJjNTMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQv TExJbnRTbG93UGF0aHMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRT bG93UGF0aHMuaApAQCAtODEsNyArODEsNyBAQAogTExJTlRfU0xPV19QQVRIX0hJRERFTl9ERUNM KHNsb3dfcGF0aF9wdXRfYnlfaW5kZXgpOwogTExJTlRfU0xPV19QQVRIX0hJRERFTl9ERUNMKHNs b3dfcGF0aF9wdXRfZ2V0dGVyX2J5X2lkKTsKIExMSU5UX1NMT1dfUEFUSF9ISURERU5fREVDTChz bG93X3BhdGhfcHV0X3NldHRlcl9ieV9pZCk7Ci1MTElOVF9TTE9XX1BBVEhfSElEREVOX0RFQ0wo c2xvd19wYXRoX3B1dF9nZXR0ZXJfc2V0dGVyKTsKK0xMSU5UX1NMT1dfUEFUSF9ISURERU5fREVD TChzbG93X3BhdGhfcHV0X2dldHRlcl9zZXR0ZXJfYnlfaWQpOwogTExJTlRfU0xPV19QQVRIX0hJ RERFTl9ERUNMKHNsb3dfcGF0aF9wdXRfZ2V0dGVyX2J5X3ZhbCk7CiBMTElOVF9TTE9XX1BBVEhf SElEREVOX0RFQ0woc2xvd19wYXRoX3B1dF9zZXR0ZXJfYnlfdmFsKTsKIExMSU5UX1NMT1dfUEFU SF9ISURERU5fREVDTChzbG93X3BhdGhfanRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCmluZGV4IGRhZjU3ODY0MTRkMDc5 NDBiYjdmMTY2M2I5MDg3NDRlMzI3MTU1OTIuLjRmNGFkOWJkNGUyZDcxYjM2OGI5ZGM0NzAzNDg0 ZjY4OWM4NWVjZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dM ZXZlbEludGVycHJldGVyLmFzbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93 TGV2ZWxJbnRlcnByZXRlci5hc20KQEAgLTEzMzQsOSArMTMzNCw5IEBAIF9sbGludF9vcF9wdXRf c2V0dGVyX2J5X2lkOgogICAgIGRpc3BhdGNoKDUpCiAKIAotX2xsaW50X29wX3B1dF9nZXR0ZXJf c2V0dGVyOgorX2xsaW50X29wX3B1dF9nZXR0ZXJfc2V0dGVyX2J5X2lkOgogICAgIHRyYWNlRXhl Y3V0aW9uKCkKLSAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3Nsb3dfcGF0aF9wdXRfZ2V0dGVyX3Nl dHRlcikKKyAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3Nsb3dfcGF0aF9wdXRfZ2V0dGVyX3NldHRl cl9ieV9pZCkKICAgICBkaXNwYXRjaCg2KQogCiAK