140233 2015-01-07 17:06:50 -0800 Add the lexicalEnvironment as an operand to op_get_argument_by_val 2015-01-07 22:20:20 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140148 140097 140236 1 mark.lam mark.lam commit-queue fpizlo ggaren mmirman msaboff oldest_to_newest 1059650 0 mark.lam 2015-01-07 17:06:50 -0800 This is another step towards having the DFG CreateArguments and GetMyArgumentByVal nodes take the lexicalEnvironment as a parameter. Also changed the default value of CodeBlock::lexicalEnvironment() to a constant 0 VirtualRegister instead of an invalid one. This makes the BytecodeGenerator code that loads it as an operand slightly more readable. 1059662 1 244230 mark.lam 2015-01-07 17:43:14 -0800 Created attachment 244230 the patch. 1059694 2 mark.lam 2015-01-07 19:57:38 -0800 The mac-wk2 EWS test run failure appears to be unrelated to this patch. I've run the layout tests locally with this patch, and the results looks to be as fine. I'm not getting any crashes. 1059696 3 244230 fpizlo 2015-01-07 20:11:57 -0800 Comment on attachment 244230 the patch. View in context: https://bugs.webkit.org/attachment.cgi?id=244230&action=review > Source/JavaScriptCore/ChangeLog:13 > + Also changed the value of CodeBlock::lexicalEnvironment() to be > + a constant 0 VirtualRegister instead of an invalid one when there isn't > + a JSLexicalEnvironment present. This makes the BytecodeGenerator code > + that loads it as an operand slightly more readable. Can we not do this? It's weird to have "isLocal()" checks in the DFG. 1059697 4 fpizlo 2015-01-07 20:12:18 -0800 (In reply to comment #3) > Comment on attachment 244230 [details] > the patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=244230&action=review > > > Source/JavaScriptCore/ChangeLog:13 > > + Also changed the value of CodeBlock::lexicalEnvironment() to be > > + a constant 0 VirtualRegister instead of an invalid one when there isn't > > + a JSLexicalEnvironment present. This makes the BytecodeGenerator code > > + that loads it as an operand slightly more readable. > > Can we not do this? It's weird to have "isLocal()" checks in the DFG. ... its' also just inconsistent with how we do things elsewhere. 1059715 5 mark.lam 2015-01-07 20:50:45 -0800 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 244230 [details] > > the patch. > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=244230&action=review > > > > > Source/JavaScriptCore/ChangeLog:13 > > > + Also changed the value of CodeBlock::lexicalEnvironment() to be > > > + a constant 0 VirtualRegister instead of an invalid one when there isn't > > > + a JSLexicalEnvironment present. This makes the BytecodeGenerator code > > > + that loads it as an operand slightly more readable. > > > > Can we not do this? It's weird to have "isLocal()" checks in the DFG. > > ... its' also just inconsistent with how we do things elsewhere. Ok, I’ll remove that part. 1059720 6 244238 mark.lam 2015-01-07 21:14:03 -0800 Created attachment 244238 patch 2 1059746 7 244238 commit-queue 2015-01-07 22:20:16 -0800 Comment on attachment 244238 patch 2 Clearing flags on attachment: 244238 Committed r178106: <http://trac.webkit.org/changeset/178106> 1059747 8 commit-queue 2015-01-07 22:20:20 -0800 All reviewed patches have been landed. Closing bug. 244230 2015-01-07 17:43:14 -0800 2015-01-07 20:51:01 -0800 the patch. bug-140233.patch text/plain 13292 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTc4MDcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBA CisyMDE1LTAxLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgdGhlIGxleGljYWxFbnZpcm9ubWVudCBhcyBhbiBvcGVyYW5kIHRvIG9wX2dldF9hcmd1bWVu dF9ieV92YWwuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDAyMzM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBvbmx5 IGFkZHMgdGhlIG9wZXJhbmQgdG8gdGhlIGJ5dGVjb2RlLiAgSXQgaXMgbm90IGluIHVzZSB5ZXQu CisKKyAgICAgICAgQWxzbyBjaGFuZ2VkIHRoZSB2YWx1ZSBvZiBDb2RlQmxvY2s6OmxleGljYWxF bnZpcm9ubWVudCgpIHRvIGJlCisgICAgICAgIGEgY29uc3RhbnQgMCBWaXJ0dWFsUmVnaXN0ZXIg aW5zdGVhZCBvZiBhbiBpbnZhbGlkIG9uZSB3aGVuIHRoZXJlIGlzbid0CisgICAgICAgIGEgSlNM ZXhpY2FsRW52aXJvbm1lbnQgcHJlc2VudC4gIFRoaXMgbWFrZXMgdGhlIEJ5dGVjb2RlR2VuZXJh dG9yIGNvZGUKKyAgICAgICAgdGhhdCBsb2FkcyBpdCBhcyBhbiBvcGVyYW5kIHNsaWdodGx5IG1v cmUgcmVhZGFibGUuCisKKyAgICAgICAgKiBieXRlY29kZS9CeXRlY29kZUxpc3QuanNvbjoKKyAg ICAgICAgLSB0aGUgYnl0ZWNvZGUgc2l6ZSBoYXMgaW5jcmVhc2VkIGJ5IDEuCisgICAgICAgICog Ynl0ZWNvZGUvQnl0ZWNvZGVVc2VEZWYuaDoKKyAgICAgICAgKEpTQzo6Y29tcHV0ZVVzZXNGb3JC eXRlY29kZU9mZnNldCk6CisgICAgICAgIC0gYWRkIHVzZSBvZiB0aGUgbmV3IGxleGljYWxFbnZp cm9ubWVudCBvcGVyYW5kLgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAg ICAgIChKU0M6OkNvZGVCbG9jazo6ZHVtcEJ5dGVjb2RlKToKKworICAgICAgICAqIGJ5dGVjb2Rl L0NvZGVCbG9jay5oOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmFjdGl2YXRpb25SZWdpc3Rl cik6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6bmVlZHNBY3RpdmF0aW9uKToKKyAgICAgICAg KiBieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oOgorICAgICAgICAoSlNDOjpVbmxpbmtlZENv ZGVCbG9jazo6aGFzQWN0aXZhdGlvblJlZ2lzdGVyKToKKyAgICAgICAgLSBXaGVuIHRoZXJlIGlz IG5vIEpTTGV4aWNhbEVudmlyb25tZW50LCB0aGUgbV9sZXhpY2FsRW52aXJvbm1lbnRSZWdpc3Rl cgorICAgICAgICAgIHdpbGwgbm93IGhvbGQgYSBjb25zdGFudCAwIFZpcnR1YWxSZWdpc3Rlci4g IEhlbmNlLCB0aGUgaXNWYWxpZCgpCisgICAgICAgICAgY2hlY2tzIG5lZWQgdG8gYmUgY2hhbmdl ZCB0byBpc0xvY2FsKCkuICBpc1ZhbGlkKCkgd291bGQgcmV0dXJuIHRydWUKKyAgICAgICAgICBm b3IgdGhlIGNvbnN0YW50LiAgaXNMb2NhbCgpIHdpbGwgbm90LgorCisgICAgICAgICogYnl0ZWNv bXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5l cmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKToKKyAgICAgICAgLSBXaGVuIHRoZXJlIGlzIG5vIEpT TGV4aWNhbEVudmlyb25tZW50LCBzZXQgdGhlIG1fbGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXIK KyAgICAgICAgICB0byBiZSBhIGNvbnN0YW50IDAgVmlydHVhbFJlZ2lzdGVyLgorICAgICAgICAo SlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEdldEFyZ3VtZW50QnlWYWwpOgorICAgICAgICAo SlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Y3JlYXRlQXJndW1lbnRzSWZOZWNlc3NhcnkpOgorCisg ICAgICAgICogZGZnL0RGR1ByZWNpc2VMb2NhbENsb2JiZXJpemUuaDoKKyAgICAgICAgKEpTQzo6 REZHOjpmb3JFYWNoTG9jYWxSZWFkQnlVbndpbmQpOgorICAgICAgICAtIERpdHRvLiAgVGhlIGxl eGljYWxFbnZpcm9ubWVudCBpc1ZhbGlkKCkgdGVzdCBuZWVkcyB0byBiZSBjaGFuZ2VkIHRvCisg ICAgICAgICAgaXNMb2NhbCgpLgorCisgICAgICAgICogZGZnL0RGR1N0YWNrTGF5b3V0UGhhc2Uu Y3BwOgorICAgICAgICAoSlNDOjpERkc6OlN0YWNrTGF5b3V0UGhhc2U6OnJ1bik6CisgICAgICAg ICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbToKKyAgICAgICAgKiBsbGludC9M b3dMZXZlbEludGVycHJldGVyNjQuYXNtOgorICAgICAgICAtIFRoZSBMTElOVCBuZWVkcyB0byBy ZXNwZWN0IHRoZSBuZXcgYnl0ZWNvZGUgc2l6ZS4KKwogMjAxNS0wMS0wNyAgQnJpYW4gSi4gQnVy ZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcHVy Z2UgUGFzc1JlZlB0ciBmcm9tIEluc3BlY3RvciBjb2RlIGFuZCB1c2UgUmVmIGZvciB0eXBlZCBh bmQgdW50eXBlZCBwcm90b2NvbCBvYmplY3RzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQnl0ZWNvZGVMaXN0Lmpzb24KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uCShyZXZpc2lvbiAxNzgwNjgpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVMaXN0Lmpzb24JKHdvcmtpbmcg Y29weSkKQEAgLTY5LDcgKzY5LDcgQEAKICAgICAgICAgICAgIHsgIm5hbWUiIDogIm9wX3B1dF9i eV9pZF90cmFuc2l0aW9uX25vcm1hbF9vdXRfb2ZfbGluZSIsICJsZW5ndGgiIDogOSB9LAogICAg ICAgICAgICAgeyAibmFtZSIgOiAib3BfZGVsX2J5X2lkIiwgImxlbmd0aCIgOiA0IH0sCiAgICAg ICAgICAgICB7ICJuYW1lIiA6ICJvcF9nZXRfYnlfdmFsIiwgImxlbmd0aCIgOiA2IH0sCi0gICAg ICAgICAgICB7ICJuYW1lIiA6ICJvcF9nZXRfYXJndW1lbnRfYnlfdmFsIiwgImxlbmd0aCIgOiA2 IH0sCisgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9nZXRfYXJndW1lbnRfYnlfdmFsIiwgImxl bmd0aCIgOiA3IH0sCiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9wdXRfYnlfdmFsIiwgImxl bmd0aCIgOiA1IH0sCiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9wdXRfYnlfdmFsX2RpcmVj dCIsICJsZW5ndGgiIDogNSB9LAogICAgICAgICAgICAgeyAibmFtZSIgOiAib3BfZGVsX2J5X3Zh bCIsICJsZW5ndGgiIDogNCB9LApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0J5dGVjb2RlVXNlRGVmLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL0J5dGVjb2RlVXNlRGVmLmgJKHJldmlzaW9uIDE3ODA2OCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29kZVVzZURlZi5oCSh3b3JraW5nIGNvcHkpCkBAIC0x NTMsNyArMTUzLDYgQEAgdm9pZCBjb21wdXRlVXNlc0ZvckJ5dGVjb2RlT2Zmc2V0KAogICAgIGNh c2Ugb3BfaGFzX2luZGV4ZWRfcHJvcGVydHk6CiAgICAgY2FzZSBvcF9uZXh0X2VudW1lcmF0b3Jf cG5hbWU6CiAgICAgY2FzZSBvcF9nZXRfYnlfdmFsOgotICAgIGNhc2Ugb3BfZ2V0X2FyZ3VtZW50 X2J5X3ZhbDoKICAgICBjYXNlIG9wX2luOgogICAgIGNhc2Ugb3BfaW5zdGFuY2VvZjoKICAgICBj YXNlIG9wX2NoZWNrX2hhc19pbnN0YW5jZToKQEAgLTE4Miw2ICsxODEsNyBAQCB2b2lkIGNvbXB1 dGVVc2VzRm9yQnl0ZWNvZGVPZmZzZXQoCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgY2Fz ZSBvcF9oYXNfc3RydWN0dXJlX3Byb3BlcnR5OgorICAgIGNhc2Ugb3BfZ2V0X2FyZ3VtZW50X2J5 X3ZhbDoKICAgICBjYXNlIG9wX2dldF9nZW5lcmljX3Byb3BlcnR5X2VudW1lcmF0b3I6CiAgICAg Y2FzZSBvcF9jb25zdHJ1Y3RfdmFyYXJnczoKICAgICBjYXNlIG9wX2NhbGxfdmFyYXJnczogewpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJl dmlzaW9uIDE3ODA2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTE2LDggKzExMTYsOSBAQCB2b2lkIENvZGVCbG9j azo6ZHVtcEJ5dGVjb2RlKAogICAgICAgICAgICAgaW50IHIwID0gKCsraXQpLT51Lm9wZXJhbmQ7 CiAgICAgICAgICAgICBpbnQgcjEgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGlu dCByMiA9ICgrK2l0KS0+dS5vcGVyYW5kOworICAgICAgICAgICAgaW50IHIzID0gKCsraXQpLT51 Lm9wZXJhbmQ7CiAgICAgICAgICAgICBwcmludExvY2F0aW9uQW5kT3Aob3V0LCBleGVjLCBsb2Nh dGlvbiwgaXQsICJnZXRfYXJndW1lbnRfYnlfdmFsIik7Ci0gICAgICAgICAgICBvdXQucHJpbnRm KCIlcywgJXMsICVzIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMSku ZGF0YSgpLCByZWdpc3Rlck5hbWUocjIpLmRhdGEoKSk7CisgICAgICAgICAgICBvdXQucHJpbnRm KCIlcywgJXMsICVzLCAlcyIsIHJlZ2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUo cjEpLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIyKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMykuZGF0 YSgpKTsKICAgICAgICAgICAgICsraXQ7CiAgICAgICAgICAgICBkdW1wVmFsdWVQcm9maWxpbmco b3V0LCBpdCwgaGFzUHJpbnRlZFByb2ZpbGluZyk7CiAgICAgICAgICAgICBicmVhazsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJKHJldmlzaW9uIDE3 ODA2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkod29y a2luZyBjb3B5KQpAQCAtMzU4LDcgKzM1OCw3IEBAIHB1YmxpYzoKIAogICAgIFZpcnR1YWxSZWdp c3RlciBhY3RpdmF0aW9uUmVnaXN0ZXIoKSBjb25zdAogICAgIHsKLSAgICAgICAgQVNTRVJUKG1f bGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXIuaXNWYWxpZCgpKTsKKyAgICAgICAgQVNTRVJUKG1f bGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXIuaXNMb2NhbCgpKTsKICAgICAgICAgcmV0dXJuIG1f bGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXI7CiAgICAgfQogCkBAIC0zNzEsNyArMzcxLDcgQEAg cHVibGljOgogCiAgICAgYm9vbCBuZWVkc0FjdGl2YXRpb24oKSBjb25zdAogICAgIHsKLSAgICAg ICAgQVNTRVJUKG1fbGV4aWNhbEVudmlyb25tZW50UmVnaXN0ZXIuaXNWYWxpZCgpID09IG1fbmVl ZHNBY3RpdmF0aW9uKTsKKyAgICAgICAgQVNTRVJUKG1fbGV4aWNhbEVudmlyb25tZW50UmVnaXN0 ZXIuaXNMb2NhbCgpID09IG1fbmVlZHNBY3RpdmF0aW9uKTsKICAgICAgICAgcmV0dXJuIG1fbmVl ZHNBY3RpdmF0aW9uOwogICAgIH0KICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oCShyZXZpc2lvbiAxNzgwNjgpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suaAkod29y a2luZyBjb3B5KQpAQCAtNDI4LDcgKzQyOCw3IEBAIHB1YmxpYzoKICAgICBWaXJ0dWFsUmVnaXN0 ZXIgdGhpc1JlZ2lzdGVyKCkgY29uc3QgeyByZXR1cm4gbV90aGlzUmVnaXN0ZXI7IH0KICAgICBW aXJ0dWFsUmVnaXN0ZXIgc2NvcGVSZWdpc3RlcigpIGNvbnN0IHsgcmV0dXJuIG1fc2NvcGVSZWdp c3RlcjsgfQogICAgIFZpcnR1YWxSZWdpc3RlciBhY3RpdmF0aW9uUmVnaXN0ZXIoKSBjb25zdCB7 IHJldHVybiBtX2xleGljYWxFbnZpcm9ubWVudFJlZ2lzdGVyOyB9Ci0gICAgYm9vbCBoYXNBY3Rp dmF0aW9uUmVnaXN0ZXIoKSBjb25zdCB7IHJldHVybiBtX2xleGljYWxFbnZpcm9ubWVudFJlZ2lz dGVyLmlzVmFsaWQoKTsgfQorICAgIGJvb2wgaGFzQWN0aXZhdGlvblJlZ2lzdGVyKCkgY29uc3Qg eyByZXR1cm4gbV9sZXhpY2FsRW52aXJvbm1lbnRSZWdpc3Rlci5pc0xvY2FsKCk7IH0KIAogICAg IHZvaWQgYWRkUHJvcGVydHlBY2Nlc3NJbnN0cnVjdGlvbih1bnNpZ25lZCBwcm9wZXJ0eUFjY2Vz c0luc3RydWN0aW9uKQogICAgIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAxNzgw NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJh dG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU5LDcgKzI1OSw5IEBAIEJ5dGVjb2RlR2VuZXJh dG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYKICAgICAgICAgZW1pdE9wY29kZShvcF9jcmVhdGVf bGV4aWNhbF9lbnZpcm9ubWVudCk7CiAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChtX2xl eGljYWxFbnZpcm9ubWVudFJlZ2lzdGVyLT5pbmRleCgpKTsKICAgICAgICAgaW5zdHJ1Y3Rpb25z KCkuYXBwZW5kKHNjb3BlUmVnaXN0ZXIoKS0+aW5kZXgoKSk7Ci0gICAgfQorICAgIH0gZWxzZQor ICAgICAgICBtX2NvZGVCbG9jay0+c2V0QWN0aXZhdGlvblJlZ2lzdGVyKGFkZENvbnN0YW50VmFs dWUoSlNWYWx1ZSgpKS0+dmlydHVhbFJlZ2lzdGVyKCkpOworCiAgICAgUmVnaXN0ZXJJRCogbG9j YWxBcmd1bWVudHNSZWdpc3RlciA9IG51bGxwdHI7CiAgICAgUmVnaXN0ZXJJRCogc2NyYXRjaCA9 IGFkZFZhcigpOwogICAgIG1fc3ltYm9sVGFibGUtPnNldENhcHR1cmVTdGFydCh2aXJ0dWFsUmVn aXN0ZXJGb3JMb2NhbChtX2NvZGVCbG9jay0+bV9udW1WYXJzKS5vZmZzZXQoKSk7CkBAIC0yODIs OCArMjg0LDggQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJgogICAg ICAgICBpZiAoc2hvdWxkQ3JlYXRlQXJndW1lbnRzRWFnZXJseSgpIHx8IHNob3VsZFRlYXJPZmZB cmd1bWVudHNFYWdlcmx5KCkpIHsKICAgICAgICAgICAgIGVtaXRPcGNvZGUob3BfY3JlYXRlX2Fy Z3VtZW50cyk7CiAgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoYXJndW1lbnRzUmVn aXN0ZXItPmluZGV4KCkpOwotICAgICAgICAgICAgQVNTRVJUKCFtX2NvZGVCbG9jay0+aGFzQWN0 aXZhdGlvblJlZ2lzdGVyKCkgfHwgbV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3RlcigpLmlz VmFsaWQoKSk7Ci0gICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobV9jb2RlQmxvY2st Pmhhc0FjdGl2YXRpb25SZWdpc3RlcigpID8gbV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3Rl cigpLm9mZnNldCgpIDogYWRkQ29uc3RhbnRWYWx1ZShKU1ZhbHVlKCkpLT5pbmRleCgpKTsKKyAg ICAgICAgICAgIEFTU0VSVCghbV9jb2RlQmxvY2stPmhhc0FjdGl2YXRpb25SZWdpc3RlcigpIHx8 IG1fY29kZUJsb2NrLT5hY3RpdmF0aW9uUmVnaXN0ZXIoKS5pc0xvY2FsKCkpOworICAgICAgICAg ICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1fY29kZUJsb2NrLT5hY3RpdmF0aW9uUmVnaXN0ZXIo KS5vZmZzZXQoKSk7CiAKICAgICAgICAgICAgIGlmIChtX2NvZGVCbG9jay0+aGFzQWN0aXZhdGlv blJlZ2lzdGVyKCkpIHsKICAgICAgICAgICAgICAgICBSZWdpc3RlcklEKiBhcmd1bWVudHNSZWdp c3RlciA9ICZyZWdpc3RlckZvcihtX2NvZGVCbG9jay0+YXJndW1lbnRzUmVnaXN0ZXIoKS5vZmZz ZXQoKSk7CkBAIC0xNTI1LDYgKzE1MjcsOCBAQCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRv cjo6ZW1pdEdldEFyCiAgICAgQVNTRVJUKGJhc2UtPnZpcnR1YWxSZWdpc3RlcigpID09IG1fY29k ZUJsb2NrLT5hcmd1bWVudHNSZWdpc3RlcigpKTsKICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQo YmFzZS0+aW5kZXgoKSk7CiAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKHByb3BlcnR5LT5pbmRl eCgpKTsKKyAgICBBU1NFUlQoIW1fY29kZUJsb2NrLT5oYXNBY3RpdmF0aW9uUmVnaXN0ZXIoKSB8 fCBtX2NvZGVCbG9jay0+YWN0aXZhdGlvblJlZ2lzdGVyKCkuaXNMb2NhbCgpKTsKKyAgICBpbnN0 cnVjdGlvbnMoKS5hcHBlbmQobV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3RlcigpLm9mZnNl dCgpKTsKICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoYXJyYXlQcm9maWxlKTsKICAgICBpbnN0 cnVjdGlvbnMoKS5hcHBlbmQocHJvZmlsZSk7CiAgICAgcmV0dXJuIGRzdDsKQEAgLTE3NzUsOCAr MTc3OSw4IEBAIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OmNyZWF0ZUFyZ3VtZW50c0kKICAgICBl bWl0T3Bjb2RlKG9wX2NyZWF0ZV9hcmd1bWVudHMpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVu ZChtX2NvZGVCbG9jay0+YXJndW1lbnRzUmVnaXN0ZXIoKS5vZmZzZXQoKSk7CiAgICAgQVNTRVJU KCFoYXNXYXRjaGFibGVWYXJpYWJsZShtX2NvZGVCbG9jay0+YXJndW1lbnRzUmVnaXN0ZXIoKS5v ZmZzZXQoKSkpOwotICAgIEFTU0VSVCghbV9jb2RlQmxvY2stPmhhc0FjdGl2YXRpb25SZWdpc3Rl cigpIHx8IG1fY29kZUJsb2NrLT5hY3RpdmF0aW9uUmVnaXN0ZXIoKS5pc1ZhbGlkKCkpOwotICAg IGluc3RydWN0aW9ucygpLmFwcGVuZChtX2NvZGVCbG9jay0+aGFzQWN0aXZhdGlvblJlZ2lzdGVy KCkgPyBtX2NvZGVCbG9jay0+YWN0aXZhdGlvblJlZ2lzdGVyKCkub2Zmc2V0KCkgOiBhZGRDb25z dGFudFZhbHVlKEpTVmFsdWUoKSktPmluZGV4KCkpOworICAgIEFTU0VSVCghbV9jb2RlQmxvY2st Pmhhc0FjdGl2YXRpb25SZWdpc3RlcigpIHx8IG1fY29kZUJsb2NrLT5hY3RpdmF0aW9uUmVnaXN0 ZXIoKS5pc0xvY2FsKCkpOworICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChtX2NvZGVCbG9jay0+ YWN0aXZhdGlvblJlZ2lzdGVyKCkub2Zmc2V0KCkpOwogfQogCiBSZWdpc3RlcklEKiBCeXRlY29k ZUdlbmVyYXRvcjo6ZW1pdENhbGxFdmFsKFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogZnVu YywgQ2FsbEFyZ3VtZW50cyYgY2FsbEFyZ3VtZW50cywgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRp dm90LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RTdGFydCwgY29uc3QgSlNUZXh0UG9zaXRp b24mIGRpdm90RW5kKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVjaXNl TG9jYWxDbG9iYmVyaXplLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdQcmVjaXNlTG9jYWxDbG9iYmVyaXplLmgJKHJldmlzaW9uIDE3ODA2OCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlY2lzZUxvY2FsQ2xvYmJlcml6ZS5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNjEsNyArMTYxLDcgQEAgcHJpdmF0ZToKIHRlbXBsYXRlPHR5cGVuYW1lIFJl YWRGdW5jdG9yPgogdm9pZCBmb3JFYWNoTG9jYWxSZWFkQnlVbndpbmQoR3JhcGgmIGdyYXBoLCBD b2RlT3JpZ2luIGNvZGVPcmlnaW4sIGNvbnN0IFJlYWRGdW5jdG9yJiByZWFkKQogewotICAgIGlm IChncmFwaC51bmNoZWNrZWRBY3RpdmF0aW9uUmVnaXN0ZXIoKS5pc1ZhbGlkKCkpCisgICAgaWYg KGdyYXBoLnVuY2hlY2tlZEFjdGl2YXRpb25SZWdpc3RlcigpLmlzTG9jYWwoKSkKICAgICAgICAg cmVhZChncmFwaC5hY3RpdmF0aW9uUmVnaXN0ZXIoKSk7CiAgICAgaWYgKGdyYXBoLm1fY29kZUJs b2NrLT51c2VzQXJndW1lbnRzKCkpCiAgICAgICAgIHJlYWQodW5tb2RpZmllZEFyZ3VtZW50c1Jl Z2lzdGVyKGdyYXBoLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG51bGxwdHIpKSk7CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0YWNrTGF5b3V0UGhhc2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RhY2tMYXlvdXRQaGFzZS5jcHAJKHJl dmlzaW9uIDE3ODA2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RhY2tMYXlv dXRQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw3ICsxMDIsNyBAQCBwdWJsaWM6CiAg ICAgICAgICAgICB1c2VkTG9jYWxzLnNldChjb2RlQmxvY2soKS0+YXJndW1lbnRzUmVnaXN0ZXIo KS50b0xvY2FsKCkpOwogICAgICAgICAgICAgdXNlZExvY2Fscy5zZXQodW5tb2RpZmllZEFyZ3Vt ZW50c1JlZ2lzdGVyKGNvZGVCbG9jaygpLT5hcmd1bWVudHNSZWdpc3RlcigpKS50b0xvY2FsKCkp OwogICAgICAgICB9Ci0gICAgICAgIGlmIChjb2RlQmxvY2soKS0+dW5jaGVja2VkQWN0aXZhdGlv blJlZ2lzdGVyKCkuaXNWYWxpZCgpKQorICAgICAgICBpZiAoY29kZUJsb2NrKCktPnVuY2hlY2tl ZEFjdGl2YXRpb25SZWdpc3RlcigpLmlzTG9jYWwoKSkKICAgICAgICAgICAgIHVzZWRMb2NhbHMu c2V0KGNvZGVCbG9jaygpLT5hY3RpdmF0aW9uUmVnaXN0ZXIoKS50b0xvY2FsKCkpOwogICAgICAg ICBmb3IgKElubGluZUNhbGxGcmFtZVNldDo6aXRlcmF0b3IgaXRlciA9IG1fZ3JhcGgubV9wbGFu LmlubGluZUNhbGxGcmFtZXMtPmJlZ2luKCk7ICEhaXRlcjsgKytpdGVyKSB7CiAgICAgICAgICAg ICBJbmxpbmVDYWxsRnJhbWUqIGlubGluZUNhbGxGcmFtZSA9ICppdGVyOwpAQCAtMTYzLDcgKzE2 Myw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGNvZGVCbG9jaygpLT5zZXRBcmd1bWVudHNSZWdp c3Rlcihhcmd1bWVudHNSZWdpc3Rlcik7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIGlm IChjb2RlQmxvY2soKS0+dW5jaGVja2VkQWN0aXZhdGlvblJlZ2lzdGVyKCkuaXNWYWxpZCgpKSB7 CisgICAgICAgIGlmIChjb2RlQmxvY2soKS0+dW5jaGVja2VkQWN0aXZhdGlvblJlZ2lzdGVyKCku aXNMb2NhbCgpKSB7CiAgICAgICAgICAgICBjb2RlQmxvY2soKS0+c2V0QWN0aXZhdGlvblJlZ2lz dGVyKAogICAgICAgICAgICAgICAgIHZpcnR1YWxSZWdpc3RlckZvckxvY2FsKGFsbG9jYXRpb25b Y29kZUJsb2NrKCktPmFjdGl2YXRpb25SZWdpc3RlcigpLnRvTG9jYWwoKV0pKTsKICAgICAgICAg fQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIz Ml82NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xl dmVsSW50ZXJwcmV0ZXIzMl82NC5hc20JKHJldmlzaW9uIDE3ODA2OCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQuYXNtCSh3b3JraW5nIGNv cHkpCkBAIC0xNjIwLDEyICsxNjIwLDEyIEBAIF9sbGludF9vcF9nZXRfYXJndW1lbnRfYnlfdmFs OgogICAgIGxvYWRpIFRoaXNBcmd1bWVudE9mZnNldCArIFBheWxvYWRPZmZzZXRbY2ZyLCB0Miwg OF0sIHQxCiAgICAgc3RvcmVpIHQwLCBUYWdPZmZzZXRbY2ZyLCB0MywgOF0KICAgICBzdG9yZWkg dDEsIFBheWxvYWRPZmZzZXRbY2ZyLCB0MywgOF0KLSAgICB2YWx1ZVByb2ZpbGUodDAsIHQxLCAy MCwgdDIpCi0gICAgZGlzcGF0Y2goNikKKyAgICB2YWx1ZVByb2ZpbGUodDAsIHQxLCAyNCwgdDIp CisgICAgZGlzcGF0Y2goNykKIAogLm9wR2V0QXJndW1lbnRCeVZhbFNsb3c6CiAgICAgY2FsbFNs b3dQYXRoKF9sbGludF9zbG93X3BhdGhfZ2V0X2FyZ3VtZW50X2J5X3ZhbCkKLSAgICBkaXNwYXRj aCg2KQorICAgIGRpc3BhdGNoKDcpCiAKIAogbWFjcm8gY29udGlndW91c1B1dEJ5VmFsKHN0b3Jl Q2FsbGJhY2spCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRl cnByZXRlcjY0LmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQv TG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQkocmV2aXNpb24gMTc4MDY4KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc20JKHdvcmtpbmcgY29w eSkKQEAgLTE0NzUsMTUgKzE0NzUsMTUgQEAgX2xsaW50X29wX2dldF9hcmd1bWVudF9ieV92YWw6 CiAgICAgbG9hZGkgQXJndW1lbnRDb3VudCArIFBheWxvYWRPZmZzZXRbY2ZyXSwgdDEKICAgICBi aWFlcSB0MiwgdDEsIC5vcEdldEFyZ3VtZW50QnlWYWxTbG93CiAgICAgbG9hZGlzRnJvbUluc3Ry dWN0aW9uKDEsIHQzKQotICAgIGxvYWRwRnJvbUluc3RydWN0aW9uKDUsIHQxKQorICAgIGxvYWRw RnJvbUluc3RydWN0aW9uKDYsIHQxKQogICAgIGxvYWRxIFRoaXNBcmd1bWVudE9mZnNldFtjZnIs IHQyLCA4XSwgdDAKICAgICBzdG9yZXEgdDAsIFtjZnIsIHQzLCA4XQotICAgIHZhbHVlUHJvZmls ZSh0MCwgNSwgdDEpCi0gICAgZGlzcGF0Y2goNikKKyAgICB2YWx1ZVByb2ZpbGUodDAsIDYsIHQx KQorICAgIGRpc3BhdGNoKDcpCiAKIC5vcEdldEFyZ3VtZW50QnlWYWxTbG93OgogICAgIGNhbGxT bG93UGF0aChfbGxpbnRfc2xvd19wYXRoX2dldF9hcmd1bWVudF9ieV92YWwpCi0gICAgZGlzcGF0 Y2goNikKKyAgICBkaXNwYXRjaCg3KQogCiAKIG1hY3JvIGNvbnRpZ3VvdXNQdXRCeVZhbChzdG9y ZUNhbGxiYWNrKQo= 244238 2015-01-07 21:14:03 -0800 2015-01-07 22:20:16 -0800 patch 2 bug-140233.patch text/plain 5976 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTc4MDk2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTAxLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgdGhlIGxleGljYWxFbnZpcm9ubWVudCBhcyBhbiBvcGVyYW5kIHRvIG9wX2dldF9hcmd1bWVu dF9ieV92YWwuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDAyMzM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBvbmx5 IGFkZHMgdGhlIG9wZXJhbmQgdG8gdGhlIGJ5dGVjb2RlLiAgSXQgaXMgbm90IGluIHVzZSB5ZXQu CisKKyAgICAgICAgKiBieXRlY29kZS9CeXRlY29kZUxpc3QuanNvbjoKKyAgICAgICAgKiBieXRl Y29kZS9CeXRlY29kZVVzZURlZi5oOgorICAgICAgICAoSlNDOjpjb21wdXRlVXNlc0ZvckJ5dGVj b2RlT2Zmc2V0KToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAo SlNDOjpDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSk6CisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5 dGVjb2RlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVt aXRHZXRBcmd1bWVudEJ5VmFsKToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVy MzJfNjQuYXNtOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc206CisK IDIwMTUtMDEtMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBPYmpDIEdlbmVyYXRlIHR5cGVzIGZyb20gdGhlIEdlbmVyaWNU eXBlcyBkb21haW4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29k ZUxpc3QuanNvbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Qnl0ZWNvZGVMaXN0Lmpzb24JKHJldmlzaW9uIDE3ODA3OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9CeXRlY29kZUxpc3QuanNvbgkod29ya2luZyBjb3B5KQpAQCAtNjksNyAr NjksNyBAQAogICAgICAgICAgICAgeyAibmFtZSIgOiAib3BfcHV0X2J5X2lkX3RyYW5zaXRpb25f bm9ybWFsX291dF9vZl9saW5lIiwgImxlbmd0aCIgOiA5IH0sCiAgICAgICAgICAgICB7ICJuYW1l IiA6ICJvcF9kZWxfYnlfaWQiLCAibGVuZ3RoIiA6IDQgfSwKICAgICAgICAgICAgIHsgIm5hbWUi IDogIm9wX2dldF9ieV92YWwiLCAibGVuZ3RoIiA6IDYgfSwKLSAgICAgICAgICAgIHsgIm5hbWUi IDogIm9wX2dldF9hcmd1bWVudF9ieV92YWwiLCAibGVuZ3RoIiA6IDYgfSwKKyAgICAgICAgICAg IHsgIm5hbWUiIDogIm9wX2dldF9hcmd1bWVudF9ieV92YWwiLCAibGVuZ3RoIiA6IDcgfSwKICAg ICAgICAgICAgIHsgIm5hbWUiIDogIm9wX3B1dF9ieV92YWwiLCAibGVuZ3RoIiA6IDUgfSwKICAg ICAgICAgICAgIHsgIm5hbWUiIDogIm9wX3B1dF9ieV92YWxfZGlyZWN0IiwgImxlbmd0aCIgOiA1 IH0sCiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9kZWxfYnlfdmFsIiwgImxlbmd0aCIgOiA0 IH0sCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVVc2VEZWYu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVV c2VEZWYuaAkocmV2aXNpb24gMTc4MDc5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0J5dGVjb2RlVXNlRGVmLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1Myw3ICsxNTMsNiBAQCB2 b2lkIGNvbXB1dGVVc2VzRm9yQnl0ZWNvZGVPZmZzZXQoCiAgICAgY2FzZSBvcF9oYXNfaW5kZXhl ZF9wcm9wZXJ0eToKICAgICBjYXNlIG9wX25leHRfZW51bWVyYXRvcl9wbmFtZToKICAgICBjYXNl IG9wX2dldF9ieV92YWw6Ci0gICAgY2FzZSBvcF9nZXRfYXJndW1lbnRfYnlfdmFsOgogICAgIGNh c2Ugb3BfaW46CiAgICAgY2FzZSBvcF9pbnN0YW5jZW9mOgogICAgIGNhc2Ugb3BfY2hlY2tfaGFz X2luc3RhbmNlOgpAQCAtMTgyLDYgKzE4MSw3IEBAIHZvaWQgY29tcHV0ZVVzZXNGb3JCeXRlY29k ZU9mZnNldCgKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBjYXNlIG9wX2hhc19zdHJ1Y3R1 cmVfcHJvcGVydHk6CisgICAgY2FzZSBvcF9nZXRfYXJndW1lbnRfYnlfdmFsOgogICAgIGNhc2Ug b3BfZ2V0X2dlbmVyaWNfcHJvcGVydHlfZW51bWVyYXRvcjoKICAgICBjYXNlIG9wX2NvbnN0cnVj dF92YXJhcmdzOgogICAgIGNhc2Ugb3BfY2FsbF92YXJhcmdzOiB7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkocmV2aXNpb24gMTc4MDc5KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTExMTYsOCArMTExNiw5IEBAIHZvaWQgQ29kZUJsb2NrOjpkdW1wQnl0ZWNvZGUo CiAgICAgICAgICAgICBpbnQgcjAgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGlu dCByMSA9ICgrK2l0KS0+dS5vcGVyYW5kOwogICAgICAgICAgICAgaW50IHIyID0gKCsraXQpLT51 Lm9wZXJhbmQ7CisgICAgICAgICAgICBpbnQgcjMgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAg ICAgICAgIHByaW50TG9jYXRpb25BbmRPcChvdXQsIGV4ZWMsIGxvY2F0aW9uLCBpdCwgImdldF9h cmd1bWVudF9ieV92YWwiKTsKLSAgICAgICAgICAgIG91dC5wcmludGYoIiVzLCAlcywgJXMiLCBy ZWdpc3Rlck5hbWUocjApLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCksIHJlZ2lzdGVy TmFtZShyMikuZGF0YSgpKTsKKyAgICAgICAgICAgIG91dC5wcmludGYoIiVzLCAlcywgJXMsICVz IiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMSkuZGF0YSgpLCByZWdp c3Rlck5hbWUocjIpLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIzKS5kYXRhKCkpOwogICAgICAgICAg ICAgKytpdDsKICAgICAgICAgICAgIGR1bXBWYWx1ZVByb2ZpbGluZyhvdXQsIGl0LCBoYXNQcmlu dGVkUHJvZmlsaW5nKTsKICAgICAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJ KHJldmlzaW9uIDE3ODA3OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIv Qnl0ZWNvZGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTI1LDYgKzE1MjUsOCBA QCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEdldEFyCiAgICAgQVNTRVJUKGJh c2UtPnZpcnR1YWxSZWdpc3RlcigpID09IG1fY29kZUJsb2NrLT5hcmd1bWVudHNSZWdpc3Rlcigp KTsKICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoYmFzZS0+aW5kZXgoKSk7CiAgICAgaW5zdHJ1 Y3Rpb25zKCkuYXBwZW5kKHByb3BlcnR5LT5pbmRleCgpKTsKKyAgICBBU1NFUlQoIW1fY29kZUJs b2NrLT5oYXNBY3RpdmF0aW9uUmVnaXN0ZXIoKSB8fCBtX2NvZGVCbG9jay0+YWN0aXZhdGlvblJl Z2lzdGVyKCkuaXNWYWxpZCgpKTsKKyAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobV9jb2RlQmxv Y2stPmhhc0FjdGl2YXRpb25SZWdpc3RlcigpID8gbV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdp c3RlcigpLm9mZnNldCgpIDogYWRkQ29uc3RhbnRWYWx1ZShKU1ZhbHVlKCkpLT5pbmRleCgpKTsK ICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoYXJyYXlQcm9maWxlKTsKICAgICBpbnN0cnVjdGlv bnMoKS5hcHBlbmQocHJvZmlsZSk7CiAgICAgcmV0dXJuIGRzdDsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQuYXNtCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQu YXNtCShyZXZpc2lvbiAxNzgwNzkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93 TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMTYyMCwxMiArMTYy MCwxMiBAQCBfbGxpbnRfb3BfZ2V0X2FyZ3VtZW50X2J5X3ZhbDoKICAgICBsb2FkaSBUaGlzQXJn dW1lbnRPZmZzZXQgKyBQYXlsb2FkT2Zmc2V0W2NmciwgdDIsIDhdLCB0MQogICAgIHN0b3JlaSB0 MCwgVGFnT2Zmc2V0W2NmciwgdDMsIDhdCiAgICAgc3RvcmVpIHQxLCBQYXlsb2FkT2Zmc2V0W2Nm ciwgdDMsIDhdCi0gICAgdmFsdWVQcm9maWxlKHQwLCB0MSwgMjAsIHQyKQotICAgIGRpc3BhdGNo KDYpCisgICAgdmFsdWVQcm9maWxlKHQwLCB0MSwgMjQsIHQyKQorICAgIGRpc3BhdGNoKDcpCiAK IC5vcEdldEFyZ3VtZW50QnlWYWxTbG93OgogICAgIGNhbGxTbG93UGF0aChfbGxpbnRfc2xvd19w YXRoX2dldF9hcmd1bWVudF9ieV92YWwpCi0gICAgZGlzcGF0Y2goNikKKyAgICBkaXNwYXRjaCg3 KQogCiAKIG1hY3JvIGNvbnRpZ3VvdXNQdXRCeVZhbChzdG9yZUNhbGxiYWNrKQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc20KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2 NC5hc20JKHJldmlzaW9uIDE3ODA3OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M b3dMZXZlbEludGVycHJldGVyNjQuYXNtCSh3b3JraW5nIGNvcHkpCkBAIC0xNDc1LDE1ICsxNDc1 LDE1IEBAIF9sbGludF9vcF9nZXRfYXJndW1lbnRfYnlfdmFsOgogICAgIGxvYWRpIEFyZ3VtZW50 Q291bnQgKyBQYXlsb2FkT2Zmc2V0W2Nmcl0sIHQxCiAgICAgYmlhZXEgdDIsIHQxLCAub3BHZXRB cmd1bWVudEJ5VmFsU2xvdwogICAgIGxvYWRpc0Zyb21JbnN0cnVjdGlvbigxLCB0MykKLSAgICBs b2FkcEZyb21JbnN0cnVjdGlvbig1LCB0MSkKKyAgICBsb2FkcEZyb21JbnN0cnVjdGlvbig2LCB0 MSkKICAgICBsb2FkcSBUaGlzQXJndW1lbnRPZmZzZXRbY2ZyLCB0MiwgOF0sIHQwCiAgICAgc3Rv cmVxIHQwLCBbY2ZyLCB0MywgOF0KLSAgICB2YWx1ZVByb2ZpbGUodDAsIDUsIHQxKQotICAgIGRp c3BhdGNoKDYpCisgICAgdmFsdWVQcm9maWxlKHQwLCA2LCB0MSkKKyAgICBkaXNwYXRjaCg3KQog CiAub3BHZXRBcmd1bWVudEJ5VmFsU2xvdzoKICAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3Nsb3df cGF0aF9nZXRfYXJndW1lbnRfYnlfdmFsKQotICAgIGRpc3BhdGNoKDYpCisgICAgZGlzcGF0Y2go NykKIAogCiBtYWNybyBjb250aWd1b3VzUHV0QnlWYWwoc3RvcmVDYWxsYmFjaykK