220718 2021-01-18 17:19:01 -0800 [JSC] FTL::prepareOSREntry can clear OSR entry CodeBlock if it is already invalidated 2021-01-19 15:27:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam mcatanzaro msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1720441 0 ysuzuki 2021-01-18 17:19:01 -0800 [JSC] FTL::prepareOSREntry can clear OSR entry CodeBlock if it is already invalidated 1720442 1 417853 ysuzuki 2021-01-18 17:20:39 -0800 Created attachment 417853 Patch 1720443 2 ysuzuki 2021-01-18 17:20:42 -0800 <rdar://problem/70527068> 1720444 3 417854 ysuzuki 2021-01-18 17:21:48 -0800 Created attachment 417854 Patch 1720459 4 417854 mark.lam 2021-01-18 19:53:26 -0800 Comment on attachment 417854 Patch r=mer 1720465 5 ews-feeder 2021-01-18 21:00:00 -0800 Committed r271596: <https://trac.webkit.org/changeset/271596> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417854. 1720583 6 mcatanzaro 2021-01-19 10:43:42 -0800 This introduced: [621/2299] Building CXX object Source/JavaScriptCore/CMak...criptCore/unified-sources/UnifiedSource-bfc896e1-12.cpp.o In file included from DerivedSources/JavaScriptCore/unified-sources/UnifiedSource-bfc896e1-12.cpp:5: ../../Source/JavaScriptCore/dfg/DFGOperations.cpp: In function ‘char* JSC::DFG::tierUpCommon(JSC::VM&, JSC::CallFrame*, JSC::BytecodeIndex, bool)’: ../../Source/JavaScriptCore/dfg/DFGOperations.cpp:3861:20: warning: unused variable ‘entryBlock’ [-Wunused-variable] 3861 | if (CodeBlock* entryBlock = jitCode->osrEntryBlock()) { | ^~~~~~~~~~ I'm not sure if this trivial fix would be correct: diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp index 85e74d17ece6..45fdcb24f68c 100644 --- a/Source/JavaScriptCore/dfg/DFGOperations.cpp +++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp @@ -3858,7 +3858,7 @@ static char* tierUpCommon(VM& vm, CallFrame* callFrame, BytecodeIndex originByte } else CODEBLOCK_LOG_EVENT(codeBlock, "delayFTLCompile", ("avoiding replacement compile")); - if (CodeBlock* entryBlock = jitCode->osrEntryBlock()) { + if (jitCode->osrEntryBlock()) { if (jitCode->osrEntryRetry < Options::ftlOSREntryRetryThreshold()) { CODEBLOCK_LOG_EVENT(codeBlock, "delayFTLCompile", ("OSR entry failed, OSR entry threshold not met")); jitCode->osrEntryRetry++; Maybe that condition is no longer needed at all now? 1720716 7 ysuzuki 2021-01-19 15:25:27 -0800 (In reply to Michael Catanzaro from comment #6) > This introduced: > > [621/2299] Building CXX object > Source/JavaScriptCore/CMak...criptCore/unified-sources/UnifiedSource- > bfc896e1-12.cpp.o > In file included from > DerivedSources/JavaScriptCore/unified-sources/UnifiedSource-bfc896e1-12.cpp: > 5: > ../../Source/JavaScriptCore/dfg/DFGOperations.cpp: In function ‘char* > JSC::DFG::tierUpCommon(JSC::VM&, JSC::CallFrame*, JSC::BytecodeIndex, bool)’: > ../../Source/JavaScriptCore/dfg/DFGOperations.cpp:3861:20: warning: unused > variable ‘entryBlock’ [-Wunused-variable] > 3861 | if (CodeBlock* entryBlock = jitCode->osrEntryBlock()) { > | ^~~~~~~~~~ > > I'm not sure if this trivial fix would be correct: > > diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp > b/Source/JavaScriptCore/dfg/DFGOperations.cpp > index 85e74d17ece6..45fdcb24f68c 100644 > --- a/Source/JavaScriptCore/dfg/DFGOperations.cpp > +++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp > @@ -3858,7 +3858,7 @@ static char* tierUpCommon(VM& vm, CallFrame* > callFrame, BytecodeIndex originByte > } else > CODEBLOCK_LOG_EVENT(codeBlock, "delayFTLCompile", ("avoiding > replacement compile")); > > - if (CodeBlock* entryBlock = jitCode->osrEntryBlock()) { > + if (jitCode->osrEntryBlock()) { > if (jitCode->osrEntryRetry < Options::ftlOSREntryRetryThreshold()) { > CODEBLOCK_LOG_EVENT(codeBlock, "delayFTLCompile", ("OSR entry > failed, OSR entry threshold not met")); > jitCode->osrEntryRetry++; > > Maybe that condition is no longer needed at all now? That condition is required. if (jitCode->osrEntryBlock()) { is the right change. I'll land it as an unreviewed patch. 1720717 8 ysuzuki 2021-01-19 15:27:15 -0800 Committed r271624: <https://trac.webkit.org/changeset/271624> 417853 2021-01-18 17:20:39 -0800 2021-01-18 17:21:46 -0800 Patch bug-220718-20210118172038.patch text/plain 5543 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NmJlODE4ZjAzZTE5OTY1ZDliY2IwMmYxN2ZiNjUwYTRmMDk2YWI1Li42MzZiMjI2MmRjZTJlMWYz OWYwMTc1MWI4MGFlNjM3NDY3OTY3OGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMS0wMS0xOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEZUTDo6cHJlcGFyZU9TUkVudHJ5IGNhbiBjbGVhciBPU1IgZW50 cnkgQ29kZUJsb2NrIGlmIGl0IGlzIGFscmVhZHkgaW52YWxpZGF0ZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDcxOAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNzA1MjcwNjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRlRMOjpwcmVwYXJlT1NSRW50cnkgY2FuIGNsZWFyIE9TUiBlbnRyeSBDb2Rl QmxvY2sgaWYgaXQgaXMgYWxyZWFkeSBpbnZhbGlkYXRlZC4gSG93ZXZlciwgdGhlIGNhbGxlciBp cyBub3QgYXNzdW1pbmcgdGhhdCwKKyAgICAgICAgYW5kIGl0IGNhbGxzIGNsZWFyT1NSRW50cnlC bG9ja0FuZFJlc2V0VGhyZXNob2xkcyBhZ2Fpbi4gQW5kIGNsZWFyT1NSRW50cnlCbG9ja0FuZFJl c2V0VGhyZXNob2xkcydzIGFzc2VydGlvbiBoaXQuCisgICAgICAgIFRoaXMgcGF0Y2ggY29ycmVj dGx5IGhhbmRsZXMgdGhlIGludmFsaWRhdGVkIGNhc2UuCisKKyAgICAgICAgKiBkZmcvREZHSklU Q29kZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29kZTo6Y2xlYXJPU1JFbnRyeUJsb2Nr QW5kUmVzZXRUaHJlc2hvbGRzKToKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6Cisg ICAgICAgIChKU0M6OkRGRzo6dGllclVwQ29tbW9uKToKKwogMjAyMS0wMS0xOCAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcGxlV2luIDMyYml0XSBMTEludCBD IExvb3A6IExvd0xldmVsSW50ZXJwcmV0ZXIuY3BwKDkwLDcpOiBlcnJvciBDMjY1MzogJ1dlYkNv bmZpZyc6IGlzIG5vdCBhIGNsYXNzIG9yIG5hbWVzcGFjZSBuYW1lCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdKSVRDb2RlLmNwcAppbmRleCAwNGMxMzBmMWNjYzk3NTM1NTYwMDk2Mjg1YzI2 NTNjZTMxYzIwOGRlLi45Y2Y3MDJhYzBkNDBlMDJiYTdkNDQ4MGIyMzI1MjRjMGEzZDQwYWIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGUuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29kZS5jcHAKQEAgLTIwNCw5ICsyMDQs OCBAQCB2b2lkIEpJVENvZGU6OnNldE9TUkVudHJ5QmxvY2soVk0mIHZtLCBjb25zdCBKU0NlbGwq IG93bmVyLCBDb2RlQmxvY2sqIG9zckVudHJ5QgogfQogCiB2b2lkIEpJVENvZGU6OmNsZWFyT1NS RW50cnlCbG9ja0FuZFJlc2V0VGhyZXNob2xkcyhDb2RlQmxvY2sgKmRmZ0NvZGVCbG9jaykKLXsg Cit7CiAgICAgQVNTRVJUKG1fb3NyRW50cnlCbG9jayk7Ci0KICAgICBCeXRlY29kZUluZGV4IG9z ckVudHJ5Qnl0ZWNvZGUgPSBtX29zckVudHJ5QmxvY2stPmppdENvZGUoKS0+ZnRsRm9yT1NSRW50 cnkoKS0+Ynl0ZWNvZGVJbmRleCgpOwogICAgIG1fb3NyRW50cnlCbG9jay5jbGVhcigpOwogICAg IG9zckVudHJ5UmV0cnkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5jcHAKaW5kZXggMjVlZjMzMDViMTdiY2EwN2U2ZmIzMjhjN2Y4ZmQ0NzlkNGRjYTNiZS4u ODVlNzRkMTdlY2U2NjExYWY0NjZmNjM3YmU5OTc5NDQ3MmIwOTEzYyAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCkBAIC0zNzg1LDcgKzM3ODUsMTYgQEAg c3RhdGljIGNoYXIqIHRpZXJVcENvbW1vbihWTSYgdm0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBC eXRlY29kZUluZGV4IG9yaWdpbkJ5dGUKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQog Ci0gICAgYXV0byBmYWlsZWRPU1JFbnRyeSA9IFsmXSAoQ29kZUJsb2NrKiBlbnRyeUJsb2NrKSB7 CisgICAgYXV0byBmYWlsZWRPU1JFbnRyeSA9IFsmXSAoSklUQ29kZSogaml0Q29kZSkgeworICAg ICAgICBDb2RlQmxvY2sqIGVudHJ5QmxvY2sgPSBqaXRDb2RlLT5vc3JFbnRyeUJsb2NrKCk7Cisg ICAgICAgIGlmICghZW50cnlCbG9jaykgeworICAgICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVO VChjb2RlQmxvY2ssICJkZWxheUZUTENvbXBpbGUiLCAoIk9TUiBlbnRyeSBjb2RlIGlzIGFscmVh ZHkgaW52YWxpZGF0ZWQiKSk7CisgICAgICAgICAgICBjb2RlQmxvY2stPmJhc2VsaW5lVmVyc2lv bigpLT5jb3VudFJlb3B0aW1pemF0aW9uKCk7CisgICAgICAgICAgICAvLyBjbGVhck9TUkVudHJ5 QmxvY2tBbmRSZXNldFRocmVzaG9sZHMgaXMgYWxyZWFkeSBjYWxsZWQgaW4gRlRMOjpwcmVwYXJl T1NSRW50cnkgYW5kIGJlY2F1c2Ugb2YgdGhhdCwKKyAgICAgICAgICAgIC8vIGppdENvZGUtPm9z ckVudHJ5QmxvY2soKSBpcyBudWxscHRyLgorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Cisg ICAgICAgIH0KKwogICAgICAgICBGVEw6OkZvck9TUkVudHJ5SklUQ29kZSogZW50cnlDb2RlID0g ZW50cnlCbG9jay0+aml0Q29kZSgpLT5mdGxGb3JPU1JFbnRyeSgpOwogICAgICAgICBlbnRyeUNv ZGUtPmNvdW50RW50cnlGYWlsdXJlKCk7CiAgICAgICAgIGlmIChlbnRyeUNvZGUtPmVudHJ5RmFp bHVyZUNvdW50KCkgPApAQCAtMzgxNiw3ICszODI1LDcgQEAgc3RhdGljIGNoYXIqIHRpZXJVcENv bW1vbihWTSYgdm0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBCeXRlY29kZUluZGV4IG9yaWdpbkJ5 dGUKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRhZ0NvZGVQdHJXaXRoU3RhY2tQb2ludGVy Rm9ySklUQ2FsbCh1bnRhZ0NvZGVQdHI8Y2hhciosIEpTRW50cnlQdHJUYWc+KGFkZHJlc3MpLCBj YWxsRnJhbWUpOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIHJldHVybiBm YWlsZWRPU1JFbnRyeShlbnRyeUJsb2NrKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFpbGVk T1NSRW50cnkoaml0Q29kZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0z ODU4LDcgKzM4NjcsNyBAQCBzdGF0aWMgY2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZy YW1lKiBjYWxsRnJhbWUsIEJ5dGVjb2RlSW5kZXggb3JpZ2luQnl0ZQogICAgICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgICAgIH0KIAotICAgICAgICByZXR1cm4gZmFpbGVkT1NSRW50cnko ZW50cnlCbG9jayk7CisgICAgICAgIHJldHVybiBmYWlsZWRPU1JFbnRyeShqaXRDb2RlKTsKICAg ICB9CiAKICAgICAvLyBJdCdzIHRpbWUgdG8gdHJ5IHRvIGNvbXBpbGUgY29kZSBmb3IgT1NSIGVu dHJ5LgpAQCAtMzk1NSw3ICszOTY0LDcgQEAgc3RhdGljIGNoYXIqIHRpZXJVcENvbW1vbihWTSYg dm0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBCeXRlY29kZUluZGV4IG9yaWdpbkJ5dGUKICAgICBB U1NFUlQoY2FuT1NSRW50ZXJIZXJlKTsKICAgICB2b2lkKiBhZGRyZXNzID0gRlRMOjpwcmVwYXJl T1NSRW50cnkodm0sIGNhbGxGcmFtZSwgY29kZUJsb2NrLCBqaXRDb2RlLT5vc3JFbnRyeUJsb2Nr KCksIG9yaWdpbkJ5dGVjb2RlSW5kZXgsIHN0cmVhbUluZGV4KTsKICAgICBpZiAoIWFkZHJlc3Mp Ci0gICAgICAgIHJldHVybiBmYWlsZWRPU1JFbnRyeShqaXRDb2RlLT5vc3JFbnRyeUJsb2NrKCkp OworICAgICAgICByZXR1cm4gZmFpbGVkT1NSRW50cnkoaml0Q29kZSk7CiAgICAgcmV0dXJuIHRh Z0NvZGVQdHJXaXRoU3RhY2tQb2ludGVyRm9ySklUQ2FsbCh1bnRhZ0NvZGVQdHI8Y2hhciosIEpT RW50cnlQdHJUYWc+KGFkZHJlc3MpLCBjYWxsRnJhbWUpOwogfQogCmRpZmYgLS1naXQgYS9KU1Rl c3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE4MmQxODM3ZTFjZGNkYzk1 ZWM4Zjg2M2Y4ZGQ1NGI0ZDgwODZhMjguLjBlNjljZDE3ODZhNjE5ZDNiNGE4YTZlMzRjZGUzYjI3 MzBlODJlYjAgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMTggIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBbSlNDXSBGVEw6OnByZXBhcmVPU1JFbnRyeSBjYW4g Y2xlYXIgT1NSIGVudHJ5IENvZGVCbG9jayBpZiBpdCBpcyBhbHJlYWR5IGludmFsaWRhdGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3MTgKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNTI3MDY4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL2Z0bC1vc3ItZmFpbHVyZS1jbGVhci10 d2ljZS5qczogQWRkZWQuCisgICAgICAgIChmb28pOgorCiAyMDIxLTAxLTE4ICBZdXN1a2UgU3V6 dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gQWRkIGFub3RoZXIgdGVz dHMgZm9yIHIyNzE1NzEgcGFydCAzCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9mdGwtb3Ny LWZhaWx1cmUtY2xlYXItdHdpY2UuanMgYi9KU1Rlc3RzL3N0cmVzcy9mdGwtb3NyLWZhaWx1cmUt Y2xlYXItdHdpY2UuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmNiYzY4NTA4ZDIzMWUyNmVjMTM4YTk3M2E2M2Jm Zjk0ZjMxNDk0MQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL2Z0bC1vc3ItZmFp bHVyZS1jbGVhci10d2ljZS5qcwpAQCAtMCwwICsxLDE0IEBACisvL0AgcnVuRGVmYXVsdCgiLS1q aXRQb2xpY3lTY2FsZT0wIiwgIi0tb3NyRXhpdENvdW50Rm9yUmVvcHRpbWl6YXRpb249NDAiLCAi LS13YXRjaGRvZz01MDAiLCAiLS13YXRjaGRvZy1leGNlcHRpb24tb2siKQorZnVuY3Rpb24gZm9v KCkgeworICBjb25zdCB4cyA9ICd4Jy5yZXBlYXQoMTAwMCk7CisgIGZvciAobGV0IHggb2YgeHMp IHsKKyAgICBmb3IgKGxldCBpPTA7IGk8MTAwMDsgaSsrKSB7fQorICAgIHRyeSB7CisgICAgICB6 enoKKyAgICB9IGNhdGNoIHt9CisgIH0KK30KKworZm9yIChsZXQgaT0wOyBpPDEwMDsgaSsrKSB7 CisgIGZvbygpOworfQo= 417854 2021-01-18 17:21:48 -0800 2021-01-18 21:00:01 -0800 Patch bug-220718-20210118172147.patch text/plain 4780 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NmJlODE4ZjAzZTE5OTY1ZDliY2IwMmYxN2ZiNjUwYTRmMDk2YWI1Li45ODliN2JhMWYyOGMwYjNh M2QzM2Q2NTI3ZjFhOWFmY2Y1MThiYjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAyMS0wMS0xOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEZUTDo6cHJlcGFyZU9TUkVudHJ5IGNhbiBjbGVhciBPU1IgZW50 cnkgQ29kZUJsb2NrIGlmIGl0IGlzIGFscmVhZHkgaW52YWxpZGF0ZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDcxOAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNzA1MjcwNjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRlRMOjpwcmVwYXJlT1NSRW50cnkgY2FuIGNsZWFyIE9TUiBlbnRyeSBDb2Rl QmxvY2sgaWYgaXQgaXMgYWxyZWFkeSBpbnZhbGlkYXRlZC4gSG93ZXZlciwgdGhlIGNhbGxlciBp cyBub3QgYXNzdW1pbmcgdGhhdCwKKyAgICAgICAgYW5kIGl0IGNhbGxzIGNsZWFyT1NSRW50cnlC bG9ja0FuZFJlc2V0VGhyZXNob2xkcyBhZ2Fpbi4gQW5kIGNsZWFyT1NSRW50cnlCbG9ja0FuZFJl c2V0VGhyZXNob2xkcydzIGFzc2VydGlvbiBoaXQuCisgICAgICAgIFRoaXMgcGF0Y2ggY29ycmVj dGx5IGhhbmRsZXMgdGhlIGludmFsaWRhdGVkIGNhc2UuCisKKyAgICAgICAgKiBkZmcvREZHT3Bl cmF0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6dGllclVwQ29tbW9uKToKKwogMjAyMS0w MS0xOCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcGxlV2lu IDMyYml0XSBMTEludCBDIExvb3A6IExvd0xldmVsSW50ZXJwcmV0ZXIuY3BwKDkwLDcpOiBlcnJv ciBDMjY1MzogJ1dlYkNvbmZpZyc6IGlzIG5vdCBhIGNsYXNzIG9yIG5hbWVzcGFjZSBuYW1lCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAppbmRleCAyNWVmMzMw NWIxN2JjYTA3ZTZmYjMyOGM3ZjhmZDQ3OWQ0ZGNhM2JlLi44NWU3NGQxN2VjZTY2MTFhZjQ2NmY2 MzdiZTk5Nzk0NDcyYjA5MTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR09wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3Bl cmF0aW9ucy5jcHAKQEAgLTM3ODUsNyArMzc4NSwxNiBAQCBzdGF0aWMgY2hhciogdGllclVwQ29t bW9uKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEJ5dGVjb2RlSW5kZXggb3JpZ2luQnl0 ZQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBhdXRvIGZhaWxlZE9TUkVu dHJ5ID0gWyZdIChDb2RlQmxvY2sqIGVudHJ5QmxvY2spIHsKKyAgICBhdXRvIGZhaWxlZE9TUkVu dHJ5ID0gWyZdIChKSVRDb2RlKiBqaXRDb2RlKSB7CisgICAgICAgIENvZGVCbG9jayogZW50cnlC bG9jayA9IGppdENvZGUtPm9zckVudHJ5QmxvY2soKTsKKyAgICAgICAgaWYgKCFlbnRyeUJsb2Nr KSB7CisgICAgICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5RlRM Q29tcGlsZSIsICgiT1NSIGVudHJ5IGNvZGUgaXMgYWxyZWFkeSBpbnZhbGlkYXRlZCIpKTsKKyAg ICAgICAgICAgIGNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCktPmNvdW50UmVvcHRpbWl6YXRp b24oKTsKKyAgICAgICAgICAgIC8vIGNsZWFyT1NSRW50cnlCbG9ja0FuZFJlc2V0VGhyZXNob2xk cyBpcyBhbHJlYWR5IGNhbGxlZCBpbiBGVEw6OnByZXBhcmVPU1JFbnRyeSBhbmQgYmVjYXVzZSBv ZiB0aGF0LAorICAgICAgICAgICAgLy8gaml0Q29kZS0+b3NyRW50cnlCbG9jaygpIGlzIG51bGxw dHIuCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgfQorCiAgICAgICAgIEZU TDo6Rm9yT1NSRW50cnlKSVRDb2RlKiBlbnRyeUNvZGUgPSBlbnRyeUJsb2NrLT5qaXRDb2RlKCkt PmZ0bEZvck9TUkVudHJ5KCk7CiAgICAgICAgIGVudHJ5Q29kZS0+Y291bnRFbnRyeUZhaWx1cmUo KTsKICAgICAgICAgaWYgKGVudHJ5Q29kZS0+ZW50cnlGYWlsdXJlQ291bnQoKSA8CkBAIC0zODE2 LDcgKzM4MjUsNyBAQCBzdGF0aWMgY2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyYW1l KiBjYWxsRnJhbWUsIEJ5dGVjb2RlSW5kZXggb3JpZ2luQnl0ZQogICAgICAgICAgICAgICAgICAg ICByZXR1cm4gdGFnQ29kZVB0cldpdGhTdGFja1BvaW50ZXJGb3JKSVRDYWxsKHVudGFnQ29kZVB0 cjxjaGFyKiwgSlNFbnRyeVB0clRhZz4oYWRkcmVzcyksIGNhbGxGcmFtZSk7CiAgICAgICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhaWxlZE9TUkVudHJ5KGVudHJ5Qmxv Y2spOworICAgICAgICAgICAgICAgIHJldHVybiBmYWlsZWRPU1JFbnRyeShqaXRDb2RlKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAgLTM4NTgsNyArMzg2Nyw3IEBAIHN0YXRp YyBjaGFyKiB0aWVyVXBDb21tb24oVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGcmFtZSwgQnl0ZWNv ZGVJbmRleCBvcmlnaW5CeXRlCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAg fQogCi0gICAgICAgIHJldHVybiBmYWlsZWRPU1JFbnRyeShlbnRyeUJsb2NrKTsKKyAgICAgICAg cmV0dXJuIGZhaWxlZE9TUkVudHJ5KGppdENvZGUpOwogICAgIH0KIAogICAgIC8vIEl0J3MgdGlt ZSB0byB0cnkgdG8gY29tcGlsZSBjb2RlIGZvciBPU1IgZW50cnkuCkBAIC0zOTU1LDcgKzM5NjQs NyBAQCBzdGF0aWMgY2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRnJh bWUsIEJ5dGVjb2RlSW5kZXggb3JpZ2luQnl0ZQogICAgIEFTU0VSVChjYW5PU1JFbnRlckhlcmUp OwogICAgIHZvaWQqIGFkZHJlc3MgPSBGVEw6OnByZXBhcmVPU1JFbnRyeSh2bSwgY2FsbEZyYW1l LCBjb2RlQmxvY2ssIGppdENvZGUtPm9zckVudHJ5QmxvY2soKSwgb3JpZ2luQnl0ZWNvZGVJbmRl eCwgc3RyZWFtSW5kZXgpOwogICAgIGlmICghYWRkcmVzcykKLSAgICAgICAgcmV0dXJuIGZhaWxl ZE9TUkVudHJ5KGppdENvZGUtPm9zckVudHJ5QmxvY2soKSk7CisgICAgICAgIHJldHVybiBmYWls ZWRPU1JFbnRyeShqaXRDb2RlKTsKICAgICByZXR1cm4gdGFnQ29kZVB0cldpdGhTdGFja1BvaW50 ZXJGb3JKSVRDYWxsKHVudGFnQ29kZVB0cjxjaGFyKiwgSlNFbnRyeVB0clRhZz4oYWRkcmVzcyks IGNhbGxGcmFtZSk7CiB9CiAKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggMTgyZDE4MzdlMWNkY2RjOTVlYzhmODYzZjhkZDU0YjRkODA4NmEy OC4uMGU2OWNkMTc4NmE2MTlkM2I0YThhNmUzNGNkZTNiMjczMGU4MmViMCAxMDA2NDQKLS0tIGEv SlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAyMS0wMS0xOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgorCisgICAg ICAgIFtKU0NdIEZUTDo6cHJlcGFyZU9TUkVudHJ5IGNhbiBjbGVhciBPU1IgZW50cnkgQ29kZUJs b2NrIGlmIGl0IGlzIGFscmVhZHkgaW52YWxpZGF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDcxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzA1MjcwNjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzdHJlc3MvZnRsLW9zci1mYWlsdXJlLWNsZWFyLXR3aWNlLmpzOiBBZGRlZC4KKyAgICAg ICAgKGZvbyk6CisKIDIwMjEtMDEtMTggIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNv bT4KIAogICAgICAgICBbSlNDXSBBZGQgYW5vdGhlciB0ZXN0cyBmb3IgcjI3MTU3MSBwYXJ0IDMK ZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL2Z0bC1vc3ItZmFpbHVyZS1jbGVhci10d2ljZS5q cyBiL0pTVGVzdHMvc3RyZXNzL2Z0bC1vc3ItZmFpbHVyZS1jbGVhci10d2ljZS5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi42Y2JjNjg1MDhkMjMxZTI2ZWMxMzhhOTczYTYzYmZmOTRmMzE0OTQxCi0tLSAvZGV2L251 bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvZnRsLW9zci1mYWlsdXJlLWNsZWFyLXR3aWNlLmpzCkBA IC0wLDAgKzEsMTQgQEAKKy8vQCBydW5EZWZhdWx0KCItLWppdFBvbGljeVNjYWxlPTAiLCAiLS1v c3JFeGl0Q291bnRGb3JSZW9wdGltaXphdGlvbj00MCIsICItLXdhdGNoZG9nPTUwMCIsICItLXdh dGNoZG9nLWV4Y2VwdGlvbi1vayIpCitmdW5jdGlvbiBmb28oKSB7CisgIGNvbnN0IHhzID0gJ3gn LnJlcGVhdCgxMDAwKTsKKyAgZm9yIChsZXQgeCBvZiB4cykgeworICAgIGZvciAobGV0IGk9MDsg aTwxMDAwOyBpKyspIHt9CisgICAgdHJ5IHsKKyAgICAgIHp6egorICAgIH0gY2F0Y2gge30KKyAg fQorfQorCitmb3IgKGxldCBpPTA7IGk8MTAwOyBpKyspIHsKKyAgZm9vKCk7Cit9Cg==