155248 2016-03-09 12:08:42 -0800 Add dumping of function expression names in CodeBlock bytecode dump. 2016-03-09 14:31:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified REOPENED P2 Normal --- 155262 1 mark.lam mark.lam benjamin commit-queue fpizlo ggaren keith_miller msaboff saam oldest_to_newest 1172661 0 mark.lam 2016-03-09 12:08:42 -0800 Because ... [ 19] new_func_exp loc5, loc3, f0:foo ... is more informative than [ 19] new_func_exp loc5, loc3, f0 Patch coming soon. 1172665 1 273455 mark.lam 2016-03-09 12:13:34 -0800 Created attachment 273455 proposed patch. 1172675 2 273455 fpizlo 2016-03-09 12:23:27 -0800 Comment on attachment 273455 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=273455&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:772 > + String name = executable->inferredName().string(); This will not work on the concurrent JIT thread. 1172682 3 273461 mark.lam 2016-03-09 12:32:21 -0800 Created attachment 273461 proposed patch: only dump extra info if not in compiler thread. 1172687 4 mark.lam 2016-03-09 12:36:57 -0800 Thanks for the review. Landed in r197873: <http://trac.webkit.org/r197873>. 1172772 5 commit-queue 2016-03-09 14:31:32 -0800 Re-opened since this is blocked by bug 155262 273455 2016-03-09 12:13:34 -0800 2016-03-09 12:32:21 -0800 proposed patch. bug-155248.patch text/plain 5001 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3ODY4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTAzLTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgZHVtcGluZyBvZiBmdW5jdGlvbiBleHByZXNzaW9uIG5hbWVzIGluIENvZGVCbG9jayBieXRl Y29kZSBkdW1wLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU1MjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQmVjYXVzZSAuLi4KKyAgICAgICAgWyAgMTldIG5ld19mdW5jX2V4cCAgICAgIGxvYzUsIGxv YzMsIGYwOmZvbworCisgICAgICAgIC4uLiBpcyBtb3JlIGluZm9ybWF0aXZlIHRoYW4KKyAgICAg ICAgWyAgMTldIG5ld19mdW5jX2V4cCAgICAgIGxvYzUsIGxvYzMsIGYwCisKKyAgICAgICAgQW5v bnltb3VzIGZ1bmN0aW9ucyB3aWxsIGJlIGR1bXBlZCBhcyA8YW5vbj4uCisKKyAgICAgICAgKiBi eXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXBGdW5j dGlvbkV4cHIpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSk6CisgICAg ICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmg6CisKIDIwMTYtMDMtMDkgIE1hcmsgTGFtICA8bWFy ay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEZ1bmN0aW9uRXhlY3V0YWJsZTo6ZWNtYU5hbWUo KSBzaG91bGQgbm90IGJlIGJhc2VkIG9uIGluZmVycmVkTmFtZSgpLgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE5Nzg2NikK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NjUsNiArNzY1LDE3IEBAIHZvaWQgQ29kZUJsb2NrOjpwcmludExvY2F0aW9u T3BBbmRSZWdpc3QKICAgICBvdXQucHJpbnRmKCIlcyIsIHJlZ2lzdGVyTmFtZShvcGVyYW5kKS5k YXRhKCkpOwogfQogCit2b2lkIENvZGVCbG9jazo6ZHVtcEZ1bmN0aW9uRXhwcihQcmludFN0cmVh bSYgb3V0LCBpbnQgZnVuY0V4cHJJbmRleCkKK3sKKyAgICBvdXQucHJpbnRmKCJmJWQ6IiwgZnVu Y0V4cHJJbmRleCk7CisgICAgRnVuY3Rpb25FeGVjdXRhYmxlKiBleGVjdXRhYmxlID0gZnVuY3Rp b25FeHByKGZ1bmNFeHBySW5kZXgpOworICAgIFN0cmluZyBuYW1lID0gZXhlY3V0YWJsZS0+aW5m ZXJyZWROYW1lKCkuc3RyaW5nKCk7CisgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQorICAgICAgICBv dXQucHJpbnQoIjxhbm9uPiIpOworICAgIGVsc2UKKyAgICAgICAgb3V0LnByaW50KG5hbWUudXRm OCgpKTsKK30KKwogdm9pZCBDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSgKICAgICBQcmludFN0cmVh bSYgb3V0LCBFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEluc3RydWN0aW9uKiBiZWdpbiwgY29uc3Qg SW5zdHJ1Y3Rpb24qJiBpdCwKICAgICBjb25zdCBTdHViSW5mb01hcCYgc3R1YkluZm9zLCBjb25z dCBDYWxsTGlua0luZm9NYXAmIGNhbGxMaW5rSW5mb3MpCkBAIC0xMzMyLDcgKzEzNDMsOCBAQCB2 b2lkIENvZGVCbG9jazo6ZHVtcEJ5dGVjb2RlKAogICAgICAgICAgICAgaW50IHIxID0gKCsraXQp LT51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBpbnQgZjAgPSAoKytpdCktPnUub3BlcmFuZDsKICAg ICAgICAgICAgIHByaW50TG9jYXRpb25BbmRPcChvdXQsIGV4ZWMsIGxvY2F0aW9uLCBpdCwgIm5l d19mdW5jIik7Ci0gICAgICAgICAgICBvdXQucHJpbnRmKCIlcywgJXMsIGYlZCIsIHJlZ2lzdGVy TmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEpLmRhdGEoKSwgZjApOworICAgICAgICAg ICAgb3V0LnByaW50ZigiJXMsICVzLCAiLCByZWdpc3Rlck5hbWUocjApLmRhdGEoKSwgcmVnaXN0 ZXJOYW1lKHIxKS5kYXRhKCkpOworICAgICAgICAgICAgZHVtcEZ1bmN0aW9uRXhwcihvdXQsIGYw KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2Ugb3BfbmV3X2dl bmVyYXRvcl9mdW5jOiB7CkBAIC0xMzQwLDcgKzEzNTIsOCBAQCB2b2lkIENvZGVCbG9jazo6ZHVt cEJ5dGVjb2RlKAogICAgICAgICAgICAgaW50IHIxID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAg ICAgICAgICBpbnQgZjAgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIHByaW50TG9j YXRpb25BbmRPcChvdXQsIGV4ZWMsIGxvY2F0aW9uLCBpdCwgIm5ld19nZW5lcmF0b3JfZnVuYyIp OwotICAgICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzLCBmJWQiLCByZWdpc3Rlck5hbWUocjAp LmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCksIGYwKTsKKyAgICAgICAgICAgIG91dC5w cmludGYoIiVzLCAlcywgIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShy MSkuZGF0YSgpKTsKKyAgICAgICAgICAgIGR1bXBGdW5jdGlvbkV4cHIob3V0LCBmMCk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIG9wX25ld19hcnJvd19mdW5j X2V4cDogewpAQCAtMTM0OCw3ICsxMzYxLDggQEAgdm9pZCBDb2RlQmxvY2s6OmR1bXBCeXRlY29k ZSgKICAgICAgICAgICAgIGludCByMSA9ICgrK2l0KS0+dS5vcGVyYW5kOwogICAgICAgICAgICAg aW50IGYwID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBwcmludExvY2F0aW9uQW5k T3Aob3V0LCBleGVjLCBsb2NhdGlvbiwgaXQsICJvcF9uZXdfYXJyb3dfZnVuY19leHAiKTsKLSAg ICAgICAgICAgIG91dC5wcmludGYoIiVzLCAlcywgZiVkIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRh KCksIHJlZ2lzdGVyTmFtZShyMSkuZGF0YSgpLCBmMCk7CisgICAgICAgICAgICBvdXQucHJpbnRm KCIlcywgJXMsICIsIHJlZ2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEpLmRh dGEoKSk7CisgICAgICAgICAgICBkdW1wRnVuY3Rpb25FeHByKG91dCwgZjApOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBvcF9uZXdfZnVuY19leHA6IHsKQEAg LTEzNTYsNyArMTM3MCw4IEBAIHZvaWQgQ29kZUJsb2NrOjpkdW1wQnl0ZWNvZGUoCiAgICAgICAg ICAgICBpbnQgcjEgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGludCBmMCA9ICgr K2l0KS0+dS5vcGVyYW5kOwogICAgICAgICAgICAgcHJpbnRMb2NhdGlvbkFuZE9wKG91dCwgZXhl YywgbG9jYXRpb24sIGl0LCAibmV3X2Z1bmNfZXhwIik7Ci0gICAgICAgICAgICBvdXQucHJpbnRm KCIlcywgJXMsIGYlZCIsIHJlZ2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEp LmRhdGEoKSwgZjApOworICAgICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzLCAiLCByZWdpc3Rl ck5hbWUocjApLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCkpOworICAgICAgICAgICAg ZHVtcEZ1bmN0aW9uRXhwcihvdXQsIGYwKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgICAgIGNhc2Ugb3BfbmV3X2dlbmVyYXRvcl9mdW5jX2V4cDogewpAQCAtMTM2NCw3ICsx Mzc5LDggQEAgdm9pZCBDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSgKICAgICAgICAgICAgIGludCBy MSA9ICgrK2l0KS0+dS5vcGVyYW5kOwogICAgICAgICAgICAgaW50IGYwID0gKCsraXQpLT51Lm9w ZXJhbmQ7CiAgICAgICAgICAgICBwcmludExvY2F0aW9uQW5kT3Aob3V0LCBleGVjLCBsb2NhdGlv biwgaXQsICJuZXdfZ2VuZXJhdG9yX2Z1bmNfZXhwIik7Ci0gICAgICAgICAgICBvdXQucHJpbnRm KCIlcywgJXMsIGYlZCIsIHJlZ2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEp LmRhdGEoKSwgZjApOworICAgICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzIiwgcmVnaXN0ZXJO YW1lKHIwKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMSkuZGF0YSgpKTsKKyAgICAgICAgICAgIGR1 bXBGdW5jdGlvbkV4cHIob3V0LCBmMCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgICAgICBjYXNlIG9wX2NhbGw6IHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9Db2RlQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvQ29kZUJsb2NrLmgJKHJldmlzaW9uIDE5Nzg2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtOTU4LDYgKzk1OCw3 IEBAIHByaXZhdGU6CiAgICAgICAgIG1fY29uc3RhbnRSZWdpc3RlcnNbaW5kZXggLSBGaXJzdENv bnN0YW50UmVnaXN0ZXJJbmRleF0uc2V0KG1fZ2xvYmFsT2JqZWN0LT52bSgpLCB0aGlzLCB2YWx1 ZSk7CiAgICAgfQogCisgICAgdm9pZCBkdW1wRnVuY3Rpb25FeHByKFByaW50U3RyZWFtJiwgaW50 IGZ1bmNFeHBySW5kZXgpOwogICAgIHZvaWQgZHVtcEJ5dGVjb2RlKAogICAgICAgICBQcmludFN0 cmVhbSYsIEV4ZWNTdGF0ZSosIGNvbnN0IEluc3RydWN0aW9uKiBiZWdpbiwgY29uc3QgSW5zdHJ1 Y3Rpb24qJiwKICAgICAgICAgY29uc3QgU3R1YkluZm9NYXAmID0gU3R1YkluZm9NYXAoKSwgY29u c3QgQ2FsbExpbmtJbmZvTWFwJiA9IENhbGxMaW5rSW5mb01hcCgpKTsK 273461 2016-03-09 12:32:21 -0800 2016-03-09 12:32:58 -0800 proposed patch: only dump extra info if not in compiler thread. bug-155248.patch text/plain 5072 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3ODY4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTAzLTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgZHVtcGluZyBvZiBmdW5jdGlvbiBleHByZXNzaW9uIG5hbWVzIGluIENvZGVCbG9jayBieXRl Y29kZSBkdW1wLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU1MjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQmVjYXVzZSAuLi4KKyAgICAgICAgWyAgMTldIG5ld19mdW5jX2V4cCAgICAgIGxvYzUsIGxv YzMsIGYwOmZvbworCisgICAgICAgIC4uLiBpcyBtb3JlIGluZm9ybWF0aXZlIHRoYW4KKyAgICAg ICAgWyAgMTldIG5ld19mdW5jX2V4cCAgICAgIGxvYzUsIGxvYzMsIGYwCisKKyAgICAgICAgQW5v bnltb3VzIGZ1bmN0aW9ucyB3aWxsIGJlIGR1bXBlZCBhcyA8YW5vbj4uCisKKyAgICAgICAgKiBi eXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXBGdW5j dGlvbkV4cHIpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSk6CisgICAg ICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmg6CisKIDIwMTYtMDMtMDkgIE1hcmsgTGFtICA8bWFy ay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEZ1bmN0aW9uRXhlY3V0YWJsZTo6ZWNtYU5hbWUo KSBzaG91bGQgbm90IGJlIGJhc2VkIG9uIGluZmVycmVkTmFtZSgpLgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE5Nzg2NikK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NjUsNiArNzY1LDE5IEBAIHZvaWQgQ29kZUJsb2NrOjpwcmludExvY2F0aW9u T3BBbmRSZWdpc3QKICAgICBvdXQucHJpbnRmKCIlcyIsIHJlZ2lzdGVyTmFtZShvcGVyYW5kKS5k YXRhKCkpOwogfQogCit2b2lkIENvZGVCbG9jazo6ZHVtcEZ1bmN0aW9uRXhwcihQcmludFN0cmVh bSYgb3V0LCBpbnQgZnVuY0V4cHJJbmRleCkKK3sKKyAgICBvdXQucHJpbnRmKCJmJWQiLCBmdW5j RXhwckluZGV4KTsKKyAgICBpZiAoIWlzQ29tcGlsYXRpb25UaHJlYWQoKSkgeworICAgICAgICBG dW5jdGlvbkV4ZWN1dGFibGUqIGV4ZWN1dGFibGUgPSBmdW5jdGlvbkV4cHIoZnVuY0V4cHJJbmRl eCk7CisgICAgICAgIFN0cmluZyBuYW1lID0gZXhlY3V0YWJsZS0+aW5mZXJyZWROYW1lKCkuc3Ry aW5nKCk7CisgICAgICAgIGlmIChuYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIG91dC5wcmlu dCgiOjxhbm9uPiIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvdXQucHJpbnQoIjoiLCBu YW1lLnV0ZjgoKSk7CisgICAgfQorfQorCiB2b2lkIENvZGVCbG9jazo6ZHVtcEJ5dGVjb2RlKAog ICAgIFByaW50U3RyZWFtJiBvdXQsIEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSW5zdHJ1Y3Rpb24q IGJlZ2luLCBjb25zdCBJbnN0cnVjdGlvbiomIGl0LAogICAgIGNvbnN0IFN0dWJJbmZvTWFwJiBz dHViSW5mb3MsIGNvbnN0IENhbGxMaW5rSW5mb01hcCYgY2FsbExpbmtJbmZvcykKQEAgLTEzMzIs NyArMTM0NSw4IEBAIHZvaWQgQ29kZUJsb2NrOjpkdW1wQnl0ZWNvZGUoCiAgICAgICAgICAgICBp bnQgcjEgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGludCBmMCA9ICgrK2l0KS0+ dS5vcGVyYW5kOwogICAgICAgICAgICAgcHJpbnRMb2NhdGlvbkFuZE9wKG91dCwgZXhlYywgbG9j YXRpb24sIGl0LCAibmV3X2Z1bmMiKTsKLSAgICAgICAgICAgIG91dC5wcmludGYoIiVzLCAlcywg ZiVkIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShyMSkuZGF0YSgpLCBm MCk7CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcywgJXMsICIsIHJlZ2lzdGVyTmFtZShyMCku ZGF0YSgpLCByZWdpc3Rlck5hbWUocjEpLmRhdGEoKSk7CisgICAgICAgICAgICBkdW1wRnVuY3Rp b25FeHByKG91dCwgZjApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAg Y2FzZSBvcF9uZXdfZ2VuZXJhdG9yX2Z1bmM6IHsKQEAgLTEzNDAsNyArMTM1NCw4IEBAIHZvaWQg Q29kZUJsb2NrOjpkdW1wQnl0ZWNvZGUoCiAgICAgICAgICAgICBpbnQgcjEgPSAoKytpdCktPnUu b3BlcmFuZDsKICAgICAgICAgICAgIGludCBmMCA9ICgrK2l0KS0+dS5vcGVyYW5kOwogICAgICAg ICAgICAgcHJpbnRMb2NhdGlvbkFuZE9wKG91dCwgZXhlYywgbG9jYXRpb24sIGl0LCAibmV3X2dl bmVyYXRvcl9mdW5jIik7Ci0gICAgICAgICAgICBvdXQucHJpbnRmKCIlcywgJXMsIGYlZCIsIHJl Z2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEpLmRhdGEoKSwgZjApOworICAg ICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzLCAiLCByZWdpc3Rlck5hbWUocjApLmRhdGEoKSwg cmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCkpOworICAgICAgICAgICAgZHVtcEZ1bmN0aW9uRXhwcihv dXQsIGYwKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2Ugb3Bf bmV3X2Fycm93X2Z1bmNfZXhwOiB7CkBAIC0xMzQ4LDcgKzEzNjMsOCBAQCB2b2lkIENvZGVCbG9j azo6ZHVtcEJ5dGVjb2RlKAogICAgICAgICAgICAgaW50IHIxID0gKCsraXQpLT51Lm9wZXJhbmQ7 CiAgICAgICAgICAgICBpbnQgZjAgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIHBy aW50TG9jYXRpb25BbmRPcChvdXQsIGV4ZWMsIGxvY2F0aW9uLCBpdCwgIm9wX25ld19hcnJvd19m dW5jX2V4cCIpOwotICAgICAgICAgICAgb3V0LnByaW50ZigiJXMsICVzLCBmJWQiLCByZWdpc3Rl ck5hbWUocjApLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCksIGYwKTsKKyAgICAgICAg ICAgIG91dC5wcmludGYoIiVzLCAlcywgIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJlZ2lz dGVyTmFtZShyMSkuZGF0YSgpKTsKKyAgICAgICAgICAgIGR1bXBGdW5jdGlvbkV4cHIob3V0LCBm MCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIG9wX25ld19m dW5jX2V4cDogewpAQCAtMTM1Niw3ICsxMzcyLDggQEAgdm9pZCBDb2RlQmxvY2s6OmR1bXBCeXRl Y29kZSgKICAgICAgICAgICAgIGludCByMSA9ICgrK2l0KS0+dS5vcGVyYW5kOwogICAgICAgICAg ICAgaW50IGYwID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBwcmludExvY2F0aW9u QW5kT3Aob3V0LCBleGVjLCBsb2NhdGlvbiwgaXQsICJuZXdfZnVuY19leHAiKTsKLSAgICAgICAg ICAgIG91dC5wcmludGYoIiVzLCAlcywgZiVkIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJl Z2lzdGVyTmFtZShyMSkuZGF0YSgpLCBmMCk7CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcywg JXMsICIsIHJlZ2lzdGVyTmFtZShyMCkuZGF0YSgpLCByZWdpc3Rlck5hbWUocjEpLmRhdGEoKSk7 CisgICAgICAgICAgICBkdW1wRnVuY3Rpb25FeHByKG91dCwgZjApOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBvcF9uZXdfZ2VuZXJhdG9yX2Z1bmNfZXhwOiB7 CkBAIC0xMzY0LDcgKzEzODEsOCBAQCB2b2lkIENvZGVCbG9jazo6ZHVtcEJ5dGVjb2RlKAogICAg ICAgICAgICAgaW50IHIxID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBpbnQgZjAg PSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIHByaW50TG9jYXRpb25BbmRPcChvdXQs IGV4ZWMsIGxvY2F0aW9uLCBpdCwgIm5ld19nZW5lcmF0b3JfZnVuY19leHAiKTsKLSAgICAgICAg ICAgIG91dC5wcmludGYoIiVzLCAlcywgZiVkIiwgcmVnaXN0ZXJOYW1lKHIwKS5kYXRhKCksIHJl Z2lzdGVyTmFtZShyMSkuZGF0YSgpLCBmMCk7CisgICAgICAgICAgICBvdXQucHJpbnRmKCIlcywg JXMiLCByZWdpc3Rlck5hbWUocjApLmRhdGEoKSwgcmVnaXN0ZXJOYW1lKHIxKS5kYXRhKCkpOwor ICAgICAgICAgICAgZHVtcEZ1bmN0aW9uRXhwcihvdXQsIGYwKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAgICAgICAgIGNhc2Ugb3BfY2FsbDogewpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMTk3ODY2KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBA IC05NTgsNiArOTU4LDcgQEAgcHJpdmF0ZToKICAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVyc1tp bmRleCAtIEZpcnN0Q29uc3RhbnRSZWdpc3RlckluZGV4XS5zZXQobV9nbG9iYWxPYmplY3QtPnZt KCksIHRoaXMsIHZhbHVlKTsKICAgICB9CiAKKyAgICB2b2lkIGR1bXBGdW5jdGlvbkV4cHIoUHJp bnRTdHJlYW0mLCBpbnQgZnVuY0V4cHJJbmRleCk7CiAgICAgdm9pZCBkdW1wQnl0ZWNvZGUoCiAg ICAgICAgIFByaW50U3RyZWFtJiwgRXhlY1N0YXRlKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIGJlZ2lu LCBjb25zdCBJbnN0cnVjdGlvbiomLAogICAgICAgICBjb25zdCBTdHViSW5mb01hcCYgPSBTdHVi SW5mb01hcCgpLCBjb25zdCBDYWxsTGlua0luZm9NYXAmID0gQ2FsbExpbmtJbmZvTWFwKCkpOwo=