129051 2014-02-19 10:36:45 -0800 GetMyArgumentsByLength in FTL doesn't work with inline code 2014-02-21 13:47:30 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mmirman webkit-unassigned commit-queue fpizlo mmirman oldest_to_newest 982413 0 mmirman 2014-02-19 10:36:45 -0800 patch forthcoming. 982417 1 224651 mmirman 2014-02-19 10:38:50 -0800 Created attachment 224651 Fixed GetMyArgumentsLength in FTL to work with inline code 982422 2 224651 ggaren 2014-02-19 10:44:48 -0800 Comment on attachment 224651 Fixed GetMyArgumentsLength in FTL to work with inline code Can you add a test case for this? (If it's already covered by an existing test, you should note that in your ChangeLog.) 982430 3 224654 mmirman 2014-02-19 10:51:54 -0800 Created attachment 224654 Fixed GetMyArgumentsLength in FTL to work with inline code Added a test case. 982482 4 224654 ggaren 2014-02-19 11:56:18 -0800 Comment on attachment 224654 Fixed GetMyArgumentsLength in FTL to work with inline code dfgShouldBe is a slightly better way to write a test like this. It tests precisely whether the function made it into our optimizing compilers, which means the test can terminate sooner, and there's no risk that the test will terminate too soon. You should make that change in a follow-up patch. 982484 5 224654 commit-queue 2014-02-19 11:58:58 -0800 Comment on attachment 224654 Fixed GetMyArgumentsLength in FTL to work with inline code Rejecting attachment 224654 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 224654, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: kitpy/common/checkout/changelog.py", line 347, in parse_entries_from_file yield ChangeLogEntry(''.join(entry_lines[:-1]), revision=most_probable_revision) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 112, in __init__ self._parse_entry() File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 206, in _parse_entry self._date_line = match.group() AttributeError: 'NoneType' object has no attribute 'group' Full output: http://webkit-queues.appspot.com/results/5252063646711808 982966 6 224654 fpizlo 2014-02-20 13:53:46 -0800 Comment on attachment 224654 Fixed GetMyArgumentsLength in FTL to work with inline code Actually, this test is broken. There's no way it even hits the FTL since it relies on global code. Did you test the test? It's very important that when you add a test, you check that it indeed reproduces the bug you're trying to fix. I don't buy that this test gives us coverage over the old version of this code. 983288 7 224890 mmirman 2014-02-21 12:19:51 -0800 Created attachment 224890 Fixed GetMyArgumentsLength in FTL to work with inline code 983290 8 224890 fpizlo 2014-02-21 12:30:31 -0800 Comment on attachment 224890 Fixed GetMyArgumentsLength in FTL to work with inline code View in context: https://bugs.webkit.org/attachment.cgi?id=224890&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:300 > + case GetMyArgumentsLengthSafe: I don't think you want to combine these two. The purpose of GetMyArgumenstLengthSafe is to have a slow path, rather than a speculation, for the arguments-created case. See what the DFG does, notice the slow path call: case GetMyArgumentsLengthSafe: { GPRTemporary result(this); GPRReg resultGPR = result.gpr(); JITCompiler::Jump created = m_jit.branchTest64( JITCompiler::NonZero, JITCompiler::addressFor( m_jit.graph().machineArgumentsRegisterFor(node->origin.semantic))); if (node->origin.semantic.inlineCallFrame) { m_jit.move( Imm64(JSValue::encode(jsNumber(node->origin.semantic.inlineCallFrame->arguments.size() - 1))), resultGPR); } else { m_jit.load32(JITCompiler::payloadFor(JSStack::ArgumentCount), resultGPR); m_jit.sub32(TrustedImm32(1), resultGPR); m_jit.or64(GPRInfo::tagTypeNumberRegister, resultGPR); } // FIXME: the slow path generator should perform a forward speculation that the // result is an integer. For now we postpone the speculation by having this return // a JSValue. addSlowPathGenerator( slowPathCall( created, this, operationGetArgumentsLength, resultGPR, m_jit.graph().machineArgumentsRegisterFor(node->origin.semantic).offset())); jsValueResult(resultGPR, node); break; } 983305 9 224894 mmirman 2014-02-21 12:57:18 -0800 Created attachment 224894 Fixed GetMyArgumentsLength in FTL to work with inline code 983326 10 224894 commit-queue 2014-02-21 13:47:28 -0800 Comment on attachment 224894 Fixed GetMyArgumentsLength in FTL to work with inline code Clearing flags on attachment: 224894 Committed r164496: <http://trac.webkit.org/changeset/164496> 983327 11 commit-queue 2014-02-21 13:47:30 -0800 All reviewed patches have been landed. Closing bug. 224651 2014-02-19 10:38:50 -0800 2014-02-19 10:51:54 -0800 Fixed GetMyArgumentsLength in FTL to work with inline code getmyargumentslength.patch text/plain 1401 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWU5ODM1Yy4uYWFlYTFmMiAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsMCArMSwxMCBAQAorMjAxNC0wMi0xOCAgTWF0dGhldyBNaXJtYW4gIDxtbWly bWFuQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBHZXRNeUFyZ3VtZW50c0xlbmd0aCBpbiBG VEwgdG8gd29yayB3aXRoIGlubGluZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkwNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvTExWTS5jcHA6CisgICAgICAg IChKU0M6OkZUTDo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVHZXRNeUFyZ3VtZW50c0xlbmd0aCk6 CisKZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZN LmNwcCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAppbmRl eCBiYTVmMjRhLi44MTk2NTIzIDEwMDY0NAotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExMb3dlckRGR1RvTExWTS5jcHAKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93 ZXJERkdUb0xMVk0uY3BwCkBAIC0xODA2LDggKzE4MTIsMTEgQEAgcHJpdmF0ZToKICAgICAKICAg ICB2b2lkIGNvbXBpbGVHZXRNeUFyZ3VtZW50c0xlbmd0aCgpIAogICAgIHsKLSAgICAgICAgVHlw ZWRQb2ludGVyIHJlZyA9IGFkZHJlc3NGb3IobV9ub2RlLT5vcmlnaW4uc2VtYW50aWMuc3RhY2tP ZmZzZXQoKSArIEpTU3RhY2s6OkFyZ3VtZW50Q291bnQpOwotICAgICAgICBzZXRJbnQzMihtX291 dC5hZGQobV9vdXQubG9hZDMyTm9uTmVnYXRpdmUocmVnKSwgbV9vdXQuY29uc3RJbnQzMigtMSkp KTsKKyAgICAgICAgQ29kZU9yaWdpbiBjb2RlTG9jYXRpb24gPSBtX25vZGUtPm9yaWdpbi5zZW1h bnRpYzsKKyAgICAgICAgaWYgKGNvZGVMb2NhdGlvbi5pbmxpbmVDYWxsRnJhbWUpCisgICAgICAg ICAgICBzZXRJbnQzMihtX291dC5jb25zdEludDMyKGNvZGVMb2NhdGlvbi5pbmxpbmVDYWxsRnJh bWUtPmFyZ3VtZW50cy5zaXplKCkgLSAxKSk7CisgICAgICAgIGVsc2UgCisgICAgICAgICAgICBz ZXRJbnQzMihtX291dC5hZGQobV9vdXQubG9hZDMyTm9uTmVnYXRpdmUoYWRkcmVzc0ZvcihKU1N0 YWNrOjpBcmd1bWVudENvdW50KSksIG1fb3V0LmNvbnN0SW50MzIoLTEpKSk7IAogICAgIH0KIAog ICAgIHZvaWQgY29tcGlsZUdldEFycmF5TGVuZ3RoKCkK 224654 2014-02-19 10:51:54 -0800 2014-02-21 12:19:51 -0800 Fixed GetMyArgumentsLength in FTL to work with inline code getmyargumentslength.patch text/plain 2033 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWU5ODM1Yy4uYWFlYTFmMiAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsMCArMSwxMiBAQAorMjAxNC0wMi0xOCAgTWF0dGhldyBNaXJtYW4gIDxtbWly bWFuQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBHZXRNeUFyZ3VtZW50c0xlbmd0aCBpbiBG VEwgdG8gd29yayB3aXRoIGlubGluZSBjb2RlLiAgVGVzdHMgYXJlIGZ0bC1nZXRteWFyZ3VtZW50 c2xlbmd0aC5qcyBhbmQgZnRsLWdldG15YXJndW1lbnRzbGVuZ3RoLWlubGluZS5qcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MDUxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmdGwvRlRMTG93ZXJE RkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6Okxvd2VyREZHVG9MTFZNOjpjb21waWxl R2V0TXlBcmd1bWVudHNMZW5ndGgpOgorICAgICAgICAqIHRlc3RzL3N0cmVzcy9mdGwtZ2V0bXlh cmd1bWVudHNsZW5ndGgtaW5saW5lLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKZGlmZiAt LWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcCBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAppbmRleCBiYTVmMjRh Li44MTk2NTIzIDEwMDY0NAotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRG R1RvTExWTS5jcHAKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xM Vk0uY3BwCkBAIC0xODA2LDggKzE4MTIsMTEgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGNv bXBpbGVHZXRNeUFyZ3VtZW50c0xlbmd0aCgpIAogICAgIHsKLSAgICAgICAgVHlwZWRQb2ludGVy IHJlZyA9IGFkZHJlc3NGb3IobV9ub2RlLT5vcmlnaW4uc2VtYW50aWMuc3RhY2tPZmZzZXQoKSAr IEpTU3RhY2s6OkFyZ3VtZW50Q291bnQpOwotICAgICAgICBzZXRJbnQzMihtX291dC5hZGQobV9v dXQubG9hZDMyTm9uTmVnYXRpdmUocmVnKSwgbV9vdXQuY29uc3RJbnQzMigtMSkpKTsKKyAgICAg ICAgQ29kZU9yaWdpbiBjb2RlTG9jYXRpb24gPSBtX25vZGUtPm9yaWdpbi5zZW1hbnRpYzsKKyAg ICAgICAgaWYgKGNvZGVMb2NhdGlvbi5pbmxpbmVDYWxsRnJhbWUpCisgICAgICAgICAgICBzZXRJ bnQzMihtX291dC5jb25zdEludDMyKGNvZGVMb2NhdGlvbi5pbmxpbmVDYWxsRnJhbWUtPmFyZ3Vt ZW50cy5zaXplKCkgLSAxKSk7CisgICAgICAgIGVsc2UgCisgICAgICAgICAgICBzZXRJbnQzMiht X291dC5hZGQobV9vdXQubG9hZDMyTm9uTmVnYXRpdmUoYWRkcmVzc0ZvcihKU1N0YWNrOjpBcmd1 bWVudENvdW50KSksIG1fb3V0LmNvbnN0SW50MzIoLTEpKSk7IAogICAgIH0KIAogICAgIHZvaWQg Y29tcGlsZUdldEFycmF5TGVuZ3RoKCkKZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUv dGVzdHMvc3RyZXNzL2Z0bC1nZXRteWFyZ3VtZW50c2xlbmd0aC1pbmxpbmUuanMgU291cmNlL0ph dmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9mdGwtZ2V0bXlhcmd1bWVudHNsZW5ndGgtaW5saW5l LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY1MDNkMzEKLS0tIC9kZXYv bnVsbAorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9mdGwtZ2V0bXlhcmd1 bWVudHNsZW5ndGgtaW5saW5lLmpzCkBAIC0wLDAgKzEsOSBAQAorZnVuY3Rpb24gZm9vKCl7Cisg ICAgcmV0dXJuIGFyZ3VtZW50cy5sZW5ndGg7Cit9CisKK2ZvciAodmFyIGkgPSAwOyBpIDwgMTAw MDAwOyArK2kpIHsKKyAgICB2YXIgciA9IGZvbygxMSwgMTIsIDEzLCAxOCwgMTksIDIwKTsKKyAg ICBpZiAociAhPSA2KSB0aHJvdyAiRXJyb3I6ICIrcjsKK30KKwo= 224890 2014-02-21 12:19:51 -0800 2014-02-21 12:57:18 -0800 Fixed GetMyArgumentsLength in FTL to work with inline code 0001-Fixed-GetMyArgumentsLength.patch text/plain 2603 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWU5ODM1Yy4uODI5MTM2YyAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNC0wMi0yMSAgTWF0dGhldyBNaXJtYW4gIDxtbWly bWFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRlZCBhIEdldE15QXJndW1lbnRzTGVuZ3RoU2Fm ZSBhbmQgYWRkZWQgYSBzcGVjdWxhdGlvbiBjaGVjay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZnRsL0ZUTENhcGFiaWxpdGllcy5jcHA6CisgICAg ICAgIChKU0M6OkZUTDo6Y2FuQ29tcGlsZSk6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9M TFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1RvTExWTTo6Y29tcGlsZU5vZGUp OgorICAgICAgICAoSlNDOjpGVEw6Okxvd2VyREZHVG9MTFZNOjpjb21waWxlR2V0TXlBcmd1bWVu dHNMZW5ndGgpOgorCiAyMDE0LTAyLTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgbHIgaXMgYSBzcGVjaWFsIHJlZ2lzdGVyIG9uIEFSTTY0CmRpZmYgLS1naXQg U291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3BwIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMQ2FwYWJpbGl0aWVzLmNwcAppbmRleCBhOTY1ZThjLi45MWQ2MmVk IDEwMDY0NAotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3Bw CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAKQEAgLTQ2 LDYgKzQ2LDcgQEAgaW5saW5lIENhcGFiaWxpdHlMZXZlbCBjYW5Db21waWxlKE5vZGUqIG5vZGUp CiAgICAgY2FzZSBKU0NvbnN0YW50OgogICAgIGNhc2UgV2Vha0pTQ29uc3RhbnQ6CiAgICAgY2Fz ZSBHZXRNeUFyZ3VtZW50c0xlbmd0aDoKKyAgICBjYXNlIEdldE15QXJndW1lbnRzTGVuZ3RoU2Fm ZToKICAgICBjYXNlIEdldExvY2FsOgogICAgIGNhc2UgU2V0TG9jYWw6CiAgICAgY2FzZSBNb3ZI aW50OgpkaWZmIC0tZ2l0IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xM Vk0uY3BwIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmlu ZGV4IGJhNWYyNGEuLjYwZjI2YzMgMTAwNjQ0Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRs L0ZUTExvd2VyREZHVG9MTFZNLmNwcAorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExM b3dlckRGR1RvTExWTS5jcHAKQEAgLTI5Nyw2ICsyOTcsNyBAQCBwcml2YXRlOgogICAgICAgICAg ICAgY29tcGlsZU1vdkhpbnQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEdl dE15QXJndW1lbnRzTGVuZ3RoOgorICAgICAgICBjYXNlIEdldE15QXJndW1lbnRzTGVuZ3RoU2Fm ZToKICAgICAgICAgICAgIGNvbXBpbGVHZXRNeUFyZ3VtZW50c0xlbmd0aCgpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgWm9tYmllSGludDoKQEAgLTE4MDYsOCArMTgwNywxNiBA QCBwcml2YXRlOgogICAgIAogICAgIHZvaWQgY29tcGlsZUdldE15QXJndW1lbnRzTGVuZ3RoKCkg CiAgICAgewotICAgICAgICBUeXBlZFBvaW50ZXIgcmVnID0gYWRkcmVzc0ZvcihtX25vZGUtPm9y aWdpbi5zZW1hbnRpYy5zdGFja09mZnNldCgpICsgSlNTdGFjazo6QXJndW1lbnRDb3VudCk7Ci0g ICAgICAgIHNldEludDMyKG1fb3V0LmFkZChtX291dC5sb2FkMzJOb25OZWdhdGl2ZShyZWcpLCBt X291dC5jb25zdEludDMyKC0xKSkpOworICAgICAgICBDb2RlT3JpZ2luIGNvZGVMb2NhdGlvbiA9 IG1fbm9kZS0+b3JpZ2luLnNlbWFudGljOworICAgICAgICBpZiAoIWlzRW1wdHlTcGVjdWxhdGlv bigKKyAgICAgICAgICAgIG1fc3RhdGUudmFyaWFibGVzKCkub3BlcmFuZCgKKyAgICAgICAgICAg ICAgICBtX2dyYXBoLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG1fbm9kZS0+b3JpZ2luLnNlbWFudGlj KSkubV90eXBlKSkgeworICAgICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIGFyZ3NSZWcgPSBtX2dy YXBoLm1hY2hpbmVBcmd1bWVudHNSZWdpc3RlckZvcihjb2RlTG9jYXRpb24pOworICAgICAgICAg ICAgc3BlY3VsYXRlKEFyZ3VtZW50c0VzY2FwZWQsIG5vVmFsdWUoKSwgMCwgbV9vdXQubm90WmVy bzY0KG1fb3V0LmxvYWQ2NChhZGRyZXNzRm9yKGFyZ3NSZWcpKSkpOworICAgICAgICB9CisKKyAg ICAgICAgUkVMRUFTRV9BU1NFUlQoIWNvZGVMb2NhdGlvbi5pbmxpbmVDYWxsRnJhbWUpOworICAg ICAgICBzZXRJbnQzMihtX291dC5hZGQobV9vdXQubG9hZDMyTm9uTmVnYXRpdmUocGF5bG9hZEZv cihKU1N0YWNrOjpBcmd1bWVudENvdW50KSksIG1fb3V0LmNvbnN0SW50MzIoLTEpKSk7CiAgICAg fQogCiAgICAgdm9pZCBjb21waWxlR2V0QXJyYXlMZW5ndGgoKQo= 224894 2014-02-21 12:57:18 -0800 2014-02-21 13:47:28 -0800 Fixed GetMyArgumentsLength in FTL to work with inline code 0001-Fixed-GetMyArgumentsByLength-in-FTL.patch text/plain 1766 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWU5ODM1Yy4uNDllNzZlNiAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0wMi0yMSAgTWF0dGhldyBNaXJtYW4gIDxtbWly bWFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRlZCBhIEdldE15QXJndW1lbnRzTGVuZ3RoU2Fm ZSBhbmQgYWRkZWQgYSBzcGVjdWxhdGlvbiBjaGVjay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAg ICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1RvTExWTTo6Y29tcGlsZUdldE15QXJndW1lbnRzTGVu Z3RoKToKKwogMjAxNC0wMi0xNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAg ICAgICAgIGxyIGlzIGEgc3BlY2lhbCByZWdpc3RlciBvbiBBUk02NApkaWZmIC0tZ2l0IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmluZGV4IGJhNWYyNGEuLjhiMDQzNWUg MTAwNjQ0Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNw cAorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAKQEAg LTE4MDYsOCArMTgwNiwxNiBAQCBwcml2YXRlOgogICAgIAogICAgIHZvaWQgY29tcGlsZUdldE15 QXJndW1lbnRzTGVuZ3RoKCkgCiAgICAgewotICAgICAgICBUeXBlZFBvaW50ZXIgcmVnID0gYWRk cmVzc0ZvcihtX25vZGUtPm9yaWdpbi5zZW1hbnRpYy5zdGFja09mZnNldCgpICsgSlNTdGFjazo6 QXJndW1lbnRDb3VudCk7Ci0gICAgICAgIHNldEludDMyKG1fb3V0LmFkZChtX291dC5sb2FkMzJO b25OZWdhdGl2ZShyZWcpLCBtX291dC5jb25zdEludDMyKC0xKSkpOworICAgICAgICBDb2RlT3Jp Z2luIGNvZGVMb2NhdGlvbiA9IG1fbm9kZS0+b3JpZ2luLnNlbWFudGljOworICAgICAgICBpZiAo IWlzRW1wdHlTcGVjdWxhdGlvbigKKyAgICAgICAgICAgIG1fc3RhdGUudmFyaWFibGVzKCkub3Bl cmFuZCgKKyAgICAgICAgICAgICAgICBtX2dyYXBoLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG1fbm9k ZS0+b3JpZ2luLnNlbWFudGljKSkubV90eXBlKSkgeworICAgICAgICAgICAgVmlydHVhbFJlZ2lz dGVyIGFyZ3NSZWcgPSBtX2dyYXBoLm1hY2hpbmVBcmd1bWVudHNSZWdpc3RlckZvcihjb2RlTG9j YXRpb24pOworICAgICAgICAgICAgc3BlY3VsYXRlKEFyZ3VtZW50c0VzY2FwZWQsIG5vVmFsdWUo KSwgMCwgbV9vdXQubm90WmVybzY0KG1fb3V0LmxvYWQ2NChhZGRyZXNzRm9yKGFyZ3NSZWcpKSkp OworICAgICAgICB9CisKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNvZGVMb2NhdGlvbi5pbmxp bmVDYWxsRnJhbWUpOworICAgICAgICBzZXRJbnQzMihtX291dC5hZGQobV9vdXQubG9hZDMyTm9u TmVnYXRpdmUocGF5bG9hZEZvcihKU1N0YWNrOjpBcmd1bWVudENvdW50KSksIG1fb3V0LmNvbnN0 SW50MzIoLTEpKSk7CiAgICAgfQogCiAgICAgdm9pZCBjb21waWxlR2V0QXJyYXlMZW5ndGgoKQo=