221129 2021-01-29 06:30:13 -0800 Flaky JSC test: stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default 2021-03-02 18:04:22 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build PC Linux RESOLVED FIXED https://bugzilla.redhat.com/show_bug.cgi?id=1917837 InRadar P2 Normal --- 1 mcatanzaro mcatanzaro ews-watchlist fpizlo keith_miller mark.lam mcatanzaro msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1723689 0 mcatanzaro 2021-01-29 06:30:13 -0800 JSC stress test is flaky on Red Hat's internal CI (which runs with JIT disabled and cloop enabled). The first known failure was Dec 13. I didn't report it until now because until earlier this week, all the failures occurred on ppc64le, so I incorrectly assumed the issue was specific to that architecture. But the test has since failed on both s390x and x86_64 as well, so it's a more general problem. Unfortunately, the error message is pretty generic: Running stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default: Exception: JavaScript execution terminated. stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default: ERROR: Unexpected exit code: 1 FAIL: stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default I don't know what to make of "JavaScript execution terminated," but it's this same error on all architectures. Based on the failure history, it might be due to some change that landed in trunk during early December: Dec 13: failed on ppc64le Jan 5: failed on ppc64le Jan 8: failed on ppc64le Jan 19: failed on ppc64le Jan 26: failed on s390x Jan 29: failed on s390x and x86_64 1726043 1 webkit-bug-importer 2021-02-05 06:31:14 -0800 <rdar://problem/74023276> 1727042 2 419715 mcatanzaro 2021-02-09 08:02:52 -0800 Created attachment 419715 Patch 1727043 3 mcatanzaro 2021-02-09 08:06:08 -0800 (In reply to Michael Catanzaro from comment #0) > Based on the failure history, it might be due to some change that landed in > trunk during early December: > > Dec 13: failed on ppc64le > Jan 5: failed on ppc64le > Jan 8: failed on ppc64le > Jan 19: failed on ppc64le > Jan 26: failed on s390x > Jan 29: failed on s390x and x86_64 Feb 2: failed on s390x Feb 6: failed on x86_64 1729932 4 mcatanzaro 2021-02-16 14:16:35 -0800 Sadly this is going to be very difficult to track down. I am currently running this test in a continuous loop on (a) my desktop, and (b) the s390x server that we use for our internal CI (since it seems to fail more often on this server than it does for x86_64). Sadly the test passes every time. Since it is a timing issue, I bet it only fails when the tests are run all at once instead of one at a time. I was hoping to bisect it, but it doesn't fail often enough for it to be practical to bisect in this way. 1734841 5 mcatanzaro 2021-03-02 07:40:07 -0800 This test is still flaky on all architectures: Feb 13: failed on ppc64le Feb 14: failed on s390x Feb 15: failed on s390x Feb 19: failed on ppc64le Feb 20: failed on aarch64 March 1: failed on ppc64le 1734842 6 419715 mcatanzaro 2021-03-02 07:41:28 -0800 Comment on attachment 419715 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419715&action=review > JSTests/stress/shared-array-buffer-sort-while-different-thread-is-modifying.js:3 > +//@ skip > //@ runDefault("--watchdog=1000", "--watchdog-exception-ok") > +// FIXME: unskip this test when https://bugs.webkit.org/show_bug.cgi?id=221129 is fixed. Can we land this...? 1734936 7 ysuzuki 2021-03-02 11:12:22 -0800 @Michael Thanks. Could you paste the crash trace of the failure? 1734951 8 mcatanzaro 2021-03-02 11:41:51 -0800 Unfortunately I don't think it's crashing because the process exit status is 1. If there was a crash, the exit status would be (128 + signal value). So we don't have much to go on other than the stdout/stderr in comment #0. 1735067 9 ysuzuki 2021-03-02 15:29:25 -0800 OK, "JavaScript execution terminated" this sounds like this is not a real bug. Possibly, the thread is terminated, and we are not properly handling that case in jsc shell...? 1735106 10 422016 ysuzuki 2021-03-02 16:15:06 -0800 Created attachment 422016 Patch 1735111 11 422019 ysuzuki 2021-03-02 16:16:48 -0800 Created attachment 422019 Patch 1735130 12 422019 mcatanzaro 2021-03-02 16:44:34 -0800 Comment on attachment 422019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422019&action=review Thanks Yusuke! > Source/JavaScriptCore/jsc.cpp:416 > + CommandLine(CommandLineForWorkersTag); This could use: explicit 1735146 13 422019 ysuzuki 2021-03-02 17:56:38 -0800 Comment on attachment 422019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422019&action=review Thanks! >> Source/JavaScriptCore/jsc.cpp:416 >> + CommandLine(CommandLineForWorkersTag); > > This could use: explicit Fixed. 1735151 14 ysuzuki 2021-03-02 18:04:22 -0800 Committed r273779 (234776@main): <https://commits.webkit.org/234776@main> 419715 2021-02-09 08:02:52 -0800 2021-03-02 16:15:04 -0800 Patch bug-221129-20210209100251.patch text/plain 1586 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNTc5CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxv ZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZkMzVkZTRhZDQ5YmRlMjExNGM3Zjc1OGQyYzkx OWRhMGJkMTg1NDkuLjdhZTViM2JmZjJmYWM4ZTE3OWM5Zjk5MTJmMDQ5OTJhY2U0MzgxM2YgMTAw NjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMjEtMDItMDkgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bn bm9tZS5vcmc+CisKKyAgICAgICAgRmxha3kgSlNDIHRlc3Q6IHN0cmVzcy9zaGFyZWQtYXJyYXkt YnVmZmVyLXNvcnQtd2hpbGUtZGlmZmVyZW50LXRocmVhZC1pcy1tb2RpZnlpbmcuanMuZGVmYXVs dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMTI5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDAyMzI3Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHRlc3QgaXMgZmxha3kgb24gYXQgbGVh c3QgdGhyZWUgZGlmZmVyZW50IGFyY2hpdGVjdHVyZXMsIHNvIHNraXAgaXQgZXZlcnl3aGVyZSB1 bnRpbAorICAgICAgICBmaXhlZC4KKworICAgICAgICAqIHN0cmVzcy9zaGFyZWQtYXJyYXktYnVm ZmVyLXNvcnQtd2hpbGUtZGlmZmVyZW50LXRocmVhZC1pcy1tb2RpZnlpbmcuanM6CisKIDIwMjEt MDItMDYgIEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAg IFJFR1JFU1NJT04gKHIyNjQ1NzQpOiBVbmNoZWNrZWQgSlMgZXhjZXB0aW9uIGluIHZhbGlkYXRl QW5kQXBwbHlQcm9wZXJ0eURlc2NyaXB0b3IoKQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mv c2hhcmVkLWFycmF5LWJ1ZmZlci1zb3J0LXdoaWxlLWRpZmZlcmVudC10aHJlYWQtaXMtbW9kaWZ5 aW5nLmpzIGIvSlNUZXN0cy9zdHJlc3Mvc2hhcmVkLWFycmF5LWJ1ZmZlci1zb3J0LXdoaWxlLWRp ZmZlcmVudC10aHJlYWQtaXMtbW9kaWZ5aW5nLmpzCmluZGV4IDg2MjczMWJhZWVkMTU4NmU0NmM1 YjIzOTlmYTA1MjhhYzllYjAwMDUuLjg0YWM4Y2UzYzc3OGQ3YmZlOGVlZWZmYTU2OWMyOTc4MWE5 MmFjMDEgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL3NoYXJlZC1hcnJheS1idWZmZXItc29y dC13aGlsZS1kaWZmZXJlbnQtdGhyZWFkLWlzLW1vZGlmeWluZy5qcworKysgYi9KU1Rlc3RzL3N0 cmVzcy9zaGFyZWQtYXJyYXktYnVmZmVyLXNvcnQtd2hpbGUtZGlmZmVyZW50LXRocmVhZC1pcy1t b2RpZnlpbmcuanMKQEAgLTEsNCArMSw2IEBACisvL0Agc2tpcAogLy9AIHJ1bkRlZmF1bHQoIi0t d2F0Y2hkb2c9MTAwMCIsICItLXdhdGNoZG9nLWV4Y2VwdGlvbi1vayIpCisvLyBGSVhNRTogdW5z a2lwIHRoaXMgdGVzdCB3aGVuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjExMjkgaXMgZml4ZWQuCiAKICQyNjIuYWdlbnQud2FpdFVudGlsID0gZnVuY3Rpb24odHlw ZWRBcnJheSwgaW5kZXgsIGV4cGVjdGVkKSB7CiAgIHZhciBhZ2VudHMgPSAwOwo= 422016 2021-03-02 16:15:06 -0800 2021-03-02 16:29:56 -0800 Patch bug-221129-20210302161505.patch text/plain 3066 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzI1ZmNiNjA3YTczNGE2NjA5MTFkOTE5ODlkZTMyMDZiN2Y3NWZiLi44Y2E0ZTc5OTAyOTEzMDkx ZDdmMjZjNzdkNzJjNTU5MWQzNmM2N2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMS0wMy0wMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIEZsYWt5IEpTQyB0ZXN0OiBzdHJlc3Mvc2hhcmVkLWFycmF5LWJ1ZmZlci1z b3J0LXdoaWxlLWRpZmZlcmVudC10aHJlYWQtaXMtbW9kaWZ5aW5nLmpzLmRlZmF1bHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTEyOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZp eCBmb3IgSlNDIHNoZWxsJ3MgdGVybWluYXRpb24gaGFuZGxpbmcgY2hhbmdlLgorCisgICAgICAg ICoganNjLmNwcDoKKyAgICAgICAgKENvbW1hbmRMaW5lOjpDb21tYW5kTGluZSk6CisgICAgICAg IChqc2NtYWluKToKKwogMjAyMS0wMy0wMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5j b20+CiAKICAgICAgICAgQWxsb3cgSURMIGBEYXRlYCB0byBiZSBwYXJzZWQgZnJvbSBhIHN0cmlu ZyBpbiBhZGRpdGlvbiB0byBhIG51bWJlciBhbmQgYWN0dWFsIEpTIGBEYXRlYApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv anNjLmNwcAppbmRleCA0ZTUyNDA1ZjY5NWNlODhkMmRiY2I0MzVjNGIwMDJjZjcwOGYwNTJhLi5k MDYyMWExZjFiN2VlNzcyZTVmOGJmZjkxYTdkOGQ1ODQxMDAzYTJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvanNj LmNwcApAQCAtNDEzLDkgKzQxMyw3IEBAIGNsYXNzIENvbW1hbmRMaW5lIHsKICAgICB9CiAKICAg ICBlbnVtIENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZyB7IENvbW1hbmRMaW5lRm9yV29ya2VycyB9 OwotICAgIENvbW1hbmRMaW5lKENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZykKLSAgICB7Ci0gICAg fQorICAgIENvbW1hbmRMaW5lKENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZyk7CiAKICAgICBWZWN0 b3I8U2NyaXB0PiBtX3NjcmlwdHM7CiAgICAgVmVjdG9yPFN0cmluZz4gbV9hcmd1bWVudHM7CkBA IC00MzYsNiArNDM0LDcgQEAgY2xhc3MgQ29tbWFuZExpbmUgewogCiAgICAgdm9pZCBwYXJzZUFy Z3VtZW50cyhpbnQsIGNoYXIqKik7CiB9Oworc3RhdGljIExhenlOZXZlckRlc3Ryb3llZDxDb21t YW5kTGluZT4gbWFpbkNvbW1hbmRMaW5lOwogCiBzdGF0aWMgY29uc3QgY2hhciBpbnRlcmFjdGl2 ZVByb21wdFtdID0gIj4+PiAiOwogCkBAIC0zMzgxLDYgKzMzODAsMTEgQEAgdm9pZCBDb21tYW5k TGluZTo6cGFyc2VBcmd1bWVudHMoaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICBqc2NF eGl0KEVYSVRfU1VDQ0VTUyk7CiB9CiAKK0NvbW1hbmRMaW5lOjpDb21tYW5kTGluZShDb21tYW5k TGluZUZvcldvcmtlcnNUYWcpCisgICAgOiBtX3RyZWF0V2F0Y2hkb2dFeGNlcHRpb25Bc1N1Y2Nl c3MobWFpbkNvbW1hbmRMaW5lLT5tX3RyZWF0V2F0Y2hkb2dFeGNlcHRpb25Bc1N1Y2Nlc3MpCit7 Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmM+CiBpbnQgcnVuSlNDKGNvbnN0IENvbW1hbmRM aW5lJiBvcHRpb25zLCBib29sIGlzV29ya2VyLCBjb25zdCBGdW5jJiBmdW5jKQogewpAQCAtMzUw Miw3ICszNTA2LDcgQEAgaW50IGpzY21haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogCiAgICAg Ly8gTm90ZSB0aGF0IHRoZSBvcHRpb25zIHBhcnNpbmcgY2FuIGFmZmVjdCBWTSBjcmVhdGlvbiwg YW5kIHRodXMKICAgICAvLyBjb21lcyBmaXJzdC4KLSAgICBDb21tYW5kTGluZSBvcHRpb25zKGFy Z2MsIGFyZ3YpOworICAgIG1haW5Db21tYW5kTGluZS5jb25zdHJ1Y3QoYXJnYywgYXJndik7CiAK ICAgICB7CiAgICAgICAgIE9wdGlvbnM6OkFsbG93VW5maW5hbGl6ZWRBY2Nlc3NTY29wZSBzY29w ZTsKQEAgLTM1NzQsMTggKzM1NzgsMTggQEAgaW50IGpzY21haW4oaW50IGFyZ2MsIGNoYXIqKiBh cmd2KQogI2VuZGlmCiAKICAgICBpbnQgcmVzdWx0ID0gcnVuSlNDKAotICAgICAgICBvcHRpb25z LCBmYWxzZSwKKyAgICAgICAgbWFpbkNvbW1hbmRMaW5lLmdldCgpLCBmYWxzZSwKICAgICAgICAg WyZdIChWTSYgdm0sIEdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBib29sJiBzdWNjZXNzKSB7 CiAgICAgICAgICAgICBVTlVTRURfUEFSQU0odm0pOwogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg ICAgICAgICAgdm0uc2V0T25FYWNoTWljcm90YXNrVGljayhXVEZNb3ZlKG9uRWFjaE1pY3JvdGFz a1RpY2spKTsKICNlbmRpZgotICAgICAgICAgICAgcnVuV2l0aE9wdGlvbnMoZ2xvYmFsT2JqZWN0 LCBvcHRpb25zLCBzdWNjZXNzKTsKKyAgICAgICAgICAgIHJ1bldpdGhPcHRpb25zKGdsb2JhbE9i amVjdCwgbWFpbkNvbW1hbmRMaW5lLmdldCgpLCBzdWNjZXNzKTsKICAgICAgICAgfSk7CiAKICAg ICBwcmludFN1cGVyU2FtcGxlclN0YXRlKCk7CiAKLSAgICBpZiAob3B0aW9ucy5tX2R1bXBNZW1v cnlGb290cHJpbnQpIHsKKyAgICBpZiAobWFpbkNvbW1hbmRMaW5lLT5tX2R1bXBNZW1vcnlGb290 cHJpbnQpIHsKICAgICAgICAgTWVtb3J5Rm9vdHByaW50IGZvb3RwcmludCA9IE1lbW9yeUZvb3Rw cmludDo6bm93KCk7CiAKICAgICAgICAgcHJpbnRmKCJNZW1vcnkgRm9vdHByaW50OlxuICAgIEN1 cnJlbnQgRm9vdHByaW50OiAlIiBQUkl1NjQgIlxuICAgIFBlYWsgRm9vdHByaW50OiAlIiBQUkl1 NjQgIlxuIiwgZm9vdHByaW50LmN1cnJlbnQsIGZvb3RwcmludC5wZWFrKTsK 422019 2021-03-02 16:16:48 -0800 2021-03-02 16:38:05 -0800 Patch bug-221129-20210302161647.patch text/plain 3257 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzI1ZmNiNjA3YTczNGE2NjA5MTFkOTE5ODlkZTMyMDZiN2Y3NWZiLi44Y2E0ZTc5OTAyOTEzMDkx ZDdmMjZjNzdkNzJjNTU5MWQzNmM2N2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMS0wMy0wMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIEZsYWt5IEpTQyB0ZXN0OiBzdHJlc3Mvc2hhcmVkLWFycmF5LWJ1ZmZlci1z b3J0LXdoaWxlLWRpZmZlcmVudC10aHJlYWQtaXMtbW9kaWZ5aW5nLmpzLmRlZmF1bHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTEyOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZp eCBmb3IgSlNDIHNoZWxsJ3MgdGVybWluYXRpb24gaGFuZGxpbmcgY2hhbmdlLgorCisgICAgICAg ICoganNjLmNwcDoKKyAgICAgICAgKENvbW1hbmRMaW5lOjpDb21tYW5kTGluZSk6CisgICAgICAg IChqc2NtYWluKToKKwogMjAyMS0wMy0wMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5j b20+CiAKICAgICAgICAgQWxsb3cgSURMIGBEYXRlYCB0byBiZSBwYXJzZWQgZnJvbSBhIHN0cmlu ZyBpbiBhZGRpdGlvbiB0byBhIG51bWJlciBhbmQgYWN0dWFsIEpTIGBEYXRlYApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv anNjLmNwcAppbmRleCA0ZTUyNDA1ZjY5NWNlODhkMmRiY2I0MzVjNGIwMDJjZjcwOGYwNTJhLi4z YWIyM2NmODUwNGQ5YjhlZDIyM2Q3NTZmZTdlZDEzY2U2MzZjMmUyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvanNj LmNwcApAQCAtNDEzLDkgKzQxMyw3IEBAIGNsYXNzIENvbW1hbmRMaW5lIHsKICAgICB9CiAKICAg ICBlbnVtIENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZyB7IENvbW1hbmRMaW5lRm9yV29ya2VycyB9 OwotICAgIENvbW1hbmRMaW5lKENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZykKLSAgICB7Ci0gICAg fQorICAgIENvbW1hbmRMaW5lKENvbW1hbmRMaW5lRm9yV29ya2Vyc1RhZyk7CiAKICAgICBWZWN0 b3I8U2NyaXB0PiBtX3NjcmlwdHM7CiAgICAgVmVjdG9yPFN0cmluZz4gbV9hcmd1bWVudHM7CkBA IC00MzYsNiArNDM0LDcgQEAgY2xhc3MgQ29tbWFuZExpbmUgewogCiAgICAgdm9pZCBwYXJzZUFy Z3VtZW50cyhpbnQsIGNoYXIqKik7CiB9Oworc3RhdGljIExhenlOZXZlckRlc3Ryb3llZDxDb21t YW5kTGluZT4gbWFpbkNvbW1hbmRMaW5lOwogCiBzdGF0aWMgY29uc3QgY2hhciBpbnRlcmFjdGl2 ZVByb21wdFtdID0gIj4+PiAiOwogCkBAIC0zMzgxLDYgKzMzODAsMTEgQEAgdm9pZCBDb21tYW5k TGluZTo6cGFyc2VBcmd1bWVudHMoaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICBqc2NF eGl0KEVYSVRfU1VDQ0VTUyk7CiB9CiAKK0NvbW1hbmRMaW5lOjpDb21tYW5kTGluZShDb21tYW5k TGluZUZvcldvcmtlcnNUYWcpCisgICAgOiBtX3RyZWF0V2F0Y2hkb2dFeGNlcHRpb25Bc1N1Y2Nl c3MobWFpbkNvbW1hbmRMaW5lLT5tX3RyZWF0V2F0Y2hkb2dFeGNlcHRpb25Bc1N1Y2Nlc3MpCit7 Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmM+CiBpbnQgcnVuSlNDKGNvbnN0IENvbW1hbmRM aW5lJiBvcHRpb25zLCBib29sIGlzV29ya2VyLCBjb25zdCBGdW5jJiBmdW5jKQogewpAQCAtMzUw MiwxMiArMzUwNiwxMiBAQCBpbnQganNjbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAKICAg ICAvLyBOb3RlIHRoYXQgdGhlIG9wdGlvbnMgcGFyc2luZyBjYW4gYWZmZWN0IFZNIGNyZWF0aW9u LCBhbmQgdGh1cwogICAgIC8vIGNvbWVzIGZpcnN0LgotICAgIENvbW1hbmRMaW5lIG9wdGlvbnMo YXJnYywgYXJndik7CisgICAgbWFpbkNvbW1hbmRMaW5lLmNvbnN0cnVjdChhcmdjLCBhcmd2KTsK IAogICAgIHsKICAgICAgICAgT3B0aW9uczo6QWxsb3dVbmZpbmFsaXplZEFjY2Vzc1Njb3BlIHNj b3BlOwogICAgICAgICBwcm9jZXNzQ29uZmlnRmlsZShPcHRpb25zOjpjb25maWdGaWxlKCksICJq c2MiKTsKLSAgICAgICAgaWYgKG9wdGlvbnMubV9kdW1wKQorICAgICAgICBpZiAobWFpbkNvbW1h bmRMaW5lLT5tX2R1bXApCiAgICAgICAgICAgICBPcHRpb25zOjpkdW1wR2VuZXJhdGVkQnl0ZWNv ZGVzKCkgPSB0cnVlOwogICAgIH0KIApAQCAtMzU3NCwxOCArMzU3OCwxOCBAQCBpbnQganNjbWFp bihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAjZW5kaWYKIAogICAgIGludCByZXN1bHQgPSBydW5K U0MoCi0gICAgICAgIG9wdGlvbnMsIGZhbHNlLAorICAgICAgICBtYWluQ29tbWFuZExpbmUuZ2V0 KCksIGZhbHNlLAogICAgICAgICBbJl0gKFZNJiB2bSwgR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmpl Y3QsIGJvb2wmIHN1Y2Nlc3MpIHsKICAgICAgICAgICAgIFVOVVNFRF9QQVJBTSh2bSk7CiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgICAgICAgICB2bS5zZXRPbkVhY2hNaWNyb3Rhc2tUaWNrKFdU Rk1vdmUob25FYWNoTWljcm90YXNrVGljaykpOwogI2VuZGlmCi0gICAgICAgICAgICBydW5XaXRo T3B0aW9ucyhnbG9iYWxPYmplY3QsIG9wdGlvbnMsIHN1Y2Nlc3MpOworICAgICAgICAgICAgcnVu V2l0aE9wdGlvbnMoZ2xvYmFsT2JqZWN0LCBtYWluQ29tbWFuZExpbmUuZ2V0KCksIHN1Y2Nlc3Mp OwogICAgICAgICB9KTsKIAogICAgIHByaW50U3VwZXJTYW1wbGVyU3RhdGUoKTsKIAotICAgIGlm IChvcHRpb25zLm1fZHVtcE1lbW9yeUZvb3RwcmludCkgeworICAgIGlmIChtYWluQ29tbWFuZExp bmUtPm1fZHVtcE1lbW9yeUZvb3RwcmludCkgewogICAgICAgICBNZW1vcnlGb290cHJpbnQgZm9v dHByaW50ID0gTWVtb3J5Rm9vdHByaW50Ojpub3coKTsKIAogICAgICAgICBwcmludGYoIk1lbW9y eSBGb290cHJpbnQ6XG4gICAgQ3VycmVudCBGb290cHJpbnQ6ICUiIFBSSXU2NCAiXG4gICAgUGVh ayBGb290cHJpbnQ6ICUiIFBSSXU2NCAiXG4iLCBmb290cHJpbnQuY3VycmVudCwgZm9vdHByaW50 LnBlYWspOwo=