174976 2017-07-30 22:22:36 -0700 Added some UNLIKELYs to operationOptimize(). 2017-07-31 16:31:41 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam buildbot commit-queue jfbastien keith_miller msaboff saam webkit-bug-importer oldest_to_newest 1333364 0 mark.lam 2017-07-30 22:22:36 -0700 Patch coming. 1333365 1 316757 mark.lam 2017-07-30 22:28:57 -0700 Created attachment 316757 proposed patch. 1333436 2 316757 jfbastien 2017-07-31 08:41:34 -0700 Comment on attachment 316757 proposed patch. r=me There's other Options::* spots in the file. Do those too? 1333497 3 316794 mark.lam 2017-07-31 12:39:21 -0700 Created attachment 316794 patch for landing. (In reply to JF Bastien from comment #2) > Comment on attachment 316757 [details] > proposed patch. > > r=me > > There's other Options::* spots in the file. Do those too? Thanks. I added the other unlikelys. 1333595 4 316794 commit-queue 2017-07-31 16:30:41 -0700 Comment on attachment 316794 patch for landing. Clearing flags on attachment: 316794 Committed r220081: <http://trac.webkit.org/changeset/220081> 1333596 5 commit-queue 2017-07-31 16:30:42 -0700 All reviewed patches have been landed. Closing bug. 1333597 6 webkit-bug-importer 2017-07-31 16:31:41 -0700 <rdar://problem/33639587> 316757 2017-07-30 22:28:57 -0700 2017-07-31 12:39:21 -0700 proposed patch. bug-174976.patch text/plain 2164 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIwMDUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBA CisyMDE3LTA3LTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGRlZCBzb21lIFVOTElLRUxZcyB0byBvcGVyYXRpb25PcHRpbWl6ZSgpLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0OTc2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5j cHA6CisKIDIwMTctMDctMzAgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+ CiAKICAgICAgICAgW1dURl0gSW50cm9kdWNlIFByaXZhdGUgU3ltYm9scwpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCShyZXZpc2lvbiAyMjAwNTMp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMjk4LDcgKzEyOTgsNyBAQCBTbG93UGF0aFJldHVyblR5cGUgSklUX09QRVJB VElPTiBvcGVyYXRpCiAgICAgRGVmZXJHQ0ZvckFXaGlsZSBkZWZlckdDKHZtLmhlYXApOwogICAg IAogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gZXhlYy0+Y29kZUJsb2NrKCk7Ci0gICAgaWYg KGNvZGVCbG9jay0+aml0VHlwZSgpICE9IEpJVENvZGU6OkJhc2VsaW5lSklUKSB7CisgICAgaWYg KFVOTElLRUxZKGNvZGVCbG9jay0+aml0VHlwZSgpICE9IEpJVENvZGU6OkJhc2VsaW5lSklUKSkg ewogICAgICAgICBkYXRhTG9nKCJVbmV4cGVjdGVkIGNvZGUgYmxvY2sgaW4gQmFzZWxpbmUtPkRG RyB0aWVyLXVwOiAiLCAqY29kZUJsb2NrLCAiXG4iKTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICB9CkBAIC0xMzA5LDcgKzEzMDksNyBAQCBTbG93UGF0aFJldHVy blR5cGUgSklUX09QRVJBVElPTiBvcGVyYXRpCiAgICAgICAgIGNvZGVCbG9jay0+bV9zaG91bGRB bHdheXNCZUlubGluZWQgPSBmYWxzZTsKICAgICB9CiAKLSAgICBpZiAoT3B0aW9uczo6dmVyYm9z ZU9TUigpKSB7CisgICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkpIHsKICAg ICAgICAgZGF0YUxvZygKICAgICAgICAgICAgICpjb2RlQmxvY2ssICI6IEVudGVyZWQgb3B0aW1p emUgd2l0aCBieXRlY29kZUluZGV4ID0gIiwgYnl0ZWNvZGVJbmRleCwKICAgICAgICAgICAgICIs IGV4ZWN1dGVDb3VudGVyID0gIiwgY29kZUJsb2NrLT5qaXRFeGVjdXRlQ291bnRlcigpLApAQCAt MTMzMSw3ICsxMzMxLDcgQEAgU2xvd1BhdGhSZXR1cm5UeXBlIEpJVF9PUEVSQVRJT04gb3BlcmF0 aQogICAgIH0KICAgICAKICAgICBEZWJ1Z2dlciogZGVidWdnZXIgPSBjb2RlQmxvY2stPmdsb2Jh bE9iamVjdCgpLT5kZWJ1Z2dlcigpOwotICAgIGlmIChkZWJ1Z2dlciAmJiAoZGVidWdnZXItPmlz U3RlcHBpbmcoKSB8fCBjb2RlQmxvY2stPmJhc2VsaW5lQWx0ZXJuYXRpdmUoKS0+aGFzRGVidWdn ZXJSZXF1ZXN0cygpKSkgeworICAgIGlmIChVTkxJS0VMWShkZWJ1Z2dlciAmJiAoZGVidWdnZXIt PmlzU3RlcHBpbmcoKSB8fCBjb2RlQmxvY2stPmJhc2VsaW5lQWx0ZXJuYXRpdmUoKS0+aGFzRGVi dWdnZXJSZXF1ZXN0cygpKSkpIHsKICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxv Y2ssICJkZWxheU9wdGltaXplVG9ERkciLCAoImRlYnVnZ2VyIGlzIHN0ZXBwaW5nIG9yIGhhcyBy ZXF1ZXN0cyIpKTsKICAgICAgICAgdXBkYXRlQWxsUHJlZGljdGlvbnNBbmRPcHRpbWl6ZUFmdGVy V2FybVVwKGNvZGVCbG9jayk7CiAgICAgICAgIHJldHVybiBlbmNvZGVSZXN1bHQoMCwgMCk7Cg== 316794 2017-07-31 12:39:21 -0700 2017-07-31 16:30:41 -0700 patch for landing. bug-174976.patch text/plain 6771 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIwMDcyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBA CisyMDE3LTA3LTMxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGRlZCBzb21lIFVOTElLRUxZcyB0byBvcGVyYXRpb25PcHRpbWl6ZSgpLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0OTc2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgSkYgQmFzdGllbi4KKworICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoK KwogMjAxNy0wNy0zMSAgTWF0dCBMZXdpcyAgPGpsZXdpczNAYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMjAwNjAuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDIyMDA3MikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEyOTgsNyArMTI5OCw3IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9wZXJh dGkKICAgICBEZWZlckdDRm9yQVdoaWxlIGRlZmVyR0Modm0uaGVhcCk7CiAgICAgCiAgICAgQ29k ZUJsb2NrKiBjb2RlQmxvY2sgPSBleGVjLT5jb2RlQmxvY2soKTsKLSAgICBpZiAoY29kZUJsb2Nr LT5qaXRUeXBlKCkgIT0gSklUQ29kZTo6QmFzZWxpbmVKSVQpIHsKKyAgICBpZiAoVU5MSUtFTFko Y29kZUJsb2NrLT5qaXRUeXBlKCkgIT0gSklUQ29kZTo6QmFzZWxpbmVKSVQpKSB7CiAgICAgICAg IGRhdGFMb2coIlVuZXhwZWN0ZWQgY29kZSBibG9jayBpbiBCYXNlbGluZS0+REZHIHRpZXItdXA6 ICIsICpjb2RlQmxvY2ssICJcbiIpOwogICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgIH0KQEAgLTEzMDksNyArMTMwOSw3IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRf T1BFUkFUSU9OIG9wZXJhdGkKICAgICAgICAgY29kZUJsb2NrLT5tX3Nob3VsZEFsd2F5c0JlSW5s aW5lZCA9IGZhbHNlOwogICAgIH0KIAotICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsK KyAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6dmVyYm9zZU9TUigpKSkgewogICAgICAgICBkYXRh TG9nKAogICAgICAgICAgICAgKmNvZGVCbG9jaywgIjogRW50ZXJlZCBvcHRpbWl6ZSB3aXRoIGJ5 dGVjb2RlSW5kZXggPSAiLCBieXRlY29kZUluZGV4LAogICAgICAgICAgICAgIiwgZXhlY3V0ZUNv dW50ZXIgPSAiLCBjb2RlQmxvY2stPmppdEV4ZWN1dGVDb3VudGVyKCksCkBAIC0xMzI1LDEzICsx MzI1LDEzIEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGkKICAgICBp ZiAoIWNvZGVCbG9jay0+Y2hlY2tJZk9wdGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQoKSkgewog ICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5T3B0aW1pemVUb0RG RyIsICgiY291bnRlciA9ICIsIGNvZGVCbG9jay0+aml0RXhlY3V0ZUNvdW50ZXIoKSkpOwogICAg ICAgICBjb2RlQmxvY2stPnVwZGF0ZUFsbFByZWRpY3Rpb25zKCk7Ci0gICAgICAgIGlmIChPcHRp b25zOjp2ZXJib3NlT1NSKCkpCisgICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp2ZXJib3Nl T1NSKCkpKQogICAgICAgICAgICAgZGF0YUxvZygiQ2hvb3Npbmcgbm90IHRvIG9wdGltaXplICIs ICpjb2RlQmxvY2ssICIgeWV0LCBiZWNhdXNlIHRoZSB0aHJlc2hvbGQgaGFzbid0IGJlZW4gcmVh Y2hlZC5cbiIpOwogICAgICAgICByZXR1cm4gZW5jb2RlUmVzdWx0KDAsIDApOwogICAgIH0KICAg ICAKICAgICBEZWJ1Z2dlciogZGVidWdnZXIgPSBjb2RlQmxvY2stPmdsb2JhbE9iamVjdCgpLT5k ZWJ1Z2dlcigpOwotICAgIGlmIChkZWJ1Z2dlciAmJiAoZGVidWdnZXItPmlzU3RlcHBpbmcoKSB8 fCBjb2RlQmxvY2stPmJhc2VsaW5lQWx0ZXJuYXRpdmUoKS0+aGFzRGVidWdnZXJSZXF1ZXN0cygp KSkgeworICAgIGlmIChVTkxJS0VMWShkZWJ1Z2dlciAmJiAoZGVidWdnZXItPmlzU3RlcHBpbmco KSB8fCBjb2RlQmxvY2stPmJhc2VsaW5lQWx0ZXJuYXRpdmUoKS0+aGFzRGVidWdnZXJSZXF1ZXN0 cygpKSkpIHsKICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxvY2ssICJkZWxheU9w dGltaXplVG9ERkciLCAoImRlYnVnZ2VyIGlzIHN0ZXBwaW5nIG9yIGhhcyByZXF1ZXN0cyIpKTsK ICAgICAgICAgdXBkYXRlQWxsUHJlZGljdGlvbnNBbmRPcHRpbWl6ZUFmdGVyV2FybVVwKGNvZGVC bG9jayk7CiAgICAgICAgIHJldHVybiBlbmNvZGVSZXN1bHQoMCwgMCk7CkBAIC0xMzQwLDcgKzEz NDAsNyBAQCBTbG93UGF0aFJldHVyblR5cGUgSklUX09QRVJBVElPTiBvcGVyYXRpCiAgICAgaWYg KGNvZGVCbG9jay0+bV9zaG91bGRBbHdheXNCZUlubGluZWQpIHsKICAgICAgICAgQ09ERUJMT0NL X0xPR19FVkVOVChjb2RlQmxvY2ssICJkZWxheU9wdGltaXplVG9ERkciLCAoInNob3VsZCBhbHdh eXMgYmUgaW5saW5lZCIpKTsKICAgICAgICAgdXBkYXRlQWxsUHJlZGljdGlvbnNBbmRPcHRpbWl6 ZUFmdGVyV2FybVVwKGNvZGVCbG9jayk7Ci0gICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NS KCkpCisgICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp2ZXJib3NlT1NSKCkpKQogICAgICAg ICAgICAgZGF0YUxvZygiQ2hvb3Npbmcgbm90IHRvIG9wdGltaXplICIsICpjb2RlQmxvY2ssICIg eWV0LCBiZWNhdXNlIG1fc2hvdWxkQWx3YXlzQmVJbmxpbmVkID09IHRydWUuXG4iKTsKICAgICAg ICAgcmV0dXJuIGVuY29kZVJlc3VsdCgwLCAwKTsKICAgICB9CkBAIC0xMzk2LDEyICsxMzk2LDEy IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGkKICAgICAgICAgaWYg KCFjb2RlQmxvY2stPmhhc09wdGltaXplZFJlcGxhY2VtZW50KCkpIHsKICAgICAgICAgICAgIENP REVCTE9DS19MT0dfRVZFTlQoY29kZUJsb2NrLCAiZGVsYXlPcHRpbWl6ZVRvREZHIiwgKCJjb21w aWxlZCBhbmQgZmFpbGVkIikpOwogICAgICAgICAgICAgY29kZUJsb2NrLT51cGRhdGVBbGxQcmVk aWN0aW9ucygpOwotICAgICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkKKyAgICAg ICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp2ZXJib3NlT1NSKCkpKQogICAgICAgICAgICAg ICAgIGRhdGFMb2coIkNvZGUgYmxvY2sgIiwgKmNvZGVCbG9jaywgIiB3YXMgY29tcGlsZWQgYnV0 IGl0IGRvZXNuJ3QgaGF2ZSBhbiBvcHRpbWl6ZWQgcmVwbGFjZW1lbnQuXG4iKTsKICAgICAgICAg ICAgIHJldHVybiBlbmNvZGVSZXN1bHQoMCwgMCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYg KGNvZGVCbG9jay0+aGFzT3B0aW1pemVkUmVwbGFjZW1lbnQoKSkgewotICAgICAgICBpZiAoT3B0 aW9uczo6dmVyYm9zZU9TUigpKQorICAgICAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6dmVyYm9z ZU9TUigpKSkKICAgICAgICAgICAgIGRhdGFMb2coIkNvbnNpZGVyaW5nIE9TUiAiLCAqY29kZUJs b2NrLCAiIC0+ICIsICpjb2RlQmxvY2stPnJlcGxhY2VtZW50KCksICIuXG4iKTsKICAgICAgICAg Ly8gSWYgd2UgaGF2ZSBhbiBvcHRpbWl6ZWQgcmVwbGFjZW1lbnQsIHRoZW4gaXQgbXVzdCBiZSB0 aGUgY2FzZSB0aGF0IHdlIGVudGVyZWQKICAgICAgICAgLy8gY3RpX29wdGltaXplIGZyb20gYSBs b29wLiBUaGF0J3MgYmVjYXVzZSBpZiB0aGVyZSdzIGFuIG9wdGltaXplZCByZXBsYWNlbWVudCwK QEAgLTE0MTgsNyArMTQxOCw3IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9w ZXJhdGkKICAgICAgICAgLy8gYWRkaXRpb25hbCBjaGVja2luZyBhbnl3YXksIHRvIHJlZHVjZSB0 aGUgYW1vdW50IG9mIHJlY29tcGlsYXRpb24gdGhyYXNoaW5nLgogICAgICAgICBpZiAoY29kZUJs b2NrLT5yZXBsYWNlbWVudCgpLT5zaG91bGRSZW9wdGltaXplRnJvbUxvb3BOb3coKSkgewogICAg ICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxvY2ssICJkZWxheU9wdGltaXplVG9E RkciLCAoInNob3VsZCByZW9wdGltaXplIGZyb20gbG9vcCBub3ciKSk7Ci0gICAgICAgICAgICBp ZiAoT3B0aW9uczo6dmVyYm9zZU9TUigpKSB7CisgICAgICAgICAgICBpZiAoVU5MSUtFTFkoT3B0 aW9uczo6dmVyYm9zZU9TUigpKSkgewogICAgICAgICAgICAgICAgIGRhdGFMb2coCiAgICAgICAg ICAgICAgICAgICAgICJUcmlnZ2VyaW5nIHJlb3B0aW1pemF0aW9uIG9mICIsICpjb2RlQmxvY2ss CiAgICAgICAgICAgICAgICAgICAgICIoIiwgKmNvZGVCbG9jay0+cmVwbGFjZW1lbnQoKSwgIikg KGluIGxvb3ApLlxuIik7CkBAIC0xNDI5LDcgKzE0MjksNyBAQCBTbG93UGF0aFJldHVyblR5cGUg SklUX09QRVJBVElPTiBvcGVyYXRpCiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCFjb2RlQmxv Y2stPnNob3VsZE9wdGltaXplTm93KCkpIHsKICAgICAgICAgICAgIENPREVCTE9DS19MT0dfRVZF TlQoY29kZUJsb2NrLCAiZGVsYXlPcHRpbWl6ZVRvREZHIiwgKCJpbnN1ZmZpY2llbnQgcHJvZmls aW5nIikpOwotICAgICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkgeworICAgICAg ICAgICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkpIHsKICAgICAgICAgICAg ICAgICBkYXRhTG9nKAogICAgICAgICAgICAgICAgICAgICAiRGVsYXlpbmcgb3B0aW1pemF0aW9u IGZvciAiLCAqY29kZUJsb2NrLAogICAgICAgICAgICAgICAgICAgICAiIGJlY2F1c2Ugb2YgaW5z dWZmaWNpZW50IHByb2ZpbGluZy5cbiIpOwpAQCAtMTQzNyw3ICsxNDM3LDcgQEAgU2xvd1BhdGhS ZXR1cm5UeXBlIEpJVF9PUEVSQVRJT04gb3BlcmF0aQogICAgICAgICAgICAgcmV0dXJuIGVuY29k ZVJlc3VsdCgwLCAwKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChPcHRpb25zOjp2ZXJib3Nl T1NSKCkpCisgICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp2ZXJib3NlT1NSKCkpKQogICAg ICAgICAgICAgZGF0YUxvZygiVHJpZ2dlcmluZyBvcHRpbWl6ZWQgY29tcGlsYXRpb24gb2YgIiwg KmNvZGVCbG9jaywgIlxuIik7CiAKICAgICAgICAgdW5zaWduZWQgbnVtVmFyc1dpdGhWYWx1ZXM7 CkBAIC0xNDcwLDcgKzE0NzAsNyBAQCBTbG93UGF0aFJldHVyblR5cGUgSklUX09QRVJBVElPTiBv cGVyYXRpCiAgICAgCiAgICAgaWYgKHZvaWQqIGRhdGFCdWZmZXIgPSBERkc6OnByZXBhcmVPU1JF bnRyeShleGVjLCBvcHRpbWl6ZWRDb2RlQmxvY2ssIGJ5dGVjb2RlSW5kZXgpKSB7CiAgICAgICAg IENPREVCTE9DS19MT0dfRVZFTlQob3B0aW1pemVkQ29kZUJsb2NrLCAib3NyRW50cnkiLCAoImF0 IGJjIyIsIGJ5dGVjb2RlSW5kZXgpKTsKLSAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VPU1Io KSkgeworICAgICAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6dmVyYm9zZU9TUigpKSkgewogICAg ICAgICAgICAgZGF0YUxvZygKICAgICAgICAgICAgICAgICAiUGVyZm9ybWluZyBPU1IgIiwgKmNv ZGVCbG9jaywgIiAtPiAiLCAqb3B0aW1pemVkQ29kZUJsb2NrLCAiLlxuIik7CiAgICAgICAgIH0K QEAgLTE0ODAsNyArMTQ4MCw3IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBKSVRfT1BFUkFUSU9OIG9w ZXJhdGkKICAgICAgICAgcmV0dXJuIGVuY29kZVJlc3VsdCh2bS5nZXRDVElTdHViKERGRzo6b3Ny RW50cnlUaHVua0dlbmVyYXRvcikuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCksIGRhdGFCdWZm ZXIpOwogICAgIH0KIAotICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsKKyAgICBpZiAo VU5MSUtFTFkoT3B0aW9uczo6dmVyYm9zZU9TUigpKSkgewogICAgICAgICBkYXRhTG9nKAogICAg ICAgICAgICAgIk9wdGltaXppbmcgIiwgKmNvZGVCbG9jaywgIiAtPiAiLCAqY29kZUJsb2NrLT5y ZXBsYWNlbWVudCgpLAogICAgICAgICAgICAgIiBzdWNjZWVkZWQsIE9TUiBmYWlsZWQsIGFmdGVy IGEgZGVsYXkgb2YgIiwKQEAgLTE1MDEsNyArMTUwMSw3IEBAIFNsb3dQYXRoUmV0dXJuVHlwZSBK SVRfT1BFUkFUSU9OIG9wZXJhdGkKICAgICAvLyByZW9wdGltaXphdGlvbiB0cmlnZ2VyLgogICAg IGlmIChvcHRpbWl6ZWRDb2RlQmxvY2stPnNob3VsZFJlb3B0aW1pemVOb3coKSkgewogICAgICAg ICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5T3B0aW1pemVUb0RGRyIsICgi c2hvdWxkIHJlb3B0aW1pemUgbm93IikpOwotICAgICAgICBpZiAoT3B0aW9uczo6dmVyYm9zZU9T UigpKSB7CisgICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjp2ZXJib3NlT1NSKCkpKSB7CiAg ICAgICAgICAgICBkYXRhTG9nKAogICAgICAgICAgICAgICAgICJUcmlnZ2VyaW5nIHJlb3B0aW1p emF0aW9uIG9mICIsICpjb2RlQmxvY2ssICIgLT4gIiwKICAgICAgICAgICAgICAgICAqY29kZUJs b2NrLT5yZXBsYWNlbWVudCgpLCAiIChhZnRlciBPU1IgZmFpbCkuXG4iKTsK