102016 2012-11-12 17:13:50 -0800 The act of getting the callee during 'this' construction should be explicit in bytecode 2012-11-12 22:06:40 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 102017 102047 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam webkit.review.bot oldest_to_newest 765003 0 fpizlo 2012-11-12 17:13:50 -0800 This will allow us to profile the callee. 765017 1 173768 fpizlo 2012-11-12 17:20:46 -0800 Created attachment 173768 the patch 765019 2 webkit.review.bot 2012-11-12 17:26:25 -0800 Attachment 173768 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:462: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:465: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 2 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 765026 3 173768 msaboff 2012-11-12 17:30:47 -0800 Comment on attachment 173768 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=173768&action=review r=me > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:-2127 > - set(currentInstruction[1].u.operand, addToGraph(CreateThis, get(JSStack::Callee))); Check and remove other magic from get(JSStack::Callee) prior change. 765237 4 fpizlo 2012-11-12 22:06:03 -0800 Landed in http://trac.webkit.org/changeset/134361 173768 2012-11-12 17:20:46 -0800 2012-11-12 17:30:47 -0800 the patch getcallee.patch text/plain 11662 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTM0MzMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBA CisyMDEyLTExLTEyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg VGhlIGFjdCBvZiBnZXR0aW5nIHRoZSBjYWxsZWUgZHVyaW5nICd0aGlzJyBjb25zdHJ1Y3Rpb24g c2hvdWxkIGJlIGV4cGxpY2l0IGluIGJ5dGVjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIwMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG1vc3RseSBhIHJvbGxvdXQgb2YgaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTE2NjczLCBidXQgYWxzbyBpbmNsdWRlcworICAg ICAgICBjaGFuZ2VzIHRvIGhhdmUgY3JlYXRlX3RoaXMgdXNlIHRoZSByZXN1bHQgb2YgZ2V0X2Nh bGxlZS4KKyAgICAgICAgCisgICAgICAgIE5vIHBlcmZvcm1hbmNlIG9yIGJlaGF2aW9yYWwgaW1w YWN0LiBUaGlzIGlzIGp1c3QgbWVhbnQgdG8gYWxsb3cgdXMgdG8gcHJvZmlsZQorICAgICAgICBn ZXRfY2FsbGVlIGluIHRoZSBmdXR1cmUuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2su Y3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXApOgorICAgICAgICAqIGJ5dGVjb2Rl L09wY29kZS5oOgorICAgICAgICAoSlNDKToKKyAgICAgICAgKEpTQzo6cGFkT3Bjb2RlTmFtZSk6 CisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAg KEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKToKKyAgICAgICAgKiBk ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFy c2VyOjpwYXJzZUJsb2NrKToKKyAgICAgICAgKiBkZmcvREZHQ2FwYWJpbGl0aWVzLmg6CisgICAg ICAgIChKU0M6OkRGRzo6Y2FuQ29tcGlsZU9wY29kZSk6CisgICAgICAgICogaml0L0pJVC5jcHA6 CisgICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcyk6CisgICAgICAgICog aml0L0pJVC5oOgorICAgICAgICAoSklUKToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6 CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfY2FsbGVlKToKKyAgICAgICAgKEpTQyk6 CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9jcmVhdGVfdGhpcyk6CisgICAgICAgICogaml0 L0pJVE9wY29kZXMzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfY2Fs bGVlKToKKyAgICAgICAgKEpTQyk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9jcmVhdGVf dGhpcyk6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwOgorICAgICAgICAoSlND OjpMTEludDo6TExJTlRfU0xPV19QQVRIX0RFQ0wpOgorICAgICAgICAqIGxsaW50L0xvd0xldmVs SW50ZXJwcmV0ZXIzMl82NC5hc206CisgICAgICAgICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRl cjY0LmFzbToKKwogMjAxMi0xMS0xMSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIERGRyBBcml0aE11bCBvdmVyZmxvdyBjaGVjayBlbGltaW5hdGlvbiBpcyB0b28g YWdncmVzc2l2ZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9j ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVC bG9jay5jcHAJKHJldmlzaW9uIDEzNDE2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MjksNiArNjI5LDExIEBAIHZv aWQgQ29kZUJsb2NrOjpkdW1wKEV4ZWNTdGF0ZSogZXhlYywgY28KICAgICAgICAgICAgIGR1bXBC eXRlY29kZUNvbW1lbnRBbmROZXdMaW5lKGxvY2F0aW9uKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICB9CisgICAgICAgIGNhc2Ugb3BfZ2V0X2NhbGxlZTogeworICAgICAgICAgICAgaW50 IHIwID0gKCsraXQpLT51Lm9wZXJhbmQ7CisgICAgICAgICAgICBkYXRhTG9nKCJbJTRkXSBvcF9n ZXRfY2FsbGVlICVzXG4iLCBsb2NhdGlvbiwgcmVnaXN0ZXJOYW1lKGV4ZWMsIHIwKS5kYXRhKCkp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAgY2FzZSBvcF9jcmVhdGVf dGhpczogewogICAgICAgICAgICAgaW50IHIwID0gKCsraXQpLT51Lm9wZXJhbmQ7CiAgICAgICAg ICAgICBkYXRhTG9nKCJbJTRkXSBjcmVhdGVfdGhpcyAlcyIsIGxvY2F0aW9uLCByZWdpc3Rlck5h bWUoZXhlYywgcjApLmRhdGEoKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvT3Bjb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L09wY29kZS5oCShyZXZpc2lvbiAxMzQxNjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvT3Bjb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDggQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgIG1hY3JvKG9wX2NyZWF0ZV9hY3RpdmF0aW9uLCAyKSBcCiAgICAgICAg IG1hY3JvKG9wX2luaXRfbGF6eV9yZWcsIDIpIFwKICAgICAgICAgbWFjcm8ob3BfY3JlYXRlX2Fy Z3VtZW50cywgMikgXAotICAgICAgICBtYWNybyhvcF9jcmVhdGVfdGhpcywgMikgXAorICAgICAg ICBtYWNybyhvcF9jcmVhdGVfdGhpcywgMykgXAorICAgICAgICBtYWNybyhvcF9nZXRfY2FsbGVl LCAyKSBcCiAgICAgICAgIG1hY3JvKG9wX2NvbnZlcnRfdGhpcywgMykgXAogICAgICAgICBcCiAg ICAgICAgIG1hY3JvKG9wX25ld19vYmplY3QsIDIpIFwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCShy ZXZpc2lvbiAxMzQxNjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5 dGVjb2RlR2VuZXJhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU3LDggKzQ1NywxNSBAQCBC eXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IoSlNHCiAKICAgICBpZiAoaXNDb25z dHJ1Y3RvcigpKSB7CiAgICAgICAgIHByZXBlbmRDb21tZW50KCIndGhpcycgYmVjYXVzZSB3ZSBh cmUgYSBDb25zdHJ1Y3RvciBmdW5jdGlvbiIpOwotICAgICAgICBlbWl0T3Bjb2RlKG9wX2NyZWF0 ZV90aGlzKTsKLSAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1fdGhpc1JlZ2lzdGVyLmlu ZGV4KCkpOworCisgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBmdW5jID0gbmV3VGVtcG9yYXJ5 KCk7IAorIAorICAgICAgICBlbWl0T3Bjb2RlKG9wX2dldF9jYWxsZWUpOyAKKyAgICAgICAgaW5z dHJ1Y3Rpb25zKCkuYXBwZW5kKGZ1bmMtPmluZGV4KCkpOworIAorICAgICAgICBlbWl0T3Bjb2Rl KG9wX2NyZWF0ZV90aGlzKTsgCisgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChtX3RoaXNS ZWdpc3Rlci5pbmRleCgpKTsgCisgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChmdW5jLT5p bmRleCgpKTsgCiAgICAgfSBlbHNlIGlmICghY29kZUJsb2NrLT5pc1N0cmljdE1vZGUoKSAmJiAo ZnVuY3Rpb25Cb2R5LT51c2VzVGhpcygpIHx8IGNvZGVCbG9jay0+dXNlc0V2YWwoKSB8fCBtX3No b3VsZEVtaXREZWJ1Z0hvb2tzKSkgewogICAgICAgICBVbmxpbmtlZFZhbHVlUHJvZmlsZSBwcm9m aWxlID0gZW1pdFByb2ZpbGVkT3Bjb2RlKG9wX2NvbnZlcnRfdGhpcyk7CiAgICAgICAgIGluc3Ry dWN0aW9ucygpLmFwcGVuZChtX3RoaXNSZWdpc3Rlci5pbmRleCgpKTsKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAx MzQxNjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjEyNCw3ICsyMTI0LDggQEAgYm9vbCBCeXRlQ29kZVBhcnNl cjo6cGFyc2VCbG9jayh1bnNpZ25lZAogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBvcF9jcmVh dGVfdGhpczogewotICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJh bmQsIGFkZFRvR3JhcGgoQ3JlYXRlVGhpcywgZ2V0KEpTU3RhY2s6OkNhbGxlZSkpKTsKKyAgICAg ICAgICAgIGludCBjYWxsZWVPcGVyYW5kID0gY3VycmVudEluc3RydWN0aW9uWzJdLnUub3BlcmFu ZDsKKyAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCBhZGRU b0dyYXBoKENyZWF0ZVRoaXMsIGdldChjYWxsZWVPcGVyYW5kKSkpOwogICAgICAgICAgICAgTkVY VF9PUENPREUob3BfY3JlYXRlX3RoaXMpOwogICAgICAgICB9CiAgICAgICAgICAgICAKQEAgLTIx NzcsNiArMjE3OCwxNCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVk CiAgICAgICAgICAgICBORVhUX09QQ09ERShvcF9uZXdfcmVnZXhwKTsKICAgICAgICAgfQogICAg ICAgICAgICAgCisgICAgICAgIGNhc2Ugb3BfZ2V0X2NhbGxlZTogeworICAgICAgICAgICAgaWYg KG1faW5saW5lU3RhY2tUb3AtPm1faW5saW5lQ2FsbEZyYW1lKQorICAgICAgICAgICAgICAgIHNl dChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCBnZXREaXJlY3QobV9pbmxpbmVTdGFj a1RvcC0+bV9jYWxsZWVWUikpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHNl dChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCBhZGRUb0dyYXBoKEdldENhbGxlZSkp OworICAgICAgICAgICAgTkVYVF9PUENPREUob3BfZ2V0X2NhbGxlZSk7CisgICAgICAgIH0KKwog ICAgICAgICAvLyA9PT0gQml0d2lzZSBvcGVyYXRpb25zID09PQogCiAgICAgICAgIGNhc2Ugb3Bf Yml0YW5kOiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NhcGFiaWxpdGll cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2FwYWJpbGl0 aWVzLmgJKHJldmlzaW9uIDEzNDE2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Q2FwYWJpbGl0aWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNiw2ICsxMTYsNyBAQCBpbmxpbmUg Q2FwYWJpbGl0eUxldmVsIGNhbkNvbXBpbGVPcGNvZGUoCiAgICAgY2FzZSBvcF9lbnRlcjoKICAg ICBjYXNlIG9wX2NvbnZlcnRfdGhpczoKICAgICBjYXNlIG9wX2NyZWF0ZV90aGlzOgorICAgIGNh c2Ugb3BfZ2V0X2NhbGxlZToKICAgICBjYXNlIG9wX2JpdGFuZDoKICAgICBjYXNlIG9wX2JpdG9y OgogICAgIGNhc2Ugb3BfYml0eG9yOgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAko cmV2aXNpb24gMTM0MTY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNTEsNiArMjUxLDcgQEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxl TWFpblBhc3MoKQogICAgICAgICBERUZJTkVfT1Aob3BfY2FsbF92YXJhcmdzKQogICAgICAgICBE RUZJTkVfT1Aob3BfY2F0Y2gpCiAgICAgICAgIERFRklORV9PUChvcF9jb25zdHJ1Y3QpCisgICAg ICAgIERFRklORV9PUChvcF9nZXRfY2FsbGVlKQogICAgICAgICBERUZJTkVfT1Aob3BfY3JlYXRl X3RoaXMpCiAgICAgICAgIERFRklORV9PUChvcF9jb252ZXJ0X3RoaXMpCiAgICAgICAgIERFRklO RV9PUChvcF9pbml0X2xhenlfcmVnKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCShyZXZp c2lvbiAxMzQxNjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCSh3b3JraW5n IGNvcHkpCkBAIC02NDcsNiArNjQ3LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZvaWQg ZW1pdF9vcF9jYWxsX3B1dF9yZXN1bHQoSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAgdm9pZCBlbWl0 X29wX2NhdGNoKEluc3RydWN0aW9uKik7CiAgICAgICAgIHZvaWQgZW1pdF9vcF9jb25zdHJ1Y3Qo SW5zdHJ1Y3Rpb24qKTsKKyAgICAgICAgdm9pZCBlbWl0X29wX2dldF9jYWxsZWUoSW5zdHJ1Y3Rp b24qKTsKICAgICAgICAgdm9pZCBlbWl0X29wX2NyZWF0ZV90aGlzKEluc3RydWN0aW9uKik7CiAg ICAgICAgIHZvaWQgZW1pdF9vcF9jb252ZXJ0X3RoaXMoSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAg dm9pZCBlbWl0X29wX2NyZWF0ZV9hcmd1bWVudHMoSW5zdHJ1Y3Rpb24qKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAJKHJldmlzaW9uIDEz NDE2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTQ2Nyw5ICsxNDY3LDE3IEBAIHZvaWQgSklUOjplbWl0X29wX2lu aXRfbGF6eV9yZWcoSW5zdHJ1Y3QKICAgICBlbWl0U3RvcmUoZHN0LCBKU1ZhbHVlKCkpOwogfQog Ci12b2lkIEpJVDo6ZW1pdF9vcF9jcmVhdGVfdGhpcyhJbnN0cnVjdGlvbiogY3VycmVudEluc3Ry dWN0aW9uKQordm9pZCBKSVQ6OmVtaXRfb3BfZ2V0X2NhbGxlZShJbnN0cnVjdGlvbiogY3VycmVu dEluc3RydWN0aW9uKQogeworICAgIGludCBkc3QgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5v cGVyYW5kOwogICAgIGVtaXRHZXRGcm9tQ2FsbEZyYW1lSGVhZGVyUHRyKEpTU3RhY2s6OkNhbGxl ZSwgcmVnVDApOworICAgIGVtaXRTdG9yZUNlbGwoZHN0LCByZWdUMCk7Cit9CisKK3ZvaWQgSklU OjplbWl0X29wX2NyZWF0ZV90aGlzKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCit7 CisgICAgaW50IGNhbGxlZSA9IGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJhbmQ7CisgICAg ZW1pdExvYWRQYXlsb2FkKGNhbGxlZSwgcmVnVDApOwogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdU MCwgSlNGdW5jdGlvbjo6b2Zmc2V0T2ZDYWNoZWRJbmhlcml0b3JJRCgpKSwgcmVnVDIpOwogICAg IGFkZFNsb3dDYXNlKGJyYW5jaFRlc3RQdHIoWmVybywgcmVnVDIpKTsKICAgICAKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkocmV2aXNpb24gMTM0MTY4KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTIxMCw5ICsxMjEwLDE3IEBAIHZvaWQgSklUOjplbWl0X29wX2NvbnZlcnRfdGhpcyhJ bnN0cnVjdGkKICAgICBhZGRTbG93Q2FzZShicmFuY2hQdHIoRXF1YWwsIEFkZHJlc3MocmVnVDEs IEpTQ2VsbDo6c3RydWN0dXJlT2Zmc2V0KCkpLCBUcnVzdGVkSW1tUHRyKG1fZ2xvYmFsRGF0YS0+ c3RyaW5nU3RydWN0dXJlLmdldCgpKSkpOwogfQogCi12b2lkIEpJVDo6ZW1pdF9vcF9jcmVhdGVf dGhpcyhJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQordm9pZCBKSVQ6OmVtaXRfb3Bf Z2V0X2NhbGxlZShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogeworICAgIHVuc2ln bmVkIHJlc3VsdCA9IGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQ7CiAgICAgZW1pdEdl dEZyb21DYWxsRnJhbWVIZWFkZXJQdHIoSlNTdGFjazo6Q2FsbGVlLCByZWdUMCk7CisgICAgZW1p dFB1dFZpcnR1YWxSZWdpc3RlcihyZXN1bHQpOworfQorCit2b2lkIEpJVDo6ZW1pdF9vcF9jcmVh dGVfdGhpcyhJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQoreworICAgIGludCBjYWxs ZWUgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kOworICAgIGVtaXRHZXRWaXJ0dWFs UmVnaXN0ZXIoY2FsbGVlLCByZWdUMCk7CiAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBKU0Z1 bmN0aW9uOjpvZmZzZXRPZkNhY2hlZEluaGVyaXRvcklEKCkpLCByZWdUMik7CiAgICAgYWRkU2xv d0Nhc2UoYnJhbmNoVGVzdFB0cihaZXJvLCByZWdUMikpOwogICAgIApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCShyZXZpc2lvbiAxMzQx NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NzgsNyArNDc4LDcgQEAgTExJTlRfU0xPV19QQVRIX0RFQ0woc2xv d19wYXRoX2NyZWF0ZV9hcgogTExJTlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX2NyZWF0ZV90 aGlzKQogewogICAgIExMSU5UX0JFR0lOKCk7Ci0gICAgSlNGdW5jdGlvbiogY29uc3RydWN0b3Ig PSBqc0Nhc3Q8SlNGdW5jdGlvbio+KGV4ZWMtPmNhbGxlZSgpKTsKKyAgICBKU0Z1bmN0aW9uKiBj b25zdHJ1Y3RvciA9IGpzQ2FzdDxKU0Z1bmN0aW9uKj4oTExJTlRfT1AoMikuanNWYWx1ZSgpLmFz Q2VsbCgpKTsKICAgICAKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgQ29uc3RydWN0RGF0YSBj b25zdHJ1Y3REYXRhOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVs SW50ZXJwcmV0ZXIzMl82NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82NC5hc20JKHJldmlzaW9uIDEzNDE2OCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQuYXNt CSh3b3JraW5nIGNvcHkpCkBAIC0zNDksMTcgKzM0OSwyNyBAQCBfbGxpbnRfb3BfY3JlYXRlX2Fy Z3VtZW50czoKIAogX2xsaW50X29wX2NyZWF0ZV90aGlzOgogICAgIHRyYWNlRXhlY3V0aW9uKCkK LSAgICBsb2FkcCBDYWxsZWVbY2ZyXSwgdDAKKyAgICBsb2FkaSA4W1BDXSwgdDAKKyAgICBsb2Fk cCBQYXlsb2FkT2Zmc2V0W2NmciwgdDAsIDhdLCB0MAogICAgIGxvYWRwIEpTRnVuY3Rpb246Om1f Y2FjaGVkSW5oZXJpdG9ySURbdDBdLCB0MgogICAgIGJ0cHogdDIsIC5vcENyZWF0ZVRoaXNTbG93 CiAgICAgYWxsb2NhdGVCYXNpY0pTT2JqZWN0KEpTRmluYWxPYmplY3RTaXplQ2xhc3NJbmRleCwg dDIsIHQwLCB0MSwgdDMsIC5vcENyZWF0ZVRoaXNTbG93KQogICAgIGxvYWRpIDRbUENdLCB0MQog ICAgIHN0b3JlaSBDZWxsVGFnLCBUYWdPZmZzZXRbY2ZyLCB0MSwgOF0KICAgICBzdG9yZWkgdDAs IFBheWxvYWRPZmZzZXRbY2ZyLCB0MSwgOF0KLSAgICBkaXNwYXRjaCgyKQorICAgIGRpc3BhdGNo KDMpCiAKIC5vcENyZWF0ZVRoaXNTbG93OgogICAgIGNhbGxTbG93UGF0aChfbGxpbnRfc2xvd19w YXRoX2NyZWF0ZV90aGlzKQorICAgIGRpc3BhdGNoKDMpCisKKworX2xsaW50X29wX2dldF9jYWxs ZWU6CisgICAgdHJhY2VFeGVjdXRpb24oKQorICAgIGxvYWRpIDRbUENdLCB0MAorICAgIGxvYWRw IFBheWxvYWRPZmZzZXQgKyBDYWxsZWVbY2ZyXSwgdDEKKyAgICBzdG9yZWkgQ2VsbFRhZywgVGFn T2Zmc2V0W2NmciwgdDAsIDhdCisgICAgc3RvcmVpIHQxLCBQYXlsb2FkT2Zmc2V0W2NmciwgdDAs IDhdCiAgICAgZGlzcGF0Y2goMikKIAogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQkocmV2aXNpb24gMTM0MTY4 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5h c20JKHdvcmtpbmcgY29weSkKQEAgLTI0MSwxNiArMjQxLDI1IEBAIF9sbGludF9vcF9jcmVhdGVf YXJndW1lbnRzOgogCiBfbGxpbnRfb3BfY3JlYXRlX3RoaXM6CiAgICAgdHJhY2VFeGVjdXRpb24o KQotICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MAorICAgIGxvYWRpc0Zyb21JbnN0cnVjdGlvbigy LCB0MCkKKyAgICBsb2FkcCBbY2ZyLCB0MCwgOF0sIHQwCiAgICAgbG9hZHAgSlNGdW5jdGlvbjo6 bV9jYWNoZWRJbmhlcml0b3JJRFt0MF0sIHQyCiAgICAgYnRweiB0MiwgLm9wQ3JlYXRlVGhpc1Ns b3cKICAgICBhbGxvY2F0ZUJhc2ljSlNPYmplY3QoSlNGaW5hbE9iamVjdFNpemVDbGFzc0luZGV4 LCB0MiwgdDAsIHQxLCB0MywgLm9wQ3JlYXRlVGhpc1Nsb3cpCiAgICAgbG9hZGlzRnJvbUluc3Ry dWN0aW9uKDEsIHQxKQogICAgIHN0b3JlcSB0MCwgW2NmciwgdDEsIDhdCi0gICAgZGlzcGF0Y2go MikKKyAgICBkaXNwYXRjaCgzKQogCiAub3BDcmVhdGVUaGlzU2xvdzoKICAgICBjYWxsU2xvd1Bh dGgoX2xsaW50X3Nsb3dfcGF0aF9jcmVhdGVfdGhpcykKKyAgICBkaXNwYXRjaCgzKQorCisKK19s bGludF9vcF9nZXRfY2FsbGVlOgorICAgIHRyYWNlRXhlY3V0aW9uKCkKKyAgICBsb2FkaXMgOFtQ QiwgUEMsIDhdLCB0MAorICAgIGxvYWRwIENhbGxlZVtjZnJdLCB0MQorICAgIHN0b3JlcCB0MSwg W2NmciwgdDAsIDhdCiAgICAgZGlzcGF0Y2goMikKIAogCg==