165882 2016-12-14 17:03:25 -0800 DirectTailCall implementation needs to tell the shuffler what to put into the ArgumentCount explicitly 2017-01-03 14:21:00 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo benjamin cdumez cmarcelo commit-queue dbates keith_miller mark.lam msaboff rniwa saam oldest_to_newest 1259972 0 fpizlo 2016-12-14 17:03:25 -0800 Patch forthcoming. 1259975 1 297147 fpizlo 2016-12-14 17:09:39 -0800 Created attachment 297147 the patch 1259979 2 297147 mark.lam 2016-12-14 17:23:48 -0800 Comment on attachment 297147 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=297147&action=review LGTM. > Source/WTF/wtf/Platform.h:893 > -#if (CPU(X86) || CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS))) && ENABLE(JIT) && OS(DARWIN) && !defined(NDEBUG) > +#if (CPU(X86) || CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS))) && ENABLE(JIT) && OS(DARWIN) I presume this was not deliberate but leftover from a debugging session? If so, please undo. 1259980 3 fpizlo 2016-12-14 17:24:39 -0800 (In reply to comment #2) > Comment on attachment 297147 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=297147&action=review > > LGTM. > > > Source/WTF/wtf/Platform.h:893 > > -#if (CPU(X86) || CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS))) && ENABLE(JIT) && OS(DARWIN) && !defined(NDEBUG) > > +#if (CPU(X86) || CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS))) && ENABLE(JIT) && OS(DARWIN) > > I presume this was not deliberate but leftover from a debugging session? If > so, please undo. Will do! 1259981 4 fpizlo 2016-12-14 17:26:12 -0800 Landed in https://trac.webkit.org/changeset/209846 1263542 5 ap 2017-01-03 14:21:00 -0800 *** Bug 166642 has been marked as a duplicate of this bug. *** 297147 2016-12-14 17:09:39 -0800 2016-12-14 17:23:48 -0800 the patch blah.patch text/plain 10152 fpizlo SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDk4NDQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE2LTEyLTE0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5j b20+CisKKyAgICAgICAgRGlyZWN0VGFpbENhbGwgaW1wbGVtZW50YXRpb24gbmVlZHMgdG8gdGVs bCB0aGUgc2h1ZmZsZXIgd2hhdCB0byBwdXQgaW50byB0aGUgQXJndW1lbnRDb3VudCBleHBsaWNp dGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU4 ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0 cmVzcy9kaXJlY3QtdGFpbC1jYWxsLWFyaXR5LW1pc21hdGNoLWNvdW50LWFyZ3MuanM6IEFkZGVk LgorICAgICAgICAoZm9vKToKKyAgICAgICAgKGJhcik6CisKIDIwMTYtMTItMTQgIEtlaXRoIE1p bGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViQXNzZW1ibHkgSlMg QVBJOiBpbXBsZW1lbnQgR2xvYmFsCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9kaXJlY3QtdGFpbC1j YWxsLWFyaXR5LW1pc21hdGNoLWNvdW50LWFyZ3MuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9z dHJlc3MvZGlyZWN0LXRhaWwtY2FsbC1hcml0eS1taXNtYXRjaC1jb3VudC1hcmdzLmpzCShub25l eGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2RpcmVjdC10YWlsLWNhbGwtYXJpdHktbWlzbWF0 Y2gtY291bnQtYXJncy5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDIwIEBACisidXNlIHN0 cmljdCI7CisKK2Z1bmN0aW9uIGZvbyhhLCBiLCBjLCBkLCBlLCBmKSB7CisgICAgcmV0dXJuIGFy Z3VtZW50cy5sZW5ndGg7Cit9CisKK25vSW5saW5lKGZvbyk7CisKK2Z1bmN0aW9uIGJhcigpIHsK KyAgICByZXR1cm4gZm9vKDEsIDIsIDMpOworfQorCitub0lubGluZShiYXIpOworCitmb3IgKHZh ciBpID0gMDsgaSA8IDEwMDAwOyArK2kpIHsKKyAgICB2YXIgcmVzdWx0ID0gYmFyKCk7CisgICAg aWYgKHJlc3VsdCAhPSAzKQorICAgICAgICB0aHJvdyAiRXJyb3I6IGJhZCByZXN1bHQ6ICIgKyBy ZXN1bHQ7Cit9CisKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5ODQ0 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDMzIEBACisyMDE2LTEyLTE0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CisKKyAgICAgICAgRGlyZWN0VGFpbENhbGwgaW1wbGVtZW50YXRpb24gbmVlZHMgdG8gdGVsbCB0 aGUgc2h1ZmZsZXIgd2hhdCB0byBwdXQgaW50byB0aGUgQXJndW1lbnRDb3VudCBleHBsaWNpdGx5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU4ODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAg IFRoZSBDYWxsRnJhbWVTaHVmZmxlciB3YXMgYXNzdW1pbmcgdGhhdCB0aGUgQXJndW1lbnRDb3Vu dCB0aGF0IGl0IHNob3VsZCBzdG9yZSBpbnRvIHRoZQorICAgICAgICBjYWxsZWUgZnJhbWUgaXMg c2ltcGx5IHRoZSBzaXplIG9mIHRoZSBhcmdzIHZlY3Rvci4KKyAgICAgICAgCisgICAgICAgIFRo YXQncyBub3QgdHJ1ZSBmb3IgRGlyZWN0VGFpbENhbGwsIHdoaWNoIHdpbGwgcGFkIHRoZSBhcmdz IHZlY3RvciB3aXRoIHVuZGVmaW5lZCBpZiB3ZQorICAgICAgICBhcmUgb3B0aW1pemluZyBhbiBh cml0eSBtaXNtYXRjaC4gV2UgbmVlZCB0byBwYXNzIHRoZSBBcmd1bWVudENvdW50IGV4cGxpY2l0 bHkgaW4gdGhpcworICAgICAgICBjYXNlLgorCisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZl SklUMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Q2Fs bCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlND OjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbCk6CisgICAgICAgICogZnRsL0ZUTExvd2Vy REZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBp bGVEaXJlY3RDYWxsT3JDb25zdHJ1Y3QpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJE RkdUb0IzOjpjb21waWxlVGFpbENhbGwpOgorICAgICAgICAqIGppdC9DYWxsRnJhbWVTaHVmZmxl RGF0YS5oOgorICAgICAgICAqIGppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHA6CisgICAgICAgIChK U0M6OkNhbGxGcmFtZVNodWZmbGVyOjpDYWxsRnJhbWVTaHVmZmxlcik6CisgICAgICAgIChKU0M6 OkNhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlQW55KToKKyAgICAgICAgKiBqaXQvQ2FsbEZyYW1l U2h1ZmZsZXIuaDoKKyAgICAgICAgKEpTQzo6Q2FsbEZyYW1lU2h1ZmZsZXI6OnNuYXBzaG90KToK KyAgICAgICAgKiBqaXQvSklUQ2FsbC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZU9w Q2FsbCk6CisKIDIwMTYtMTItMTQgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5j b20+CiAKICAgICAgICAgV2ViQXNzZW1ibHkgSlMgQVBJOiBpbXBsZW1lbnQgR2xvYmFsCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQz Ml82NC5jcHAJKHJldmlzaW9uIDIwOTc2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3OSw2ICs4Nzks NyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2RlKiBub2RlCiAgICAgICAgICAg ICBzaHVmZmxlRGF0YS5udW1Mb2NhbHMgPSBtX2ppdC5ncmFwaCgpLmZyYW1lUmVnaXN0ZXJDb3Vu dCgpOwogICAgICAgICAgICAgc2h1ZmZsZURhdGEuY2FsbGVlID0gVmFsdWVSZWNvdmVyeTo6aW5Q YWlyKGNhbGxlZVRhZ0dQUiwgY2FsbGVlUGF5bG9hZEdQUik7CiAgICAgICAgICAgICBzaHVmZmxl RGF0YS5hcmdzLnJlc2l6ZShudW1BbGxvY2F0ZWRBcmdzKTsKKyAgICAgICAgICAgIHNodWZmbGVE YXRhLm51bVBhc3NlZEFyZ3MgPSBudW1QYXNzZWRBcmdzOwogCiAgICAgICAgICAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgbnVtUGFzc2VkQXJnczsgKytpKSB7CiAgICAgICAgICAgICAgICAg RWRnZSBhcmdFZGdlID0gbV9qaXQuZ3JhcGgoKS52YXJBcmdDaGlsZChub2RlLCBpICsgMSk7Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2 NC5jcHAJKHJldmlzaW9uIDIwOTc2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1MSw3ICs4NTEsOCBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2RlKiBub2RlCiAgICAgICAgICAgICBzaHVm ZmxlRGF0YS5udW1Mb2NhbHMgPSBtX2ppdC5ncmFwaCgpLmZyYW1lUmVnaXN0ZXJDb3VudCgpOwog ICAgICAgICAgICAgc2h1ZmZsZURhdGEuY2FsbGVlID0gVmFsdWVSZWNvdmVyeTo6aW5HUFIoY2Fs bGVlR1BSLCBEYXRhRm9ybWF0SlMpOwogICAgICAgICAgICAgc2h1ZmZsZURhdGEuYXJncy5yZXNp emUobnVtQWxsb2NhdGVkQXJncyk7Ci0KKyAgICAgICAgICAgIHNodWZmbGVEYXRhLm51bVBhc3Nl ZEFyZ3MgPSBudW1QYXNzZWRBcmdzOworICAgICAgICAgICAgCiAgICAgICAgICAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgbnVtUGFzc2VkQXJnczsgKytpKSB7CiAgICAgICAgICAgICAgICAg RWRnZSBhcmdFZGdlID0gbV9qaXQuZ3JhcGgoKS52YXJBcmdDaGlsZChub2RlLCBpICsgMSk7CiAg ICAgICAgICAgICAgICAgR2VuZXJhdGlvbkluZm8mIGluZm8gPSBnZW5lcmF0aW9uSW5mbyhhcmdF ZGdlLm5vZGUoKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dl ckRGR1RvQjMuY3BwCShyZXZpc2lvbiAyMDk3NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5OTIsNiArNTk5Miw3 IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gbnVtUGFzc2VkQXJnczsgaSA8IG51bUFsbG9jYXRlZEFyZ3M7ICsr aSkKICAgICAgICAgICAgICAgICAgICAgICAgIHNodWZmbGVEYXRhLmFyZ3MuYXBwZW5kKFZhbHVl UmVjb3Zlcnk6OmNvbnN0YW50KGpzVW5kZWZpbmVkKCkpKTsKKyAgICAgICAgICAgICAgICAgICAg c2h1ZmZsZURhdGEubnVtUGFzc2VkQXJncyA9IG51bVBhc3NlZEFyZ3M7CiAgICAgICAgICAgICAg ICAgICAgIHNodWZmbGVEYXRhLnNldHVwQ2FsbGVlU2F2ZVJlZ2lzdGVycyhqaXQuY29kZUJsb2Nr KCkpOwogICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgQ2FsbExpbmtJ bmZvKiBjYWxsTGlua0luZm8gPSBqaXQuY29kZUJsb2NrKCktPmFkZENhbGxMaW5rSW5mbygpOwpA QCAtNjE1OCw2ICs2MTU5LDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbnVtQXJnczsgKytpKQogICAgICAgICAgICAgICAgICAgICBzaHVmZmxl RGF0YS5hcmdzLmFwcGVuZChwYXJhbXNbMSArIGldLnJlY292ZXJ5Rm9ySlNWYWx1ZSgpKTsKIAor ICAgICAgICAgICAgICAgIHNodWZmbGVEYXRhLm51bVBhc3NlZEFyZ3MgPSBudW1BcmdzOworICAg ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIHNodWZmbGVEYXRhLnNldHVwQ2FsbGVlU2F2 ZVJlZ2lzdGVycyhqaXQuY29kZUJsb2NrKCkpOwogCiAgICAgICAgICAgICAgICAgQ2FsbExpbmtJ bmZvKiBjYWxsTGlua0luZm8gPSBqaXQuY29kZUJsb2NrKCktPmFkZENhbGxMaW5rSW5mbygpOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DYWxsRnJhbWVTaHVmZmxlRGF0YS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1lU2h1ZmZsZURh dGEuaAkocmV2aXNpb24gMjA5NzY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DYWxs RnJhbWVTaHVmZmxlRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM1LDkgKzM1LDEwIEBAIG5hbWVzcGFj ZSBKU0Mgewogc3RydWN0IENhbGxGcmFtZVNodWZmbGVEYXRhIHsKICAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICB1bnNpZ25lZCBudW1Mb2NhbHM7CisgICAgdW5zaWdu ZWQgbnVtTG9jYWxzIHsgVUlOVF9NQVggfTsKICAgICBWYWx1ZVJlY292ZXJ5IGNhbGxlZTsKICAg ICBWZWN0b3I8VmFsdWVSZWNvdmVyeT4gYXJnczsKKyAgICB1bnNpZ25lZCBudW1QYXNzZWRBcmdz IHsgVUlOVF9NQVggfTsKICNpZiBVU0UoSlNWQUxVRTY0KQogICAgIFJlZ2lzdGVyTWFwPFZhbHVl UmVjb3Zlcnk+IHJlZ2lzdGVyczsKICAgICBHUFJSZWcgdGFnVHlwZU51bWJlciB7IEludmFsaWRH UFJSZWcgfTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1lU2h1ZmZs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1l U2h1ZmZsZXIuY3BwCShyZXZpc2lvbiAyMDk3NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aml0L0NhbGxGcmFtZVNodWZmbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00NCw2ICs0NCw3IEBAIENh bGxGcmFtZVNodWZmbGVyOjpDYWxsRnJhbWVTaHVmZmxlcihDQ2EKICAgICAgICAgKyByb3VuZEFy Z3VtZW50Q291bnRUb0FsaWduRnJhbWUoZGF0YS5hcmdzLnNpemUoKSkpCiAgICAgLCBtX2ZyYW1l RGVsdGEobV9hbGlnbmVkTmV3RnJhbWVTaXplIC0gbV9hbGlnbmVkT2xkRnJhbWVTaXplKQogICAg ICwgbV9sb2NrZWRSZWdpc3RlcnMoUmVnaXN0ZXJTZXQ6OmFsbFJlZ2lzdGVycygpKQorICAgICwg bV9udW1QYXNzZWRBcmdzKGRhdGEubnVtUGFzc2VkQXJncykKIHsKICAgICAvLyBXZSBhcmUgYWxs b3dlZCBhbGwgdGhlIHVzdWFsIHJlZ2lzdGVycy4uLgogICAgIGZvciAodW5zaWduZWQgaSA9IEdQ UkluZm86Om51bWJlck9mUmVnaXN0ZXJzOyBpLS07ICkKQEAgLTc0Niw3ICs3NDcsOCBAQCB2b2lk IENhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlQW55KCkKICAgICAgICAgZGF0YUxvZygiICAgKiBT dG9yaW5nIHRoZSBhcmd1bWVudCBjb3VudCBpbnRvICIsIFZpcnR1YWxSZWdpc3RlciB7IENhbGxG cmFtZVNsb3Q6OmFyZ3VtZW50Q291bnQgfSwgIlxuIik7CiAgICAgbV9qaXQuc3RvcmUzMihNYWNy b0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDApLAogICAgICAgICBhZGRyZXNzRm9yTmV3KFZpcnR1 YWxSZWdpc3RlciB7IENhbGxGcmFtZVNsb3Q6OmFyZ3VtZW50Q291bnQgfSkud2l0aE9mZnNldChU YWdPZmZzZXQpKTsKLSAgICBtX2ppdC5zdG9yZTMyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1t MzIoYXJnQ291bnQoKSksCisgICAgUkVMRUFTRV9BU1NFUlQobV9udW1QYXNzZWRBcmdzICE9IFVJ TlRfTUFYKTsKKyAgICBtX2ppdC5zdG9yZTMyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIo bV9udW1QYXNzZWRBcmdzKSwKICAgICAgICAgYWRkcmVzc0Zvck5ldyhWaXJ0dWFsUmVnaXN0ZXIg eyBDYWxsRnJhbWVTbG90Ojphcmd1bWVudENvdW50IH0pLndpdGhPZmZzZXQoUGF5bG9hZE9mZnNl dCkpOwogCiAgICAgaWYgKCFpc1Nsb3dQYXRoKCkpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvQ2FsbEZyYW1lU2h1ZmZsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0NhbGxGcmFtZVNodWZmbGVyLmgJKHJldmlzaW9uIDIwOTc2OCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1lU2h1ZmZsZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtMTAyLDYgKzEwMiw3IEBAIHB1YmxpYzoKIAogICAgICAgICBDYWxsRnJhbWVTaHVmZmxl RGF0YSBkYXRhOwogICAgICAgICBkYXRhLm51bUxvY2FscyA9IG51bUxvY2FscygpOworICAgICAg ICBkYXRhLm51bVBhc3NlZEFyZ3MgPSBtX251bVBhc3NlZEFyZ3M7CiAgICAgICAgIGRhdGEuY2Fs bGVlID0gZ2V0TmV3KFZpcnR1YWxSZWdpc3RlciB7IENhbGxGcmFtZVNsb3Q6OmNhbGxlZSB9KS0+ cmVjb3ZlcnkoKTsKICAgICAgICAgZGF0YS5hcmdzLnJlc2l6ZShhcmdDb3VudCgpKTsKICAgICAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmdDb3VudCgpOyArK2kpCkBAIC03OTQsNiArNzk1 LDggQEAgcHJpdmF0ZToKICAgICAvLyBJdCByZXR1cm5zIGZhbHNlIGlmIGl0IHdhcyB1bmFibGUg dG8gcGVyZm9ybSBzb21lIHNhZmUgd3JpdGVzCiAgICAgLy8gZHVlIHRvIGhpZ2ggcmVnaXN0ZXIg cHJlc3N1cmUuCiAgICAgYm9vbCBwZXJmb3JtU2FmZVdyaXRlcygpOworICAgIAorICAgIHVuc2ln bmVkIG1fbnVtUGFzc2VkQXJncyB7IFVJTlRfTUFYIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBK U0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkocmV2aXNpb24gMjA5 NzY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTk4LDYgKzE5OCw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BDYWxsKE9wY29kZUlE IG9wY29kZUkKIAogICAgIGlmIChvcGNvZGVJRCA9PSBvcF90YWlsX2NhbGwpIHsKICAgICAgICAg Q2FsbEZyYW1lU2h1ZmZsZURhdGEgc2h1ZmZsZURhdGE7CisgICAgICAgIHNodWZmbGVEYXRhLm51 bVBhc3NlZEFyZ3MgPSBpbnN0cnVjdGlvblszXS51Lm9wZXJhbmQ7CiAgICAgICAgIHNodWZmbGVE YXRhLnRhZ1R5cGVOdW1iZXIgPSBHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXI7CiAgICAg ICAgIHNodWZmbGVEYXRhLm51bUxvY2FscyA9CiAgICAgICAgICAgICBpbnN0cnVjdGlvbls0XS51 Lm9wZXJhbmQgLSBzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykgLyBzaXplb2YoUmVnaXN0ZXIpOwpJ bmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RG L3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAyMDk3NjgpCisrKyBTb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC04OTAsNyArODkwLDcgQEAKIAogLyogRW5hYmxlIHRo ZSBmb2xsb3dpbmcgaWYgeW91IHdhbnQgdG8gdXNlIHRoZSBNYWNyb0Fzc2VtYmxlcjo6cHJvYmUo KSBmYWNpbGl0eQogICAgdG8gZG8gSklUIGRlYnVnZ2luZy4gKi8KLSNpZiAoQ1BVKFg4NikgfHwg Q1BVKFg4Nl82NCkgfHwgQ1BVKEFSTTY0KSB8fCAoQ1BVKEFSTV9USFVNQjIpICYmIFBMQVRGT1JN KElPUykpKSAmJiBFTkFCTEUoSklUKSAmJiBPUyhEQVJXSU4pICYmICFkZWZpbmVkKE5ERUJVRykK KyNpZiAoQ1BVKFg4NikgfHwgQ1BVKFg4Nl82NCkgfHwgQ1BVKEFSTTY0KSB8fCAoQ1BVKEFSTV9U SFVNQjIpICYmIFBMQVRGT1JNKElPUykpKSAmJiBFTkFCTEUoSklUKSAmJiBPUyhEQVJXSU4pCiAj ZGVmaW5lIEVOQUJMRV9NQVNNX1BST0JFIDEKICNlbHNlCiAjZGVmaW5lIEVOQUJMRV9NQVNNX1BS T0JFIDAK