224964 2021-04-22 19:08:09 -0700 [JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType 2021-04-23 14:01:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224973 224920 1 fujii fujii commit-queue ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1753436 0 fujii 2021-04-22 19:08:09 -0700 [JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType r276456 started to use callOperationNoExceptionCheck instead of callOperation. It made Windows ports crashing. Bug 183655 added special support for x64 Windows. But, it added only for callOperation, but for callOperationNoExceptionCheck. callOperationNoExceptionCheck also should support x64 Windows. Bug 183655 – JIT callOperation() needs to support operations that return SlowPathReturnType differently on Windows. Bug 224920 – [JSC] Remove exception checks from non-throwing function calls in Baseline JIT Bug 224952 – REGRESSION(r276456): Windows specific crash 1753438 1 426882 fujii 2021-04-22 19:16:03 -0700 Created attachment 426882 Patch 1753451 2 426882 ysuzuki 2021-04-22 21:41:58 -0700 Comment on attachment 426882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426882&action=review r=me > Source/JavaScriptCore/jit/JIT.h:827 > + template<typename Type> static const bool is64BitType = sizeof(Type) <= 8; Use static constexpr instead of static const 1753452 3 426887 fujii 2021-04-22 21:46:47 -0700 Created attachment 426887 Patch for landing 1753459 4 ews-feeder 2021-04-22 22:17:08 -0700 Committed r276486 (236945@main): <https://commits.webkit.org/236945@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426887. 1753496 5 webkit-bug-importer 2021-04-23 01:19:50 -0700 <rdar://problem/77061467> 1753565 6 commit-queue 2021-04-23 07:04:35 -0700 Re-opened since this is blocked by bug 224973 1753686 7 fujii 2021-04-23 13:00:39 -0700 I'm sorry for breaking AppleWin builds. Thank you for reverting my patch. https://build.webkit.org/#/builders/67/builds/2248 UnifiedSource-f2e18ffc-34.cpp C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: An internal error has occurred in the compiler. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: (compiler file 'msc1.cpp', line 1529) [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: To work around this problem, try simplifying or changing the program near the locations listed above. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: Please choose the Technical Support command on the Visual C++ [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: Help menu, or open the Technical Support help file for more information [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: Internal Compiler Error in C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.23.28105\bin\HostX64\x64\CL.exe. You will be prompted to send an error report to Microsoft later. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: INTERNAL COMPILER ERROR in 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.23.28105\bin\HostX64\x64\CL.exe' [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: Please choose the Technical Support command on the Visual C++ [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-3.cpp(9,1): fatal error C1001: Help menu, or open the Technical Support help file for more information [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: An internal error has occurred in the compiler. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: (compiler file 'msc1.cpp', line 1529) [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: To work around this problem, try simplifying or changing the program near the locations listed above. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: Please choose the Technical Support command on the Visual C++ [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: Help menu, or open the Technical Support help file for more information [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: Internal Compiler Error in C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.23.28105\bin\HostX64\x64\CL.exe. You will be prompted to send an error report to Microsoft later. [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: INTERNAL COMPILER ERROR in 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.23.28105\bin\HostX64\x64\CL.exe' [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: Please choose the Technical Support command on the Visual C++ [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] C:\cygwin\worker\win10-release\build\WebKitBuild\Release\DerivedSources\JavaScriptCore\unified-sources\UnifiedSource-3a3c4ec0-5.cpp(9,1): fatal error C1001: Help menu, or open the Technical Support help file for more information [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] cl : command line error D8040: error creating or communicating with child process [C:\cygwin\worker\win10-release\build\WebKitBuild\Release\Source\JavaScriptCore\JavaScriptCore.vcxproj] I don't know what the problem is. I should try rewriting the patch without constexpr if. 1753706 8 426938 fujii 2021-04-23 13:42:23 -0700 Created attachment 426938 Patch 1753708 9 fujii 2021-04-23 13:44:15 -0700 I downgraded my Visual Studio 2019 to version 16.3 on my PC. This internal compiler problem is caused by the template variable. I rewrote the patch without the template variable. 1753711 10 fujii 2021-04-23 14:01:17 -0700 Committed r276516 (236972@main): <https://commits.webkit.org/236972@main> 426882 2021-04-22 19:16:03 -0700 2021-04-22 21:46:43 -0700 Patch bug-224964-20210423111601.patch text/plain 4740 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YTIxNzJiMDhmYzdhMWY1ZWQyNzgxMmJhNTAzODAzMTk1Y2ViOWZiLi5jYTIyM2RhZGQzYzEzNDcz ZWRmNjViNzUyYjE5MDI4OTI5MDZkMjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0wNC0yMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbSlNDXVtXaW5dIGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNo ZWNrKCkgYWxzbyBuZWVkcyB0byBzdXBwb3J0IG9wZXJhdGlvbnMgdGhhdCByZXR1cm4gU2xvd1Bh dGhSZXR1cm5UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjQ5NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICByMjI5OTg5IChCdWcgMTgzNjU1KSBhZGRlZCB0aGUgeDY0IFdpbmRvd3Mgc3VwcG9ydCBv bmx5IGZvcgorICAgICAgICBjYWxsT3BlcmF0aW9uKCksIGJ1dCBmb3IgY2FsbE9wZXJhdGlvbk5v RXhjZXB0aW9uQ2hlY2soKS4KKyAgICAgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2so KSBhbHNvIG5lZWRzIHRoZSB4NjQgV2luZG93cworICAgICAgICBzdXBwb3J0LgorCisgICAgICAg IFRoaXMgY2hhbmdlIGlzIGEgcHJlcGFyYXRpb24gZm9yIEJ1ZyAyMjQ5MjAgdGhhdCBpcyBnb2lu ZyB0byB1c2UKKyAgICAgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sgaW5zdGVhZCBv ZiBjYWxsT3BlcmF0aW9uLgorCisgICAgICAgICogaml0L0pJVC5oOgorICAgICAgICAoY2FsbE9w ZXJhdGlvbik6IFJld3JvdGUgYnkgdXNpbmcgJ2lmIGNvbnN0ZXhwcicgaW5zdGVhZCBvZiBTRklO QUUuCisgICAgICAgIChjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjayk6IEFkZGVkIGEgbmV3 IGltcGxlbWVudGF0aW9uIGZvcgorICAgICAgICB4NjQgV2luZG93cyBiYXNlZCBvbiBjYWxsT3Bl cmF0aW9uLgorCiAyMDIxLTA0LTIyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+ CiAKICAgICAgICAgW0pTQ30gUmVtb3ZlIGV4Y2VwdGlvbiBjaGVja3MgZnJvbSBub24tdGhyb3dp bmcgZnVuY3Rpb24gY2FsbHMgaW4gQmFzZWxpbmUgSklUCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaApp bmRleCBlNTNmNTUxODAwMGEyNDYwOTUzNjZmM2ZkZjhkYWMwOGJjNjY2MzQ1Li4zOWZjMmRmYTk0 Zjc0ZTliNjE4ZThkNDRjMWYyYTA0YTIxNzMzYWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgK QEAgLTgyNCwzMSArODI0LDE3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9CiAKICNpZiBP UyhXSU5ET1dTKSAmJiBDUFUoWDg2XzY0KQotICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVy YXRpb25UeXBlLCB0eXBlbmFtZS4uLiBBcmdzPgotICAgICAgICBzdGQ6OmVuYWJsZV9pZl90PHN0 ZDo6aXNfc2FtZTx0eXBlbmFtZSBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6UmVzdWx0 VHlwZSwgU2xvd1BhdGhSZXR1cm5UeXBlPjo6dmFsdWUsIE1hY3JvQXNzZW1ibGVyOjpDYWxsPgot ICAgICAgICBjYWxsT3BlcmF0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4uIGFy Z3MpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHNldHVwQXJndW1lbnRzPE9wZXJhdGlvblR5cGU+ KGFyZ3MuLi4pOwotICAgICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hl Y2tBbmRTbG93UGF0aFJldHVyblR5cGUob3BlcmF0aW9uKTsKLSAgICAgICAgfQotCi0gICAgICAg IHRlbXBsYXRlPHR5cGVuYW1lIFR5cGU+Ci0gICAgICAgIHN0cnVjdCBpczY0Qml0VHlwZSB7Ci0g ICAgICAgICAgICBzdGF0aWMgY29uc3RleHByIGJvb2wgdmFsdWUgPSBzaXplb2YoVHlwZSkgPD0g ODsKLSAgICAgICAgfTsKLQotICAgICAgICB0ZW1wbGF0ZTw+Ci0gICAgICAgIHN0cnVjdCBpczY0 Qml0VHlwZTx2b2lkPiB7Ci0gICAgICAgICAgICBzdGF0aWMgY29uc3RleHByIGJvb2wgdmFsdWUg PSB0cnVlOwotICAgICAgICB9OworICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUeXBlPiBzdGF0 aWMgY29uc3QgYm9vbCBpczY0Qml0VHlwZSA9IHNpemVvZihUeXBlKSA8PSA4OworICAgICAgICB0 ZW1wbGF0ZTw+IHN0YXRpYyBjb25zdCBib29sIGlzNjRCaXRUeXBlPHZvaWQ+ID0gdHJ1ZTsKIAog ICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVyYXRpb25UeXBlLCB0eXBlbmFtZS4uLiBBcmdz PgotICAgICAgICBzdGQ6OmVuYWJsZV9pZl90PCFzdGQ6OmlzX3NhbWU8dHlwZW5hbWUgRnVuY3Rp b25UcmFpdHM8T3BlcmF0aW9uVHlwZT46OlJlc3VsdFR5cGUsIFNsb3dQYXRoUmV0dXJuVHlwZT46 OnZhbHVlLCBNYWNyb0Fzc2VtYmxlcjo6Q2FsbD4KLSAgICAgICAgY2FsbE9wZXJhdGlvbihPcGVy YXRpb25UeXBlIG9wZXJhdGlvbiwgQXJncy4uLiBhcmdzKQorICAgICAgICBNYWNyb0Fzc2VtYmxl cjo6Q2FsbCBjYWxsT3BlcmF0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4uIGFy Z3MpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHN0YXRpY19hc3NlcnQoaXM2NEJpdFR5cGU8dHlw ZW5hbWUgRnVuY3Rpb25UcmFpdHM8T3BlcmF0aW9uVHlwZT46OlJlc3VsdFR5cGU+Ojp2YWx1ZSwg IldpbjY0IGNhbm5vdCB1c2Ugc3RhbmRhcmQgY2FsbCB3aGVuIHJldHVybiB0eXBlIGlzIGxhcmdl ciB0aGFuIDY0IGJpdHMuIik7CiAgICAgICAgICAgICBzZXR1cEFyZ3VtZW50czxPcGVyYXRpb25U eXBlPihhcmdzLi4uKTsKLSAgICAgICAgICAgIHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlv bkNoZWNrKG9wZXJhdGlvbik7CisgICAgICAgICAgICAvLyB4NjQgV2luZG93cyBjYW5ub3QgdXNl IHN0YW5kYXJkIGNhbGwgd2hlbiB0aGUgcmV0dXJuIHR5cGUgaXMgbGFyZ2VyIHRoYW4gNjQgYml0 cy4KKyAgICAgICAgICAgIGlmIGNvbnN0ZXhwciAoaXM2NEJpdFR5cGU8dHlwZW5hbWUgRnVuY3Rp b25UcmFpdHM8T3BlcmF0aW9uVHlwZT46OlJlc3VsdFR5cGU+KQorICAgICAgICAgICAgICAgIHJl dHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrKG9wZXJhdGlvbik7CisgICAgICAgICAg ICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja0FuZFNsb3dQYXRoUmV0dXJuVHlw ZShvcGVyYXRpb24pOwogICAgICAgICB9CiAjZWxzZSAvLyBPUyhXSU5ET1dTKSAmJiBDUFUoWDg2 XzY0KQogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVyYXRpb25UeXBlLCB0eXBlbmFtZS4u LiBBcmdzPgpAQCAtODc2LDYgKzg2MiwxOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0KIAorI2lmIE9TKFdJTkRPV1MpICYmIENQVShYODZf NjQpCisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJhdGlvblR5cGUsIHR5cGVuYW1lLi4u IEFyZ3M+CisgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxPcGVyYXRpb25Ob0V4Y2Vw dGlvbkNoZWNrKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4uIGFyZ3MpCisgICAgICAg IHsKKyAgICAgICAgICAgIHNldHVwQXJndW1lbnRzPE9wZXJhdGlvblR5cGU+KGFyZ3MuLi4pOwor ICAgICAgICAgICAgdXBkYXRlVG9wQ2FsbEZyYW1lKCk7CisgICAgICAgICAgICAvLyB4NjQgV2lu ZG93cyBjYW5ub3QgdXNlIHN0YW5kYXJkIGNhbGwgd2hlbiB0aGUgcmV0dXJuIHR5cGUgaXMgbGFy Z2VyIHRoYW4gNjQgYml0cy4KKyAgICAgICAgICAgIGlmIGNvbnN0ZXhwciAoaXM2NEJpdFR5cGU8 dHlwZW5hbWUgRnVuY3Rpb25UcmFpdHM8T3BlcmF0aW9uVHlwZT46OlJlc3VsdFR5cGU+KQorICAg ICAgICAgICAgICAgIHJldHVybiBhcHBlbmRDYWxsKG9wZXJhdGlvbik7CisgICAgICAgICAgICBy ZXR1cm4gYXBwZW5kQ2FsbFdpdGhTbG93UGF0aFJldHVyblR5cGUob3BlcmF0aW9uKTsKKyAgICAg ICAgfQorI2Vsc2UKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlw ZW5hbWUuLi4gQXJncz4KICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgY2FsbE9wZXJhdGlv bk5vRXhjZXB0aW9uQ2hlY2soT3BlcmF0aW9uVHlwZSBvcGVyYXRpb24sIEFyZ3MuLi4gYXJncykK ICAgICAgICAgewpAQCAtODgzLDYgKzg4MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAg ICAgdXBkYXRlVG9wQ2FsbEZyYW1lKCk7CiAgICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbChv cGVyYXRpb24pOwogICAgICAgICB9CisjZW5kaWYgLy8gT1MoV0lORE9XUykgJiYgQ1BVKFg4Nl82 NCkKIAogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVyYXRpb25UeXBlLCB0eXBlbmFtZS4u LiBBcmdzPgogICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uV2l0aENh bGxGcmFtZVJvbGxiYWNrT25FeGNlcHRpb24oT3BlcmF0aW9uVHlwZSBvcGVyYXRpb24sIEFyZ3Mu Li4gYXJncykK 426887 2021-04-22 21:46:47 -0700 2021-04-23 13:42:14 -0700 Patch for landing bug-224964-20210423134646.patch text/plain 4747 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YTIxNzJiMDhmYzdhMWY1ZWQyNzgxMmJhNTAzODAzMTk1Y2ViOWZiLi45NDg2NGNhNjY1NWNiMDI0 NGIzMjA5YzYyOTcxYzk3YWM3N2JhMGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0wNC0yMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbSlNDXVtXaW5dIGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNo ZWNrKCkgYWxzbyBuZWVkcyB0byBzdXBwb3J0IG9wZXJhdGlvbnMgdGhhdCByZXR1cm4gU2xvd1Bh dGhSZXR1cm5UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjQ5NjQKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAg ICAgIHIyMjk5ODkgKEJ1ZyAxODM2NTUpIGFkZGVkIHRoZSB4NjQgV2luZG93cyBzdXBwb3J0IG9u bHkgZm9yCisgICAgICAgIGNhbGxPcGVyYXRpb24oKSwgYnV0IGZvciBjYWxsT3BlcmF0aW9uTm9F eGNlcHRpb25DaGVjaygpLgorICAgICAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjaygp IGFsc28gbmVlZHMgdGhlIHg2NCBXaW5kb3dzCisgICAgICAgIHN1cHBvcnQuCisKKyAgICAgICAg VGhpcyBjaGFuZ2UgaXMgYSBwcmVwYXJhdGlvbiBmb3IgQnVnIDIyNDkyMCB0aGF0IGlzIGdvaW5n IHRvIHVzZQorICAgICAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjayBpbnN0ZWFkIG9m IGNhbGxPcGVyYXRpb24uCisKKyAgICAgICAgKiBqaXQvSklULmg6CisgICAgICAgIChjYWxsT3Bl cmF0aW9uKTogUmV3cm90ZSBieSB1c2luZyAnaWYgY29uc3RleHByJyBpbnN0ZWFkIG9mIFNGSU5B RS4KKyAgICAgICAgKGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKTogQWRkZWQgYSBuZXcg aW1wbGVtZW50YXRpb24gZm9yCisgICAgICAgIHg2NCBXaW5kb3dzIGJhc2VkIG9uIGNhbGxPcGVy YXRpb24uCisKIDIwMjEtMDQtMjIgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4K IAogICAgICAgICBbSlNDfSBSZW1vdmUgZXhjZXB0aW9uIGNoZWNrcyBmcm9tIG5vbi10aHJvd2lu ZyBmdW5jdGlvbiBjYWxscyBpbiBCYXNlbGluZSBKSVQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklULmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCmlu ZGV4IGU1M2Y1NTE4MDAwYTI0NjA5NTM2NmYzZmRmOGRhYzA4YmM2NjYzNDUuLjc5MDU1MTBiOGQz MzcyY2NiYTg3Y2Y5ZDRlMTg5ZmM0MTA0MjNiMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklULmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaApA QCAtODI0LDMxICs4MjQsMTcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIH0KIAogI2lmIE9T KFdJTkRPV1MpICYmIENQVShYODZfNjQpCi0gICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJh dGlvblR5cGUsIHR5cGVuYW1lLi4uIEFyZ3M+Ci0gICAgICAgIHN0ZDo6ZW5hYmxlX2lmX3Q8c3Rk Ojppc19zYW1lPHR5cGVuYW1lIEZ1bmN0aW9uVHJhaXRzPE9wZXJhdGlvblR5cGU+OjpSZXN1bHRU eXBlLCBTbG93UGF0aFJldHVyblR5cGU+Ojp2YWx1ZSwgTWFjcm9Bc3NlbWJsZXI6OkNhbGw+Ci0g ICAgICAgIGNhbGxPcGVyYXRpb24oT3BlcmF0aW9uVHlwZSBvcGVyYXRpb24sIEFyZ3MuLi4gYXJn cykKLSAgICAgICAgewotICAgICAgICAgICAgc2V0dXBBcmd1bWVudHM8T3BlcmF0aW9uVHlwZT4o YXJncy4uLik7Ci0gICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVj a0FuZFNsb3dQYXRoUmV0dXJuVHlwZShvcGVyYXRpb24pOwotICAgICAgICB9Ci0KLSAgICAgICAg dGVtcGxhdGU8dHlwZW5hbWUgVHlwZT4KLSAgICAgICAgc3RydWN0IGlzNjRCaXRUeXBlIHsKLSAg ICAgICAgICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCB2YWx1ZSA9IHNpemVvZihUeXBlKSA8PSA4 OwotICAgICAgICB9OwotCi0gICAgICAgIHRlbXBsYXRlPD4KLSAgICAgICAgc3RydWN0IGlzNjRC aXRUeXBlPHZvaWQ+IHsKLSAgICAgICAgICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCB2YWx1ZSA9 IHRydWU7Ci0gICAgICAgIH07CisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFR5cGU+IHN0YXRp YyBjb25zdGV4cHIgYm9vbCBpczY0Qml0VHlwZSA9IHNpemVvZihUeXBlKSA8PSA4OworICAgICAg ICB0ZW1wbGF0ZTw+IHN0YXRpYyBjb25zdGV4cHIgYm9vbCBpczY0Qml0VHlwZTx2b2lkPiA9IHRy dWU7CiAKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlwZW5hbWUu Li4gQXJncz4KLSAgICAgICAgc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19zYW1lPHR5cGVuYW1l IEZ1bmN0aW9uVHJhaXRzPE9wZXJhdGlvblR5cGU+OjpSZXN1bHRUeXBlLCBTbG93UGF0aFJldHVy blR5cGU+Ojp2YWx1ZSwgTWFjcm9Bc3NlbWJsZXI6OkNhbGw+Ci0gICAgICAgIGNhbGxPcGVyYXRp b24oT3BlcmF0aW9uVHlwZSBvcGVyYXRpb24sIEFyZ3MuLi4gYXJncykKKyAgICAgICAgTWFjcm9B c3NlbWJsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihPcGVyYXRpb25UeXBlIG9wZXJhdGlvbiwgQXJn cy4uLiBhcmdzKQogICAgICAgICB7Ci0gICAgICAgICAgICBzdGF0aWNfYXNzZXJ0KGlzNjRCaXRU eXBlPHR5cGVuYW1lIEZ1bmN0aW9uVHJhaXRzPE9wZXJhdGlvblR5cGU+OjpSZXN1bHRUeXBlPjo6 dmFsdWUsICJXaW42NCBjYW5ub3QgdXNlIHN0YW5kYXJkIGNhbGwgd2hlbiByZXR1cm4gdHlwZSBp cyBsYXJnZXIgdGhhbiA2NCBiaXRzLiIpOwogICAgICAgICAgICAgc2V0dXBBcmd1bWVudHM8T3Bl cmF0aW9uVHlwZT4oYXJncy4uLik7Ci0gICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhF eGNlcHRpb25DaGVjayhvcGVyYXRpb24pOworICAgICAgICAgICAgLy8geDY0IFdpbmRvd3MgY2Fu bm90IHVzZSBzdGFuZGFyZCBjYWxsIHdoZW4gdGhlIHJldHVybiB0eXBlIGlzIGxhcmdlciB0aGFu IDY0IGJpdHMuCisgICAgICAgICAgICBpZiBjb25zdGV4cHIgKGlzNjRCaXRUeXBlPHR5cGVuYW1l IEZ1bmN0aW9uVHJhaXRzPE9wZXJhdGlvblR5cGU+OjpSZXN1bHRUeXBlPikKKyAgICAgICAgICAg ICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVjayhvcGVyYXRpb24pOworICAg ICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tBbmRTbG93UGF0aFJl dHVyblR5cGUob3BlcmF0aW9uKTsKICAgICAgICAgfQogI2Vsc2UgLy8gT1MoV0lORE9XUykgJiYg Q1BVKFg4Nl82NCkKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlw ZW5hbWUuLi4gQXJncz4KQEAgLTg3Niw2ICs4NjIsMTggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg ICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9CiAKKyNpZiBPUyhXSU5ET1dTKSAmJiBD UFUoWDg2XzY0KQorICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVyYXRpb25UeXBlLCB0eXBl bmFtZS4uLiBBcmdzPgorICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9u Tm9FeGNlcHRpb25DaGVjayhPcGVyYXRpb25UeXBlIG9wZXJhdGlvbiwgQXJncy4uLiBhcmdzKQor ICAgICAgICB7CisgICAgICAgICAgICBzZXR1cEFyZ3VtZW50czxPcGVyYXRpb25UeXBlPihhcmdz Li4uKTsKKyAgICAgICAgICAgIHVwZGF0ZVRvcENhbGxGcmFtZSgpOworICAgICAgICAgICAgLy8g eDY0IFdpbmRvd3MgY2Fubm90IHVzZSBzdGFuZGFyZCBjYWxsIHdoZW4gdGhlIHJldHVybiB0eXBl IGlzIGxhcmdlciB0aGFuIDY0IGJpdHMuCisgICAgICAgICAgICBpZiBjb25zdGV4cHIgKGlzNjRC aXRUeXBlPHR5cGVuYW1lIEZ1bmN0aW9uVHJhaXRzPE9wZXJhdGlvblR5cGU+OjpSZXN1bHRUeXBl PikKKyAgICAgICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbChvcGVyYXRpb24pOworICAgICAg ICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoU2xvd1BhdGhSZXR1cm5UeXBlKG9wZXJhdGlvbik7 CisgICAgICAgIH0KKyNlbHNlCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJhdGlvblR5 cGUsIHR5cGVuYW1lLi4uIEFyZ3M+CiAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxP cGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4u IGFyZ3MpCiAgICAgICAgIHsKQEAgLTg4Myw2ICs4ODEsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgICAgIHVwZGF0ZVRvcENhbGxGcmFtZSgpOwogICAgICAgICAgICAgcmV0dXJuIGFwcGVu ZENhbGwob3BlcmF0aW9uKTsKICAgICAgICAgfQorI2VuZGlmIC8vIE9TKFdJTkRPV1MpICYmIENQ VShYODZfNjQpCiAKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlw ZW5hbWUuLi4gQXJncz4KICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgY2FsbE9wZXJhdGlv bldpdGhDYWxsRnJhbWVSb2xsYmFja09uRXhjZXB0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9u LCBBcmdzLi4uIGFyZ3MpCg== 426938 2021-04-23 13:42:23 -0700 2021-04-23 13:42:23 -0700 Patch bug-224964-20210424054222.patch text/plain 4510 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MTMzMGQyMzZhMjljN2Y1NzQ0NWIyMjU1NGE5ZjUwYjY5ODNhODU5Li44MWI1MjQzZWVlNGEwZTdj NDRlMjEwOTM0ODM0Y2E0NjI0OWExMDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0wNC0yMyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbSlNDXVtXaW5dIGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNo ZWNrKCkgYWxzbyBuZWVkcyB0byBzdXBwb3J0IG9wZXJhdGlvbnMgdGhhdCByZXR1cm4gU2xvd1Bh dGhSZXR1cm5UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjQ5NjQKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAg ICAgIHIyMjk5ODkgKEJ1ZyAxODM2NTUpIGFkZGVkIHRoZSB4NjQgV2luZG93cyBzdXBwb3J0IG9u bHkgZm9yCisgICAgICAgIGNhbGxPcGVyYXRpb24oKSwgYnV0IGZvciBjYWxsT3BlcmF0aW9uTm9F eGNlcHRpb25DaGVjaygpLgorICAgICAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjaygp IGFsc28gbmVlZHMgdGhlIHg2NCBXaW5kb3dzCisgICAgICAgIHN1cHBvcnQuCisKKyAgICAgICAg VGhpcyBjaGFuZ2UgaXMgYSBwcmVwYXJhdGlvbiBmb3IgQnVnIDIyNDkyMCB0aGF0IGlzIGdvaW5n IHRvIHVzZQorICAgICAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjayBpbnN0ZWFkIG9m IGNhbGxPcGVyYXRpb24uCisKKyAgICAgICAgKiBqaXQvSklULmg6CisgICAgICAgIChjYWxsT3Bl cmF0aW9uKTogUmV3cm90ZSBieSB1c2luZyAnaWYgY29uc3RleHByJyBpbnN0ZWFkIG9mIFNGSU5B RS4KKyAgICAgICAgKGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKTogQWRkZWQgYSBuZXcg aW1wbGVtZW50YXRpb24gZm9yCisgICAgICAgIHg2NCBXaW5kb3dzIGJhc2VkIG9uIGNhbGxPcGVy YXRpb24uCisKIDIwMjEtMDQtMjMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc2NDg2LgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklULmgKaW5kZXggZTUzZjU1MTgwMDBhMjQ2MDk1MzY2ZjNmZGY4ZGFjMDhiYzY2NjM0 NS4uZmZjZGM3MTNlOTYyZGViMmY1ZDg1MzlhMjI5MGExZGI0Y2JiMDVlOCAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVC5oCkBAIC04MjQsMTQgKzgyNCw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAg ICB9CiAKICNpZiBPUyhXSU5ET1dTKSAmJiBDUFUoWDg2XzY0KQotICAgICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBPcGVyYXRpb25UeXBlLCB0eXBlbmFtZS4uLiBBcmdzPgotICAgICAgICBzdGQ6OmVu YWJsZV9pZl90PHN0ZDo6aXNfc2FtZTx0eXBlbmFtZSBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25U eXBlPjo6UmVzdWx0VHlwZSwgU2xvd1BhdGhSZXR1cm5UeXBlPjo6dmFsdWUsIE1hY3JvQXNzZW1i bGVyOjpDYWxsPgotICAgICAgICBjYWxsT3BlcmF0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9u LCBBcmdzLi4uIGFyZ3MpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHNldHVwQXJndW1lbnRzPE9w ZXJhdGlvblR5cGU+KGFyZ3MuLi4pOwotICAgICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRo RXhjZXB0aW9uQ2hlY2tBbmRTbG93UGF0aFJldHVyblR5cGUob3BlcmF0aW9uKTsKLSAgICAgICAg fQotCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFR5cGU+CiAgICAgICAgIHN0cnVjdCBpczY0 Qml0VHlwZSB7CiAgICAgICAgICAgICBzdGF0aWMgY29uc3RleHByIGJvb2wgdmFsdWUgPSBzaXpl b2YoVHlwZSkgPD0gODsKQEAgLTg0MywxMiArODM1LDEzIEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICB9OwogCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJhdGlvblR5cGUsIHR5cGVu YW1lLi4uIEFyZ3M+Ci0gICAgICAgIHN0ZDo6ZW5hYmxlX2lmX3Q8IXN0ZDo6aXNfc2FtZTx0eXBl bmFtZSBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6UmVzdWx0VHlwZSwgU2xvd1BhdGhS ZXR1cm5UeXBlPjo6dmFsdWUsIE1hY3JvQXNzZW1ibGVyOjpDYWxsPgotICAgICAgICBjYWxsT3Bl cmF0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4uIGFyZ3MpCisgICAgICAgIE1h Y3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oT3BlcmF0aW9uVHlwZSBvcGVyYXRpb24s IEFyZ3MuLi4gYXJncykKICAgICAgICAgewotICAgICAgICAgICAgc3RhdGljX2Fzc2VydChpczY0 Qml0VHlwZTx0eXBlbmFtZSBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6UmVzdWx0VHlw ZT46OnZhbHVlLCAiV2luNjQgY2Fubm90IHVzZSBzdGFuZGFyZCBjYWxsIHdoZW4gcmV0dXJuIHR5 cGUgaXMgbGFyZ2VyIHRoYW4gNjQgYml0cy4iKTsKICAgICAgICAgICAgIHNldHVwQXJndW1lbnRz PE9wZXJhdGlvblR5cGU+KGFyZ3MuLi4pOwotICAgICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxX aXRoRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uKTsKKyAgICAgICAgICAgIC8vIHg2NCBXaW5kb3dz IGNhbm5vdCB1c2Ugc3RhbmRhcmQgY2FsbCB3aGVuIHRoZSByZXR1cm4gdHlwZSBpcyBsYXJnZXIg dGhhbiA2NCBiaXRzLgorICAgICAgICAgICAgaWYgY29uc3RleHByIChpczY0Qml0VHlwZTx0eXBl bmFtZSBGdW5jdGlvblRyYWl0czxPcGVyYXRpb25UeXBlPjo6UmVzdWx0VHlwZT46OnZhbHVlKQor ICAgICAgICAgICAgICAgIHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrKG9wZXJh dGlvbik7CisgICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja0Fu ZFNsb3dQYXRoUmV0dXJuVHlwZShvcGVyYXRpb24pOwogICAgICAgICB9CiAjZWxzZSAvLyBPUyhX SU5ET1dTKSAmJiBDUFUoWDg2XzY0KQogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcGVyYXRp b25UeXBlLCB0eXBlbmFtZS4uLiBBcmdzPgpAQCAtODc2LDYgKzg2OSwxOCBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0KIAorI2lmIE9TKFdJ TkRPV1MpICYmIENQVShYODZfNjQpCisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJhdGlv blR5cGUsIHR5cGVuYW1lLi4uIEFyZ3M+CisgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNh bGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdz Li4uIGFyZ3MpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNldHVwQXJndW1lbnRzPE9wZXJhdGlv blR5cGU+KGFyZ3MuLi4pOworICAgICAgICAgICAgdXBkYXRlVG9wQ2FsbEZyYW1lKCk7CisgICAg ICAgICAgICAvLyB4NjQgV2luZG93cyBjYW5ub3QgdXNlIHN0YW5kYXJkIGNhbGwgd2hlbiB0aGUg cmV0dXJuIHR5cGUgaXMgbGFyZ2VyIHRoYW4gNjQgYml0cy4KKyAgICAgICAgICAgIGlmIGNvbnN0 ZXhwciAoaXM2NEJpdFR5cGU8dHlwZW5hbWUgRnVuY3Rpb25UcmFpdHM8T3BlcmF0aW9uVHlwZT46 OlJlc3VsdFR5cGU+Ojp2YWx1ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbChv cGVyYXRpb24pOworICAgICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoU2xvd1BhdGhSZXR1 cm5UeXBlKG9wZXJhdGlvbik7CisgICAgICAgIH0KKyNlbHNlIC8vIE9TKFdJTkRPV1MpICYmIENQ VShYODZfNjQpCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9wZXJhdGlvblR5cGUsIHR5cGVu YW1lLi4uIEFyZ3M+CiAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxsIGNhbGxPcGVyYXRpb25O b0V4Y2VwdGlvbkNoZWNrKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4uIGFyZ3MpCiAg ICAgICAgIHsKQEAgLTg4Myw2ICs4ODgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAg IHVwZGF0ZVRvcENhbGxGcmFtZSgpOwogICAgICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGwob3Bl cmF0aW9uKTsKICAgICAgICAgfQorI2VuZGlmIC8vIE9TKFdJTkRPV1MpICYmIENQVShYODZfNjQp CiAKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgT3BlcmF0aW9uVHlwZSwgdHlwZW5hbWUuLi4g QXJncz4KICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbldpdGhDYWxs RnJhbWVSb2xsYmFja09uRXhjZXB0aW9uKE9wZXJhdGlvblR5cGUgb3BlcmF0aW9uLCBBcmdzLi4u IGFyZ3MpCg==