175358 2017-08-08 16:49:02 -0700 JSTests/stress/v8-deltablue-strict.js fails with JSC_validateExceptionChecks=1 2017-08-09 11:32:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Trivial --- 1 rmorisset webkit-unassigned buildbot commit-queue keith_miller mark.lam msaboff rmorisset saam webkit-bug-importer oldest_to_newest 1336766 0 rmorisset 2017-08-08 16:49:02 -0700 Exactly what the summary says. It comes from getPropertySlot and virtualForWithFunction. 1336773 1 317650 rmorisset 2017-08-08 16:55:20 -0700 Created attachment 317650 Simple bookkeeping fix in two places 1336774 2 rmorisset 2017-08-08 16:58:11 -0700 I was confused in my original comment (mixed it with another test case I was looking at). The problem came from putInlineForJSObject and virtualForWithFunction; not from getPropertySlot. 1336781 3 317650 saam 2017-08-08 17:07:54 -0700 Comment on attachment 317650 Simple bookkeeping fix in two places View in context: https://bugs.webkit.org/attachment.cgi?id=317650&action=review > Source/JavaScriptCore/jit/JITOperations.cpp:1064 > + ASSERT(throwScope.exception() || !error); Out of curiosity, why is the throwException below needed if we're just rethrowing the exception? Or is that not what's happening? 1336783 4 rmorisset 2017-08-08 17:15:34 -0700 I had not noticed that the exception being re thrown is the same that was already present. I will remove that re-throw as soon as I find a way to make the patch cleanly apply. 1336790 5 317650 mark.lam 2017-08-08 17:24:20 -0700 Comment on attachment 317650 Simple bookkeeping fix in two places View in context: https://bugs.webkit.org/attachment.cgi?id=317650&action=review >> Source/JavaScriptCore/jit/JITOperations.cpp:1064 >> + ASSERT(throwScope.exception() || !error); > > Out of curiosity, why is the throwException below needed if we're just rethrowing the exception? Or is that not what's happening? There's a better way to express this assertion. See the other examples of calls to functionExecutable->prepareForExecution() in this file above. 1336793 6 317650 mark.lam 2017-08-08 17:27:51 -0700 Comment on attachment 317650 Simple bookkeeping fix in two places View in context: https://bugs.webkit.org/attachment.cgi?id=317650&action=review >>> Source/JavaScriptCore/jit/JITOperations.cpp:1064 >>> + ASSERT(throwScope.exception() || !error); >> >> Out of curiosity, why is the throwException below needed if we're just rethrowing the exception? Or is that not what's happening? > > There's a better way to express this assertion. See the other examples of calls to functionExecutable->prepareForExecution() in this file above. And yes, it looks like the throwException below is actually not needed though it is harmless. You can remove it here (as well as at the other exception checks after calls to functionExecutable->prepareForExecution() above in this file. Thanks. 1336826 7 317665 rmorisset 2017-08-08 19:13:43 -0700 Created attachment 317665 Cleaned up patch, also avoids unnecessary re-throws 1336828 8 317665 saam 2017-08-08 19:30:09 -0700 Comment on attachment 317665 Cleaned up patch, also avoids unnecessary re-throws View in context: https://bugs.webkit.org/attachment.cgi?id=317665&action=review r=me > Source/JavaScriptCore/jit/JITOperations.cpp:1061 > + ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error)); Is this reinterpret_cast needed? 1337012 9 rmorisset 2017-08-09 09:56:42 -0700 I originally put this reinterpret cast to match the similar examples higher in the file. After looking at the C++ spec, I believe it is required: - Section 5.10 of the spec says that the operands of '==' have their type converted to their composite pointer type - I do not see anything in the notes at the start of Section 5 anything to define this composite pointer type for JSValue* and Exception*, and the note 13.9 of Section 5 says that "otherwise, a program that necessitates the determination of a composite pointer type is ill-formed." Does anyone know why this patch appeared to fail to compile in several of the queues (iOS, iOS-sim, jsc, Mac, Mac-wk2, Mac-32bit). I have retested-it on top of tree on my machine and it compiles with no issues. 1337025 10 317719 rmorisset 2017-08-09 10:27:04 -0700 Created attachment 317719 Fixed patch, the problem came from a variable only used in an assert 1337027 11 317719 mark.lam 2017-08-09 10:31:50 -0700 Comment on attachment 317719 Fixed patch, the problem came from a variable only used in an assert r=me 1337060 12 317719 commit-queue 2017-08-09 11:31:28 -0700 Comment on attachment 317719 Fixed patch, the problem came from a variable only used in an assert Clearing flags on attachment: 317719 Committed r220471: <http://trac.webkit.org/changeset/220471> 1337061 13 commit-queue 2017-08-09 11:31:29 -0700 All reviewed patches have been landed. Closing bug. 317650 2017-08-08 16:55:20 -0700 2017-08-08 19:13:42 -0700 Simple bookkeeping fix in two places patch2 text/plain 1997 rmorisset SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIwNDIwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE3LTA4LTA4ICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisKKyAg ICAgICAgTWFrZSBKU0NfdmFsaWRhdGVFeGNlcHRpb25DaGVja3M9MSBzdWNjZWVkIG9uIEpTVGVz dHMvc3RyZXNzL3Y4LWRlbHRhYmx1ZS1zdHJpY3QuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IFNh YW0gQmFyYXRpLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAg KEpTQzo6Q29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgIChKU0M6OkNvZGVCbG9j azo6c2V0Q29uc3RhbnRJZGVudGlmaWVyU2V0UmVnaXN0ZXJzKToKKyAgICAgICAgKEpTQzo6Q29k ZUJsb2NrOjpzZXRDb25zdGFudFJlZ2lzdGVycyk6CisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJs b2NrLmg6CisgICAgICAgICogcnVudGltZS9TY3JpcHRFeGVjdXRhYmxlLmNwcDoKKyAgICAgICAg KEpTQzo6U2NyaXB0RXhlY3V0YWJsZTo6bmV3Q29kZUJsb2NrRm9yKToKKwogMjAxNy0wOC0wOCAg RmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEJhc2VsaW5lIEpJVCBz aG91bGQgZG8gY2FnaW5nCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJh dGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bl cmF0aW9ucy5jcHAJKHJldmlzaW9uIDIyMDQyMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNjEsNiArMTA2MSw3IEBA IGlubGluZSBTbG93UGF0aFJldHVyblR5cGUgdmlydHVhbEZvcldpdGgKIAogICAgICAgICBDb2Rl QmxvY2sqKiBjb2RlQmxvY2tTbG90ID0gZXhlY0NhbGxlZS0+YWRkcmVzc09mQ29kZUJsb2NrKCk7 CiAgICAgICAgIEpTT2JqZWN0KiBlcnJvciA9IGZ1bmN0aW9uRXhlY3V0YWJsZS0+cHJlcGFyZUZv ckV4ZWN1dGlvbjxGdW5jdGlvbkV4ZWN1dGFibGU+KCp2bSwgZnVuY3Rpb24sIHNjb3BlLCBraW5k LCAqY29kZUJsb2NrU2xvdCk7CisgICAgICAgIEFTU0VSVCh0aHJvd1Njb3BlLmV4Y2VwdGlvbigp IHx8ICFlcnJvcik7CiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgdGhyb3dFeGNl cHRpb24oZXhlYywgdGhyb3dTY29wZSwgZXJyb3IpOwogICAgICAgICAgICAgcmV0dXJuIGVuY29k ZVJlc3VsdCgKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5s aW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq ZWN0SW5saW5lcy5oCShyZXZpc2lvbiAyMjA0MjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU09iamVjdElubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMjE4LDYgKzIxOCw3 IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRm8KICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQogCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVybiB0aGlz T2JqZWN0LT5wdXRJbmxpbmVTbG93KGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwog fQo= 317665 2017-08-08 19:13:43 -0700 2017-08-09 10:27:02 -0700 Cleaned up patch, also avoids unnecessary re-throws bug-175358-20170808191343.patch text/plain 3455 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 ZmQ1MWZjNGY5Nzk0YjUyYTAzOGJmNWQ4MjM0Y2E4OTc5ZjY5MjFiLi4yZGRmNThlNDQ5ODg0NDc1 YjQzNDIwOGI2MzhjNzVlNWI0MzZiNDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNy0wOC0wOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgSlNDX3ZhbGlkYXRlRXhjZXB0aW9uQ2hlY2tzPTEgc3VjY2Vl ZCBvbiBKU1Rlc3RzL3N0cmVzcy92OC1kZWx0YWJsdWUtc3RyaWN0LmpzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MzU4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5j cHA6CisgICAgICAgICogcnVudGltZS9KU09iamVjdElubGluZXMuaDoKKyAgICAgICAgKEpTQzo6 SlNPYmplY3Q6OnB1dElubGluZUZvckpTT2JqZWN0KToKKwogMjAxNy0wOC0wOCAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFz OiBzdXBwb3J0IGVkaXRpbmcgV2ViR0wgc2hhZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUT3BlcmF0aW9ucy5jcHAKaW5kZXggNzNkMGFlNzI2ODZiZDgxNzc1YWNhNTk0OTRhMTAw OWUzZmQyNDIyMi4uOTYxNTY5MjIwOWJmMzFiMGMzYWY5MzljYjI4ZjNiMTRmMzE4OWNlNyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCkBAIC05NTYsNyAr OTU2LDYgQEAgU2xvd1BhdGhSZXR1cm5UeXBlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uTGlua0Nh bGwoRXhlY1N0YXRlKiBleGVjQ2FsbGVlLCBDYWxsTGkKICAgICAgICAgSlNPYmplY3QqIGVycm9y ID0gZnVuY3Rpb25FeGVjdXRhYmxlLT5wcmVwYXJlRm9yRXhlY3V0aW9uPEZ1bmN0aW9uRXhlY3V0 YWJsZT4oKnZtLCBjYWxsZWUsIHNjb3BlLCBraW5kLCAqY29kZUJsb2NrU2xvdCk7CiAgICAgICAg IEFTU0VSVCh0aHJvd1Njb3BlLmV4Y2VwdGlvbigpID09IHJlaW50ZXJwcmV0X2Nhc3Q8RXhjZXB0 aW9uKj4oZXJyb3IpKTsKICAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAgICB0aHJvd0V4 Y2VwdGlvbihleGVjLCB0aHJvd1Njb3BlLCBlcnJvcik7CiAgICAgICAgICAgICByZXR1cm4gZW5j b2RlUmVzdWx0KAogICAgICAgICAgICAgICAgIHZtLT5nZXRDVElTdHViKHRocm93RXhjZXB0aW9u RnJvbUNhbGxTbG93UGF0aEdlbmVyYXRvcikuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCksCiAg ICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oS2VlcFRoZUZyYW1lKSk7CkBA IC0xMDE1LDEwICsxMDE0LDggQEAgdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkxpbmtEaXJl Y3RDYWxsKEV4ZWNTdGF0ZSogZXhlYywgQ2FsbExpbmtJbmZvKiBjYWxsTGkKICAgICAgICAgCiAg ICAgICAgIEpTT2JqZWN0KiBlcnJvciA9IGZ1bmN0aW9uRXhlY3V0YWJsZS0+cHJlcGFyZUZvckV4 ZWN1dGlvbjxGdW5jdGlvbkV4ZWN1dGFibGU+KCp2bSwgY2FsbGVlLCBzY29wZSwga2luZCwgY29k ZUJsb2NrKTsKICAgICAgICAgQVNTRVJUKHRocm93U2NvcGUuZXhjZXB0aW9uKCkgPT0gcmVpbnRl cnByZXRfY2FzdDxFeGNlcHRpb24qPihlcnJvcikpOwotICAgICAgICBpZiAoZXJyb3IpIHsKLSAg ICAgICAgICAgIHRocm93RXhjZXB0aW9uKGV4ZWMsIHRocm93U2NvcGUsIGVycm9yKTsKKyAgICAg ICAgaWYgKGVycm9yKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CiAgICAgICAgIEFy aXR5Q2hlY2tNb2RlIGFyaXR5OwogICAgICAgICB1bnNpZ25lZCBhcmd1bWVudFN0YWNrU2xvdHMg PSBjYWxsTGlua0luZm8tPm1heE51bUFyZ3VtZW50cygpOwogICAgICAgICBpZiAoYXJndW1lbnRT dGFja1Nsb3RzIDwgc3RhdGljX2Nhc3Q8c2l6ZV90Pihjb2RlQmxvY2stPm51bVBhcmFtZXRlcnMo KSkpCkBAIC0xMDYxLDggKzEwNTgsOCBAQCBpbmxpbmUgU2xvd1BhdGhSZXR1cm5UeXBlIHZpcnR1 YWxGb3JXaXRoRnVuY3Rpb24oCiAKICAgICAgICAgQ29kZUJsb2NrKiogY29kZUJsb2NrU2xvdCA9 IGV4ZWNDYWxsZWUtPmFkZHJlc3NPZkNvZGVCbG9jaygpOwogICAgICAgICBKU09iamVjdCogZXJy b3IgPSBmdW5jdGlvbkV4ZWN1dGFibGUtPnByZXBhcmVGb3JFeGVjdXRpb248RnVuY3Rpb25FeGVj dXRhYmxlPigqdm0sIGZ1bmN0aW9uLCBzY29wZSwga2luZCwgKmNvZGVCbG9ja1Nsb3QpOworICAg ICAgICBBU1NFUlQodGhyb3dTY29wZS5leGNlcHRpb24oKSA9PSByZWludGVycHJldF9jYXN0PEV4 Y2VwdGlvbio+KGVycm9yKSk7CiAgICAgICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgdGhy b3dFeGNlcHRpb24oZXhlYywgdGhyb3dTY29wZSwgZXJyb3IpOwogICAgICAgICAgICAgcmV0dXJu IGVuY29kZVJlc3VsdCgKICAgICAgICAgICAgICAgICB2bS0+Z2V0Q1RJU3R1Yih0aHJvd0V4Y2Vw dGlvbkZyb21DYWxsU2xvd1BhdGhHZW5lcmF0b3IpLmNvZGUoKS5leGVjdXRhYmxlQWRkcmVzcygp LAogICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KEtlZXBUaGVGcmFtZSkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxp bmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApp bmRleCAxZDYwYzdmMGQ5YzZiOWEzMWU2Zjc0NjI3OTRmOTQ1MmJmOGUzNDc0Li5mNDlhMzAyOGQz NzlhMWEzNjU3MzM5YTY2NDUxOGNlODg5NGYyNDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApAQCAtMjE4LDYgKzIxOCw3IEBAIEFMV0FZ U19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRm9ySlNPYmplY3QoSlNDZWxsKiBjZWxs LCBFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAorICAgIHNj b3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gdGhpc09iamVjdC0+cHV0SW5saW5lU2xvdyhleGVj LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KTsKIH0KIAo= 317719 2017-08-09 10:27:04 -0700 2017-08-09 11:31:28 -0700 Fixed patch, the problem came from a variable only used in an assert bug-175358-20170809102703.patch text/plain 3698 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh OGE4ZTViNjg5ZDRkZDRiYWE5YjgwOGNiM2I3NDM1NWFhY2UxYWYxLi40ZjA1NTdhOTIzYjAxNzBi OGQ4M2U5ZWFhMTI1Y2QxYTRhYjM4YjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNy0wOC0wOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgSlNDX3ZhbGlkYXRlRXhjZXB0aW9uQ2hlY2tzPTEgc3VjY2Vl ZCBvbiBKU1Rlc3RzL3N0cmVzcy92OC1kZWx0YWJsdWUtc3RyaWN0LmpzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MzU4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5j cHA6CisgICAgICAgICogcnVudGltZS9KU09iamVjdElubGluZXMuaDoKKyAgICAgICAgKEpTQzo6 SlNPYmplY3Q6OnB1dElubGluZUZvckpTT2JqZWN0KToKKwogMjAxNy0wOC0wOSAgT2xla3NhbmRy IFNrYWNoa292ICA8Z3NrYWNoa292QGdtYWlsLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiAy IHRlc3QyNjIvdGVzdC9sYW5ndWFnZS9zdGF0ZW1lbnRzL2FzeW5jLWZ1bmN0aW9uIGZhaWx1cmVz CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAppbmRleCA3M2Qw YWU3MjY4NmJkODE3NzVhY2E1OTQ5NGExMDA5ZTNmZDI0MjIyLi5mMzk2NmJkZGQ5Mjc0OTY1Y2E1 N2M2MjU2Zjg2YWJmNGMxOTY5NDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aml0L0pJVE9wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU T3BlcmF0aW9ucy5jcHAKQEAgLTk1Niw3ICs5NTYsNiBAQCBTbG93UGF0aFJldHVyblR5cGUgSklU X09QRVJBVElPTiBvcGVyYXRpb25MaW5rQ2FsbChFeGVjU3RhdGUqIGV4ZWNDYWxsZWUsIENhbGxM aQogICAgICAgICBKU09iamVjdCogZXJyb3IgPSBmdW5jdGlvbkV4ZWN1dGFibGUtPnByZXBhcmVG b3JFeGVjdXRpb248RnVuY3Rpb25FeGVjdXRhYmxlPigqdm0sIGNhbGxlZSwgc2NvcGUsIGtpbmQs ICpjb2RlQmxvY2tTbG90KTsKICAgICAgICAgQVNTRVJUKHRocm93U2NvcGUuZXhjZXB0aW9uKCkg PT0gcmVpbnRlcnByZXRfY2FzdDxFeGNlcHRpb24qPihlcnJvcikpOwogICAgICAgICBpZiAoZXJy b3IpIHsKLSAgICAgICAgICAgIHRocm93RXhjZXB0aW9uKGV4ZWMsIHRocm93U2NvcGUsIGVycm9y KTsKICAgICAgICAgICAgIHJldHVybiBlbmNvZGVSZXN1bHQoCiAgICAgICAgICAgICAgICAgdm0t PmdldENUSVN0dWIodGhyb3dFeGNlcHRpb25Gcm9tQ2FsbFNsb3dQYXRoR2VuZXJhdG9yKS5jb2Rl KCkuZXhlY3V0YWJsZUFkZHJlc3MoKSwKICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0 PHZvaWQqPihLZWVwVGhlRnJhbWUpKTsKQEAgLTEwMTQsMTEgKzEwMTMsOSBAQCB2b2lkIEpJVF9P UEVSQVRJT04gb3BlcmF0aW9uTGlua0RpcmVjdENhbGwoRXhlY1N0YXRlKiBleGVjLCBDYWxsTGlu a0luZm8qIGNhbGxMaQogICAgICAgICBSRUxFQVNFX0FTU0VSVChpc0NhbGwoa2luZCkgfHwgZnVu Y3Rpb25FeGVjdXRhYmxlLT5jb25zdHJ1Y3RBYmlsaXR5KCkgIT0gQ29uc3RydWN0QWJpbGl0eTo6 Q2Fubm90Q29uc3RydWN0KTsKICAgICAgICAgCiAgICAgICAgIEpTT2JqZWN0KiBlcnJvciA9IGZ1 bmN0aW9uRXhlY3V0YWJsZS0+cHJlcGFyZUZvckV4ZWN1dGlvbjxGdW5jdGlvbkV4ZWN1dGFibGU+ KCp2bSwgY2FsbGVlLCBzY29wZSwga2luZCwgY29kZUJsb2NrKTsKLSAgICAgICAgQVNTRVJUKHRo cm93U2NvcGUuZXhjZXB0aW9uKCkgPT0gcmVpbnRlcnByZXRfY2FzdDxFeGNlcHRpb24qPihlcnJv cikpOwotICAgICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgIHRocm93RXhjZXB0aW9uKGV4 ZWMsIHRocm93U2NvcGUsIGVycm9yKTsKKyAgICAgICAgQVNTRVJUX1VOVVNFRCh0aHJvd1Njb3Bl LCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigpID09IHJlaW50ZXJwcmV0X2Nhc3Q8RXhjZXB0aW9uKj4o ZXJyb3IpKTsKKyAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9CiAgICAgICAgIEFyaXR5Q2hlY2tNb2RlIGFyaXR5OwogICAgICAgICB1bnNpZ25lZCBhcmd1 bWVudFN0YWNrU2xvdHMgPSBjYWxsTGlua0luZm8tPm1heE51bUFyZ3VtZW50cygpOwogICAgICAg ICBpZiAoYXJndW1lbnRTdGFja1Nsb3RzIDwgc3RhdGljX2Nhc3Q8c2l6ZV90Pihjb2RlQmxvY2st Pm51bVBhcmFtZXRlcnMoKSkpCkBAIC0xMDYxLDggKzEwNTgsOCBAQCBpbmxpbmUgU2xvd1BhdGhS ZXR1cm5UeXBlIHZpcnR1YWxGb3JXaXRoRnVuY3Rpb24oCiAKICAgICAgICAgQ29kZUJsb2NrKiog Y29kZUJsb2NrU2xvdCA9IGV4ZWNDYWxsZWUtPmFkZHJlc3NPZkNvZGVCbG9jaygpOwogICAgICAg ICBKU09iamVjdCogZXJyb3IgPSBmdW5jdGlvbkV4ZWN1dGFibGUtPnByZXBhcmVGb3JFeGVjdXRp b248RnVuY3Rpb25FeGVjdXRhYmxlPigqdm0sIGZ1bmN0aW9uLCBzY29wZSwga2luZCwgKmNvZGVC bG9ja1Nsb3QpOworICAgICAgICBBU1NFUlQodGhyb3dTY29wZS5leGNlcHRpb24oKSA9PSByZWlu dGVycHJldF9jYXN0PEV4Y2VwdGlvbio+KGVycm9yKSk7CiAgICAgICAgIGlmIChlcnJvcikgewot ICAgICAgICAgICAgdGhyb3dFeGNlcHRpb24oZXhlYywgdGhyb3dTY29wZSwgZXJyb3IpOwogICAg ICAgICAgICAgcmV0dXJuIGVuY29kZVJlc3VsdCgKICAgICAgICAgICAgICAgICB2bS0+Z2V0Q1RJ U3R1Yih0aHJvd0V4Y2VwdGlvbkZyb21DYWxsU2xvd1BhdGhHZW5lcmF0b3IpLmNvZGUoKS5leGVj dXRhYmxlQWRkcmVzcygpLAogICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+ KEtlZXBUaGVGcmFtZSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3RJbmxpbmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09i amVjdElubGluZXMuaAppbmRleCAxZDYwYzdmMGQ5YzZiOWEzMWU2Zjc0NjI3OTRmOTQ1MmJmOGUz NDc0Li5mNDlhMzAyOGQzNzlhMWEzNjU3MzM5YTY2NDUxOGNlODg5NGYyNDQyIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaApAQCAtMjE4LDYg KzIxOCw3IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRm9ySlNPYmpl Y3QoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KIAorICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gdGhpc09iamVjdC0+cHV0 SW5saW5lU2xvdyhleGVjLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KTsKIH0KIAo=