151359 2015-11-17 14:27:40 -0800 [JSC] TailCalls should not trigger assertion failures when running with the jsc profiler on. 2015-11-18 16:01:35 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 150812 1 keith_miller keith_miller benjamin commit-queue ggaren mark.lam msaboff saam oldest_to_newest 1142664 0 keith_miller 2015-11-17 14:27:40 -0800 [JSC] TailCalls should not trigger assertion failures when running with the jsc profiler on. 1142677 1 265710 keith_miller 2015-11-17 15:01:32 -0800 Created attachment 265710 Patch 1142678 2 commit-queue 2015-11-17 15:04:11 -0800 Attachment 265710 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4046: One line control clauses should not use braces. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4048: One line control clauses should not use braces. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4068: One line control clauses should not use braces. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4070: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1142703 3 265710 ggaren 2015-11-17 16:10:40 -0800 Comment on attachment 265710 Patch r=me 1143052 4 keith_miller 2015-11-18 16:01:35 -0800 Committed r192596: <http://trac.webkit.org/changeset/192596> 265710 2015-11-17 15:01:32 -0800 2015-11-17 16:10:40 -0800 Patch bug-151359-20151117150122.patch text/plain 14525 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx M2UzZjJmOTRmYmRlZjJhNGQ4MDlmNDZkYWIxNzA1OGRkYmVjOTUyLi5mNTliZmZmOGIzN2MzYjM5 YTU0NTIxOTNiYjgyMTIyYWMzODMzMmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxNS0xMS0xNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBbSlNDXSBUYWlsQ2FsbHMgc2hvdWxkIG5vdCB0cmlnZ2VyIGFzc2Vy dGlvbiBmYWlsdXJlcyB3aGVuIHJ1bm5pbmcgd2l0aCB0aGUganNjIHByb2ZpbGVyIG9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzU5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgd2UgaGF2ZSB0 aGUgcHJvZmlsZXIgb24gd2hlbiBwYXJzaW5nIHRhaWwgY2FsbHMgaW4gdGhlIGRmZyB3ZSB3b3Vs ZCBlbWl0IGEgQ291bnRFeGVjdXRpb25zIG5vZGUKKyAgICAgICAgZm9sbG93aW5nIGEgVGFpbENh bGwgbm9kZSBhcyBvdXIgYnl0ZWNvZGUgZm9yIHRhaWwgY2FsbHMgYWx3YXlzIGVtaXRzIGEgb3Bf cmV0IGZvbGxvd2luZyBhbiBvcF90YWlsX2NhbGwuCisgICAgICAgIFRoaXMgdHJpcHMgYXNzZXJ0 aW9ucyB0aGF0IG5vIG5vZGVzIGZvbGxvdyBhIHRlcm1pbmFsIGluIGEgYmFzaWMgYmxvY2suIFRo aXMgcGF0Y2ggZml4ZXMgdGhpcyBpc3N1ZSBieQorICAgICAgICBub3QgZW1pdGluZyBhIENvdW50 RXhlY3V0aW9ucyB3aGVuIHdlIGhhdmUgYSB0YWlsIGNhbGwgdGhhdCBpcyB0ZXJtaW5hbCBpLmUu IHRoZSB0YWlsIGNhbGxlciBpcyBub3QKKyAgICAgICAgaW5saW5lZCBpbnRvIGFub3RoZXIgZnVu Y3Rpb24gb3IgdGhlIHRhaWwgY2FsbGVyIGlzIGlubGluZWQgYnV0IGlzIGluIHRhaWwgcG9zaXRp b24gaXRzZWxmLgorCisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6aGFuZGxlQ2FsbCk6CisgICAgICAgIChKU0M6 OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OmhhbmRsZVZhcmFyZ3NDYWxsKToKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisgICAgICAgICogdGVzdHMvc3RyZXNz L3RhaWwtY2FsbC1wcm9maWxlci5qczogQWRkZWQuCisgICAgICAgICh0YWlsKToKKyAgICAgICAg KGlubGluZVRhaWwpOgorICAgICAgICAoaW5saW5lVGFpbFZhckFyZ3MpOgorICAgICAgICAoaW5s aW5lVGFpbFRlcm5hcnkpOgorICAgICAgICAoYm9keSk6CisKIDIwMTUtMTEtMTcgIEFuZHJlYXMg S2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEpTUHJvcGVydHlOYW1l RW51bWVyYXRvciBjb3VsZCBiZSBkZXN0cnVjdG9ybGVzcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKaW5kZXggY2EwNDM1ZWM3M2M0OWVlZTU4 NzcxNjA4NTAzMDZkYjgyYTMyNzNmMi4uZjA5MmVmNjgyYzE1OTg4YjA4ZjI2ZmVhYjU2MmY4Njdl NDRiNDZlMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBh cnNlci5jcHAKQEAgLTE3NiwxOCArMTc2LDE5IEBAIHByaXZhdGU6CiAgICAgLy8gSGVscGVyIGZv ciBtaW4gYW5kIG1heC4KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGVja3NGdW5jdG9yPgogICAg IGJvb2wgaGFuZGxlTWluTWF4KGludCByZXN1bHRPcGVyYW5kLCBOb2RlVHlwZSBvcCwgaW50IHJl Z2lzdGVyT2Zmc2V0LCBpbnQgYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMsIGNvbnN0IENoZWNr c0Z1bmN0b3ImIGluc2VydENoZWNrcyk7Ci0gICAgCisKICAgICAvLyBIYW5kbGUgY2FsbHMuIFRo aXMgcmVzb2x2ZXMgaXNzdWVzIHN1cnJvdW5kaW5nIGlubGluaW5nIGFuZCBpbnRyaW5zaWNzLgot ICAgIHZvaWQgaGFuZGxlQ2FsbCgKKyAgICBlbnVtIFRlcm1pbmFsaXR5IHsgVGVybWluYWwsIE5v blRlcm1pbmFsIH07CisgICAgVGVybWluYWxpdHkgaGFuZGxlQ2FsbCgKICAgICAgICAgaW50IHJl c3VsdCwgTm9kZVR5cGUgb3AsIElubGluZUNhbGxGcmFtZTo6S2luZCwgdW5zaWduZWQgaW5zdHJ1 Y3Rpb25TaXplLAogICAgICAgICBOb2RlKiBjYWxsVGFyZ2V0LCBpbnQgYXJnQ291bnQsIGludCBy ZWdpc3Rlck9mZnNldCwgQ2FsbExpbmtTdGF0dXMsCiAgICAgICAgIFNwZWN1bGF0ZWRUeXBlIHBy ZWRpY3Rpb24pOwotICAgIHZvaWQgaGFuZGxlQ2FsbCgKKyAgICBUZXJtaW5hbGl0eSBoYW5kbGVD YWxsKAogICAgICAgICBpbnQgcmVzdWx0LCBOb2RlVHlwZSBvcCwgQ2FsbE1vZGUsIHVuc2lnbmVk IGluc3RydWN0aW9uU2l6ZSwKICAgICAgICAgTm9kZSogY2FsbFRhcmdldCwgaW50IGFyZ0NvdW50 LCBpbnQgcmVnaXN0ZXJPZmZzZXQsIENhbGxMaW5rU3RhdHVzKTsKLSAgICB2b2lkIGhhbmRsZUNh bGwoaW50IHJlc3VsdCwgTm9kZVR5cGUgb3AsIENhbGxNb2RlLCB1bnNpZ25lZCBpbnN0cnVjdGlv blNpemUsIGludCBjYWxsZWUsIGludCBhcmdDb3VudCwgaW50IHJlZ2lzdGVyT2Zmc2V0KTsKLSAg ICB2b2lkIGhhbmRsZUNhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2RlVHlwZSBvcCwgQ2FsbE1vZGUp OwotICAgIHZvaWQgaGFuZGxlVmFyYXJnc0NhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2RlVHlwZSBv cCwgQ2FsbE1vZGUpOworICAgIFRlcm1pbmFsaXR5IGhhbmRsZUNhbGwoaW50IHJlc3VsdCwgTm9k ZVR5cGUgb3AsIENhbGxNb2RlLCB1bnNpZ25lZCBpbnN0cnVjdGlvblNpemUsIGludCBjYWxsZWUs IGludCBhcmdDb3VudCwgaW50IHJlZ2lzdGVyT2Zmc2V0KTsKKyAgICBUZXJtaW5hbGl0eSBoYW5k bGVDYWxsKEluc3RydWN0aW9uKiBwYywgTm9kZVR5cGUgb3AsIENhbGxNb2RlKTsKKyAgICBUZXJt aW5hbGl0eSBoYW5kbGVWYXJhcmdzQ2FsbChJbnN0cnVjdGlvbiogcGMsIE5vZGVUeXBlIG9wLCBD YWxsTW9kZSk7CiAgICAgdm9pZCBlbWl0RnVuY3Rpb25DaGVja3MoQ2FsbFZhcmlhbnQsIE5vZGUq IGNhbGxUYXJnZXQsIFZpcnR1YWxSZWdpc3RlciB0aGlzQXJndW1udCk7CiAgICAgdm9pZCBlbWl0 QXJndW1lbnRQaGFudG9tcyhpbnQgcmVnaXN0ZXJPZmZzZXQsIGludCBhcmd1bWVudENvdW50SW5j bHVkaW5nVGhpcyk7CiAgICAgdW5zaWduZWQgaW5saW5pbmdDb3N0KENhbGxWYXJpYW50LCBpbnQg YXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMsIENhbGxNb2RlKTsgLy8gUmV0dXJuIFVJTlRfTUFY IGlmIGl0J3Mgbm90IGFuIGlubGluaW5nIGNhbmRpZGF0ZS4gQnkgY29udmVudGlvbiwgaW50cmlu c2ljcyBoYXZlIGEgY29zdCBvZiAxLgpAQCAtMTEzMSwxNiArMTEzMiwxNiBAQCBwcml2YXRlOgog ICAgIG1fZXhpdE9LID0gZmFsc2U7IFwKICAgICByZXR1cm4gc2hvdWxkQ29udGludWVQYXJzaW5n CiAKLXZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2Rl VHlwZSBvcCwgQ2FsbE1vZGUgY2FsbE1vZGUpCitCeXRlQ29kZVBhcnNlcjo6VGVybWluYWxpdHkg Qnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2RlVHlwZSBvcCwg Q2FsbE1vZGUgY2FsbE1vZGUpCiB7CiAgICAgQVNTRVJUKE9QQ09ERV9MRU5HVEgob3BfY2FsbCkg PT0gT1BDT0RFX0xFTkdUSChvcF9jb25zdHJ1Y3QpKTsKICAgICBBU1NFUlQoT1BDT0RFX0xFTkdU SChvcF9jYWxsKSA9PSBPUENPREVfTEVOR1RIKG9wX3RhaWxfY2FsbCkpOwotICAgIGhhbmRsZUNh bGwoCisgICAgcmV0dXJuIGhhbmRsZUNhbGwoCiAgICAgICAgIHBjWzFdLnUub3BlcmFuZCwgb3As IGNhbGxNb2RlLCBPUENPREVfTEVOR1RIKG9wX2NhbGwpLAogICAgICAgICBwY1syXS51Lm9wZXJh bmQsIHBjWzNdLnUub3BlcmFuZCwgLXBjWzRdLnUub3BlcmFuZCk7CiB9CiAKLXZvaWQgQnl0ZUNv ZGVQYXJzZXI6OmhhbmRsZUNhbGwoCitCeXRlQ29kZVBhcnNlcjo6VGVybWluYWxpdHkgQnl0ZUNv ZGVQYXJzZXI6OmhhbmRsZUNhbGwoCiAgICAgaW50IHJlc3VsdCwgTm9kZVR5cGUgb3AsIENhbGxN b2RlIGNhbGxNb2RlLCB1bnNpZ25lZCBpbnN0cnVjdGlvblNpemUsCiAgICAgaW50IGNhbGxlZSwg aW50IGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzLCBpbnQgcmVnaXN0ZXJPZmZzZXQpCiB7CkBA IC0xMTUwLDIyICsxMTUxLDIyIEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwoCiAg ICAgICAgIG1faW5saW5lU3RhY2tUb3AtPm1fcHJvZmlsZWRCbG9jaywgY3VycmVudENvZGVPcmln aW4oKSwKICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9jYWxsTGlua0luZm9zLCBtX2NhbGxD b250ZXh0TWFwKTsKICAgICAKLSAgICBoYW5kbGVDYWxsKAorICAgIHJldHVybiBoYW5kbGVDYWxs KAogICAgICAgICByZXN1bHQsIG9wLCBjYWxsTW9kZSwgaW5zdHJ1Y3Rpb25TaXplLCBjYWxsVGFy Z2V0LAogICAgICAgICBhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcywgcmVnaXN0ZXJPZmZzZXQs IGNhbGxMaW5rU3RhdHVzKTsKIH0KICAgICAKLXZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNh bGwoCitCeXRlQ29kZVBhcnNlcjo6VGVybWluYWxpdHkgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNh bGwoCiAgICAgaW50IHJlc3VsdCwgTm9kZVR5cGUgb3AsIENhbGxNb2RlIGNhbGxNb2RlLCB1bnNp Z25lZCBpbnN0cnVjdGlvblNpemUsCiAgICAgTm9kZSogY2FsbFRhcmdldCwgaW50IGFyZ3VtZW50 Q291bnRJbmNsdWRpbmdUaGlzLCBpbnQgcmVnaXN0ZXJPZmZzZXQsCiAgICAgQ2FsbExpbmtTdGF0 dXMgY2FsbExpbmtTdGF0dXMpCiB7Ci0gICAgaGFuZGxlQ2FsbCgKKyAgICByZXR1cm4gaGFuZGxl Q2FsbCgKICAgICAgICAgcmVzdWx0LCBvcCwgSW5saW5lQ2FsbEZyYW1lOjpraW5kRm9yKGNhbGxN b2RlKSwgaW5zdHJ1Y3Rpb25TaXplLCBjYWxsVGFyZ2V0LCBhcmd1bWVudENvdW50SW5jbHVkaW5n VGhpcywKICAgICAgICAgcmVnaXN0ZXJPZmZzZXQsIGNhbGxMaW5rU3RhdHVzLCBnZXRQcmVkaWN0 aW9uKCkpOwogfQogCi12b2lkIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVDYWxsKAorQnl0ZUNvZGVQ YXJzZXI6OlRlcm1pbmFsaXR5IEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVDYWxsKAogICAgIGludCBy ZXN1bHQsIE5vZGVUeXBlIG9wLCBJbmxpbmVDYWxsRnJhbWU6OktpbmQga2luZCwgdW5zaWduZWQg aW5zdHJ1Y3Rpb25TaXplLAogICAgIE5vZGUqIGNhbGxUYXJnZXQsIGludCBhcmd1bWVudENvdW50 SW5jbHVkaW5nVGhpcywgaW50IHJlZ2lzdGVyT2Zmc2V0LAogICAgIENhbGxMaW5rU3RhdHVzIGNh bGxMaW5rU3RhdHVzLCBTcGVjdWxhdGVkVHlwZSBwcmVkaWN0aW9uKQpAQCAtMTE4Miw4ICsxMTgz LDExIEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwoCiAgICAgICAgIC8vIE9kZGx5 LCB0aGlzIGNvbmZsYXRlcyBjYWxscyB0aGF0IGhhdmVuJ3QgZXhlY3V0ZWQgd2l0aCBjYWxscyB0 aGF0IGJlaGF2ZWQgc3VmZmljaWVudGx5IHBvbHltb3JwaGljYWxseQogICAgICAgICAvLyB0aGF0 IHdlIGNhbm5vdCBvcHRpbWl6ZSB0aGVtLgogCi0gICAgICAgIGFkZENhbGwocmVzdWx0LCBvcCwg T3BJbmZvKCksIGNhbGxUYXJnZXQsIGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzLCByZWdpc3Rl ck9mZnNldCwgcHJlZGljdGlvbik7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgTm9kZSogY2Fs bE5vZGUgPSBhZGRDYWxsKHJlc3VsdCwgb3AsIE9wSW5mbygpLCBjYWxsVGFyZ2V0LCBhcmd1bWVu dENvdW50SW5jbHVkaW5nVGhpcywgcmVnaXN0ZXJPZmZzZXQsIHByZWRpY3Rpb24pOworICAgICAg ICBpZiAoY2FsbE5vZGUtPm9wKCkgPT0gVGFpbENhbGwpCisgICAgICAgICAgICByZXR1cm4gVGVy bWluYWw7CisgICAgICAgIEFTU0VSVChjYWxsTm9kZS0+b3AoKSAhPSBUYWlsQ2FsbFZhcmFyZ3Mp OworICAgICAgICByZXR1cm4gTm9uVGVybWluYWw7CiAgICAgfQogICAgIAogICAgIHVuc2lnbmVk IG5leHRPZmZzZXQgPSBtX2N1cnJlbnRJbmRleCArIGluc3RydWN0aW9uU2l6ZTsKQEAgLTExOTMs MTMgKzExOTcsMTcgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlQ2FsbCgKICAgICBpZiAo aGFuZGxlSW5saW5pbmcoY2FsbFRhcmdldCwgcmVzdWx0LCBjYWxsTGlua1N0YXR1cywgcmVnaXN0 ZXJPZmZzZXQsIHZpcnR1YWxSZWdpc3RlckZvckFyZ3VtZW50KDAsIHJlZ2lzdGVyT2Zmc2V0KSwg VmlydHVhbFJlZ2lzdGVyKCksIDAsIGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzLCBuZXh0T2Zm c2V0LCBvcCwga2luZCwgcHJlZGljdGlvbikpIHsKICAgICAgICAgaWYgKG1fZ3JhcGguY29tcGls YXRpb24oKSkKICAgICAgICAgICAgIG1fZ3JhcGguY29tcGlsYXRpb24oKS0+bm90aWNlSW5saW5l ZENhbGwoKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gTm9uVGVybWluYWw7CiAg ICAgfQogICAgIAotICAgIGFkZENhbGwocmVzdWx0LCBvcCwgY2FsbE9wSW5mbywgY2FsbFRhcmdl dCwgYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMsIHJlZ2lzdGVyT2Zmc2V0LCBwcmVkaWN0aW9u KTsKKyAgICBOb2RlKiBjYWxsTm9kZSA9IGFkZENhbGwocmVzdWx0LCBvcCwgY2FsbE9wSW5mbywg Y2FsbFRhcmdldCwgYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMsIHJlZ2lzdGVyT2Zmc2V0LCBw cmVkaWN0aW9uKTsKKyAgICBpZiAoY2FsbE5vZGUtPm9wKCkgPT0gVGFpbENhbGwpCisgICAgICAg IHJldHVybiBUZXJtaW5hbDsKKyAgICBBU1NFUlQoY2FsbE5vZGUtPm9wKCkgIT0gVGFpbENhbGxW YXJhcmdzKTsKKyAgICByZXR1cm4gTm9uVGVybWluYWw7CiB9CiAKLXZvaWQgQnl0ZUNvZGVQYXJz ZXI6OmhhbmRsZVZhcmFyZ3NDYWxsKEluc3RydWN0aW9uKiBwYywgTm9kZVR5cGUgb3AsIENhbGxN b2RlIGNhbGxNb2RlKQorQnl0ZUNvZGVQYXJzZXI6OlRlcm1pbmFsaXR5IEJ5dGVDb2RlUGFyc2Vy OjpoYW5kbGVWYXJhcmdzQ2FsbChJbnN0cnVjdGlvbiogcGMsIE5vZGVUeXBlIG9wLCBDYWxsTW9k ZSBjYWxsTW9kZSkKIHsKICAgICBBU1NFUlQoT1BDT0RFX0xFTkdUSChvcF9jYWxsX3ZhcmFyZ3Mp ID09IE9QQ09ERV9MRU5HVEgob3BfY29uc3RydWN0X3ZhcmFyZ3MpKTsKICAgICBBU1NFUlQoT1BD T0RFX0xFTkdUSChvcF9jYWxsX3ZhcmFyZ3MpID09IE9QQ09ERV9MRU5HVEgob3BfdGFpbF9jYWxs X3ZhcmFyZ3MpKTsKQEAgLTEyMjgsNyArMTIzNiw3IEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6Omhh bmRsZVZhcmFyZ3NDYWxsKEluc3RydWN0aW9uKiBwYywgTm9kZVR5cGUgb3AsIENhbGxNb2RlIGNh CiAgICAgICAgICYmIGhhbmRsZUlubGluaW5nKGNhbGxUYXJnZXQsIHJlc3VsdCwgY2FsbExpbmtT dGF0dXMsIGZpcnN0RnJlZVJlZywgVmlydHVhbFJlZ2lzdGVyKHRoaXNSZWcpLCBWaXJ0dWFsUmVn aXN0ZXIoYXJndW1lbnRzKSwgZmlyc3RWYXJBcmdPZmZzZXQsIDAsIG1fY3VycmVudEluZGV4ICsg T1BDT0RFX0xFTkdUSChvcF9jYWxsX3ZhcmFyZ3MpLCBvcCwgSW5saW5lQ2FsbEZyYW1lOjp2YXJh cmdzS2luZEZvcihjYWxsTW9kZSksIHByZWRpY3Rpb24pKSB7CiAgICAgICAgIGlmIChtX2dyYXBo LmNvbXBpbGF0aW9uKCkpCiAgICAgICAgICAgICBtX2dyYXBoLmNvbXBpbGF0aW9uKCktPm5vdGlj ZUlubGluZWRDYWxsKCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIE5vblRlcm1p bmFsOwogICAgIH0KICAgICAKICAgICBDYWxsVmFyYXJnc0RhdGEqIGRhdGEgPSBtX2dyYXBoLm1f Y2FsbFZhcmFyZ3NEYXRhLmFkZCgpOwpAQCAtMTIzOSw3ICsxMjQ3LDcgQEAgdm9pZCBCeXRlQ29k ZVBhcnNlcjo6aGFuZGxlVmFyYXJnc0NhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2RlVHlwZSBvcCwg Q2FsbE1vZGUgY2EKICAgICBpZiAob3AgPT0gVGFpbENhbGxWYXJhcmdzKSB7CiAgICAgICAgIGlm IChhbGxJbmxpbmVGcmFtZXNBcmVUYWlsQ2FsbHMoKSkgewogICAgICAgICAgICAgYWRkVG9HcmFw aChvcCwgT3BJbmZvKGRhdGEpLCBPcEluZm8oKSwgY2FsbFRhcmdldCwgZ2V0KFZpcnR1YWxSZWdp c3Rlcihhcmd1bWVudHMpKSwgdGhpc0NoaWxkKTsKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIHJldHVybiBUZXJtaW5hbDsKICAgICAgICAgfQogICAgICAgICBvcCA9IFRhaWxDYWxs VmFyYXJnc0lubGluZWRDYWxsZXI7CiAgICAgfQpAQCAtMTI0OCw2ICsxMjU2LDcgQEAgdm9pZCBC eXRlQ29kZVBhcnNlcjo6aGFuZGxlVmFyYXJnc0NhbGwoSW5zdHJ1Y3Rpb24qIHBjLCBOb2RlVHlw ZSBvcCwgQ2FsbE1vZGUgY2EKICAgICBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0UmVnKHJlc3VsdCk7 CiAgICAgaWYgKHJlc3VsdFJlZy5pc1ZhbGlkKCkpCiAgICAgICAgIHNldChyZXN1bHRSZWcsIGNh bGwpOworICAgIHJldHVybiBOb25UZXJtaW5hbDsKIH0KIAogdm9pZCBCeXRlQ29kZVBhcnNlcjo6 ZW1pdEZ1bmN0aW9uQ2hlY2tzKENhbGxWYXJpYW50IGNhbGxlZSwgTm9kZSogY2FsbFRhcmdldCwg VmlydHVhbFJlZ2lzdGVyIHRoaXNBcmd1bWVudFJlZykKQEAgLTMxODAsOSArMzE4OSw4IEBAIGJv b2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQgbGltaXQpCiAgICAgICAgICAg ICAvLyB0byBiZSB0cnVlLgogICAgICAgICAgICAgLy8gV2UgYWxzbyBkb24ndCBpbnNlcnQgYSBq dW1wIGlmIHRoZSBibG9jayBhbHJlYWR5IGhhcyBhIHRlcm1pbmFsLAogICAgICAgICAgICAgLy8g d2hpY2ggY291bGQgaGFwcGVuIGFmdGVyIGEgdGFpbCBjYWxsLgotICAgICAgICAgICAgQVNTRVJU KG1fY3VycmVudEJsb2NrLT5pc0VtcHR5KCkgfHwgIW1fY3VycmVudEJsb2NrLT50ZXJtaW5hbCgp Ci0gICAgICAgICAgICAgICAgfHwgbV9jdXJyZW50QmxvY2stPnRlcm1pbmFsKCktPm9wKCkgPT0g VGFpbENhbGwgfHwgbV9jdXJyZW50QmxvY2stPnRlcm1pbmFsKCktPm9wKCkgPT0gVGFpbENhbGxW YXJhcmdzKTsKLSAgICAgICAgICAgIGlmICghbV9jdXJyZW50QmxvY2stPmlzRW1wdHkoKSAmJiAh bV9jdXJyZW50QmxvY2stPnRlcm1pbmFsKCkpCisgICAgICAgICAgICBBU1NFUlQobV9jdXJyZW50 QmxvY2stPmlzRW1wdHkoKSB8fCAhbV9jdXJyZW50QmxvY2stPnRlcm1pbmFsKCkpOworICAgICAg ICAgICAgaWYgKCFtX2N1cnJlbnRCbG9jay0+aXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIGFk ZFRvR3JhcGgoSnVtcCwgT3BJbmZvKG1fY3VycmVudEluZGV4KSk7CiAgICAgICAgICAgICByZXR1 cm4gc2hvdWxkQ29udGludWVQYXJzaW5nOwogICAgICAgICB9CkBAIC0zNzk2LDEyICszODA0LDcg QEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZCBsaW1pdCkKICAgICAg ICAgLy8gPT09IEJsb2NrIHRlcm1pbmF0b3JzLiA9PT0KIAogICAgICAgICBjYXNlIG9wX2ptcDog ewotICAgICAgICAgICAgaWYgKG1fY3VycmVudEJsb2NrLT50ZXJtaW5hbCgpKSB7Ci0gICAgICAg ICAgICAgICAgLy8gV2UgY291bGQgYmUgdGhlIGR1bW15IGp1bXAgdG8gYSByZXR1cm4gYWZ0ZXIg YSBub24taW5saW5lZCwgbm9uLWVtdWxhdGVkIHRhaWwgY2FsbCBpbiBhIHRlcm5hcnkgb3BlcmF0 b3IKLSAgICAgICAgICAgICAgICBOb2RlKiB0ZXJtaW5hbCA9IG1fY3VycmVudEJsb2NrLT50ZXJt aW5hbCgpOwotICAgICAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQodGVybWluYWwsIHRlcm1pbmFs LT5vcCgpID09IFRhaWxDYWxsIHx8IHRlcm1pbmFsLT5vcCgpID09IFRhaWxDYWxsVmFyYXJncyk7 Ci0gICAgICAgICAgICAgICAgTEFTVF9PUENPREUob3Bfam1wKTsKLSAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIEFTU0VSVCghbV9jdXJyZW50QmxvY2stPnRlcm1pbmFsKCkpOwogICAgICAgICAg ICAgaW50IHJlbGF0aXZlT2Zmc2V0ID0gY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZDsK ICAgICAgICAgICAgIGFkZFRvR3JhcGgoSnVtcCwgT3BJbmZvKG1fY3VycmVudEluZGV4ICsgcmVs YXRpdmVPZmZzZXQpKTsKICAgICAgICAgICAgIGlmIChyZWxhdGl2ZU9mZnNldCA8PSAwKQpAQCAt Mzk3MywxMiArMzk3Niw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWdu ZWQgbGltaXQpCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIG9wX3JldDoKLSAgICAgICAgICAg IGlmIChtX2N1cnJlbnRCbG9jay0+dGVybWluYWwoKSkgewotICAgICAgICAgICAgICAgIC8vIFdl IGNvdWxkIGJlIHRoZSBkdW1teSByZXR1cm4gYWZ0ZXIgYSBub24taW5saW5lZCwgbm9uLWVtdWxh dGVkIHRhaWwgY2FsbAotICAgICAgICAgICAgICAgIE5vZGUqIHRlcm1pbmFsID0gbV9jdXJyZW50 QmxvY2stPnRlcm1pbmFsKCk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUX1VOVVNFRCh0ZXJtaW5h bCwgdGVybWluYWwtPm9wKCkgPT0gVGFpbENhbGwgfHwgdGVybWluYWwtPm9wKCkgPT0gVGFpbENh bGxWYXJhcmdzKTsKLSAgICAgICAgICAgICAgICBMQVNUX09QQ09ERShvcF9yZXQpOwotICAgICAg ICAgICAgfQorICAgICAgICAgICAgQVNTRVJUKCFtX2N1cnJlbnRCbG9jay0+dGVybWluYWwoKSk7 CiAgICAgICAgICAgICBpZiAoaW5saW5lQ2FsbEZyYW1lKCkpIHsKICAgICAgICAgICAgICAgICBm bHVzaEZvclJldHVybigpOwogICAgICAgICAgICAgICAgIGlmIChtX2lubGluZVN0YWNrVG9wLT5t X3JldHVyblZhbHVlLmlzVmFsaWQoKSkKQEAgLTQwMzEsMTggKzQwMjksMjQgQEAgYm9vbCBCeXRl Q29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZCBsaW1pdCkKICAgICAgICAgICAgIAogICAg ICAgICBjYXNlIG9wX2NhbGw6CiAgICAgICAgICAgICBoYW5kbGVDYWxsKGN1cnJlbnRJbnN0cnVj dGlvbiwgQ2FsbCwgQ2FsbE1vZGU6OlJlZ3VsYXIpOwotICAgICAgICAgICAgLy8gVmVyaWZ5IHRo YXQgaGFuZGxlQ2FsbCgpLCB3aGljaCBjb3VsZCBoYXZlIGlubGluZWQgdGhlIGNhbGxlZSwgZGlk bid0IHRyYXNoIG1fY3VycmVudEluc3RydWN0aW9uCisgICAgICAgICAgICAvLyBWZXJpZnkgdGhh dCBoYW5kbGVDYWxsKCksIHdoaWNoIGNvdWxkIGhhdmUgaW5saW5lZCB0aGUgY2FsbGVlLCBkaWRu J3QgdHJhc2ggbV9jdXJyZW50SW5zdHJ1Y3Rpb24uCiAgICAgICAgICAgICBBU1NFUlQobV9jdXJy ZW50SW5zdHJ1Y3Rpb24gPT0gY3VycmVudEluc3RydWN0aW9uKTsKICAgICAgICAgICAgIE5FWFRf T1BDT0RFKG9wX2NhbGwpOwogCi0gICAgICAgIGNhc2Ugb3BfdGFpbF9jYWxsOgorICAgICAgICBj YXNlIG9wX3RhaWxfY2FsbDogewogICAgICAgICAgICAgZmx1c2hGb3JSZXR1cm4oKTsKLSAgICAg ICAgICAgIGhhbmRsZUNhbGwoY3VycmVudEluc3RydWN0aW9uLCBUYWlsQ2FsbCwgQ2FsbE1vZGU6 OlRhaWwpOwotICAgICAgICAgICAgLy8gVmVyaWZ5IHRoYXQgaGFuZGxlQ2FsbCgpLCB3aGljaCBj b3VsZCBoYXZlIGlubGluZWQgdGhlIGNhbGxlZSwgZGlkbid0IHRyYXNoIG1fY3VycmVudEluc3Ry dWN0aW9uCisgICAgICAgICAgICBUZXJtaW5hbGl0eSB0ZXJtaW5hbGl0eSA9IGhhbmRsZUNhbGwo Y3VycmVudEluc3RydWN0aW9uLCBUYWlsQ2FsbCwgQ2FsbE1vZGU6OlRhaWwpOworICAgICAgICAg ICAgLy8gVmVyaWZ5IHRoYXQgaGFuZGxlQ2FsbCgpLCB3aGljaCBjb3VsZCBoYXZlIGlubGluZWQg dGhlIGNhbGxlZSwgZGlkbid0IHRyYXNoIG1fY3VycmVudEluc3RydWN0aW9uLgogICAgICAgICAg ICAgQVNTRVJUKG1fY3VycmVudEluc3RydWN0aW9uID09IGN1cnJlbnRJbnN0cnVjdGlvbik7Ci0g ICAgICAgICAgICAvLyBXZSBsZXQgdGhlIGZvbGxvd2luZyBvcF9yZXQgaGFuZGxlIGNhc2VzIHJl bGF0ZWQgdG8KLSAgICAgICAgICAgIC8vIGlubGluaW5nIHRvIGtlZXAgdGhpbmdzIHNpbXBsZS4K LSAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3RhaWxfY2FsbCk7CisgICAgICAgICAgICAvLyBJ ZiB0aGUgY2FsbCBpcyB0ZXJtaW5hbCB0aGVuIHdlIHNob3VsZCBub3QgcGFyc2UgYW55IGZ1cnRo ZXIgYnl0ZWNvZGVzIGFzIHRoZSBUYWlsQ2FsbCB3aWxsIGV4aXQgdGhlIGZ1bmN0aW9uLgorICAg ICAgICAgICAgLy8gSWYgdGhlIGNhbGwgaXMgbm90IHRlcm1pbmFsLCBob3dldmVyLCB0aGVuIHdl IHdhbnQgdGhlIHN1YnNlcXVlbnQgb3BfcmV0L29wX2p1bXB0IHRvIHVwZGF0ZSBtZXRhZGF0YSBh bmQgY2xlYW4KKyAgICAgICAgICAgIC8vIHRoaW5ncyB1cC4KKyAgICAgICAgICAgIGlmICh0ZXJt aW5hbGl0eSA9PSBOb25UZXJtaW5hbCkgeworICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9w X3RhaWxfY2FsbCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIExBU1Rf T1BDT0RFKG9wX3RhaWxfY2FsbCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KIAogICAgICAg ICBjYXNlIG9wX2NvbnN0cnVjdDoKICAgICAgICAgICAgIGhhbmRsZUNhbGwoY3VycmVudEluc3Ry dWN0aW9uLCBDb25zdHJ1Y3QsIENhbGxNb2RlOjpDb25zdHJ1Y3QpOwpAQCAtNDA1NSw4ICs0MDU5 LDE1IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQgbGltaXQpCiAK ICAgICAgICAgY2FzZSBvcF90YWlsX2NhbGxfdmFyYXJnczogewogICAgICAgICAgICAgZmx1c2hG b3JSZXR1cm4oKTsKLSAgICAgICAgICAgIGhhbmRsZVZhcmFyZ3NDYWxsKGN1cnJlbnRJbnN0cnVj dGlvbiwgVGFpbENhbGxWYXJhcmdzLCBDYWxsTW9kZTo6VGFpbCk7Ci0gICAgICAgICAgICBORVhU X09QQ09ERShvcF90YWlsX2NhbGxfdmFyYXJncyk7CisgICAgICAgICAgICBUZXJtaW5hbGl0eSB0 ZXJtaW5hbGl0eSA9IGhhbmRsZVZhcmFyZ3NDYWxsKGN1cnJlbnRJbnN0cnVjdGlvbiwgVGFpbENh bGxWYXJhcmdzLCBDYWxsTW9kZTo6VGFpbCk7CisgICAgICAgICAgICAvLyBJZiB0aGUgY2FsbCBp cyB0ZXJtaW5hbCB0aGVuIHdlIHNob3VsZCBub3QgcGFyc2UgYW55IGZ1cnRoZXIgYnl0ZWNvZGVz IGFzIHRoZSBUYWlsQ2FsbCB3aWxsIGV4aXQgdGhlIGZ1bmN0aW9uLgorICAgICAgICAgICAgLy8g SWYgdGhlIGNhbGwgaXMgbm90IHRlcm1pbmFsLCBob3dldmVyLCB0aGVuIHdlIHdhbnQgdGhlIHN1 YnNlcXVlbnQgb3BfcmV0L29wX2p1bXB0IHRvIHVwZGF0ZSBtZXRhZGF0YSBhbmQgY2xlYW4KKyAg ICAgICAgICAgIC8vIHRoaW5ncyB1cC4KKyAgICAgICAgICAgIGlmICh0ZXJtaW5hbGl0eSA9PSBO b25UZXJtaW5hbCkgeworICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3RhaWxfY2FsbF92 YXJhcmdzKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgTEFTVF9PUENP REUob3BfdGFpbF9jYWxsX3ZhcmFyZ3MpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAg ICAgICAgICAKICAgICAgICAgY2FzZSBvcF9jb25zdHJ1Y3RfdmFyYXJnczogewpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy90YWlsLWNhbGwtcHJvZmlsZXIu anMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3RhaWwtY2FsbC1wcm9maWxl ci5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi41NzMzNzA3YTVhOWIyOWFjYTQxNTA2YmNiMzRhN2Y2YWRkNWQ1MWU5 Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy90 YWlsLWNhbGwtcHJvZmlsZXIuanMKQEAgLTAsMCArMSwyOSBAQAorLy9AIHJ1blByb2ZpbGVyCisv LyBUaGlzIHRlc3RzIHRoZSBwcm9maWxlciBERkcgbm9kZSwgQ291bnRFeGVjdXRpb24sIHBsYXlz IG5pY2VseSB3aXRoIFRhaWxDYWxscy4KKworInVzZSBzdHJpY3QiOworCitmdW5jdGlvbiB0YWls KGEpIHsgcmV0dXJuIDE7IH0KK25vSW5saW5lKHRhaWwpOworCitmdW5jdGlvbiBpbmxpbmVUYWls KGEpIHsKKyAgICByZXR1cm4gdGFpbChhKTsKK30KKworZnVuY3Rpb24gaW5saW5lVGFpbFZhckFy Z3MoYSkgeworICAgIHJldHVybiB0YWlsKC4uLlthXSkKK30KKworZnVuY3Rpb24gaW5saW5lVGFp bFRlcm5hcnkoYSkgeworICAgIHJldHVybiB0cnVlID8gdGFpbChhKSA6IG51bGw7Cit9CisKK2Z1 bmN0aW9uIGJvZHkoKSB7CisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDsgaSsrKSB7Cisg ICAgICAgIGlubGluZVRhaWwoMSk7CisgICAgICAgIGlubGluZVRhaWxWYXJBcmdzKDEpOworICAg ICAgICBpbmxpbmVUYWlsVGVybmFyeSgxKQorICAgIH0KK30KKworYm9keSgpOwo=