187886 2018-07-21 19:07:09 -0700 runJITThreadLimitTests is failing 2018-07-24 22:30:03 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo tzagallo commit-queue ews-watchlist fujii keith_miller mark.lam msaboff ross.kirsling saam webkit-bug-importer oldest_to_newest 1444099 0 fpizlo 2018-07-21 19:07:09 -0700 I am going to skip it. 1444100 1 fpizlo 2018-07-21 19:08:17 -0700 Also, I think that configuring this by setting Options is not right, since it won't have an effect once any VM is started. Callers can't guarantee that no VM has started prior to any of their calls to those functions. I think it's better if those APIs talk to the Worklists directly, and shutdown/startup threads if they change the number of threads after the threads have started. 1444366 2 345596 tzagallo 2018-07-23 12:42:42 -0700 Created attachment 345596 Patch 1444370 3 345596 saam 2018-07-23 12:46:18 -0700 Comment on attachment 345596 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345596&action=review > Source/JavaScriptCore/dfg/DFGWorklist.cpp:538 > + return numberOfDFGCompilerThreads ?: Options::numberOfDFGCompilerThreads(); style nit: We don't use shorthand ternary operator style wise in WebKit AFAIK. So: return numberOfDFGCompilerThreads ? numberOfDFGCompilerThreads : Options::numberOfDFGCompilerThreads(); > Source/JavaScriptCore/dfg/DFGWorklist.cpp:543 > + return numberOfFTLCompilerThreads ?: Options::numberOfFTLCompilerThreads(); ditto 1444371 4 345596 fpizlo 2018-07-23 12:46:30 -0700 Comment on attachment 345596 Patch This doesn't appear to tell the worklists to shut down threads if they have already started them. 1444372 5 fpizlo 2018-07-23 12:47:33 -0700 (In reply to Saam Barati from comment #3) > Comment on attachment 345596 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=345596&action=review > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:538 > > + return numberOfDFGCompilerThreads ?: Options::numberOfDFGCompilerThreads(); > > style nit: We don't use shorthand ternary operator style wise in WebKit > AFAIK. So: > return numberOfDFGCompilerThreads ? numberOfDFGCompilerThreads : > Options::numberOfDFGCompilerThreads(); > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:543 > > + return numberOfFTLCompilerThreads ?: Options::numberOfFTLCompilerThreads(); > > ditto I didn't know about this shorthand! Any reason not to use it? I think it's OK to adopt new language functionality if we know that all of the compilers we use support it. I don't think we've ever explicitly said not to use this feature. 1444374 6 tzagallo 2018-07-23 12:49:30 -0700 (In reply to Filip Pizlo from comment #4) > Comment on attachment 345596 [details] > Patch > > This doesn't appear to tell the worklists to shut down threads if they have > already started them. That had already been handled in Workklist::setNumberOfThreads 1444382 7 saam 2018-07-23 13:04:20 -0700 (In reply to Filip Pizlo from comment #5) > (In reply to Saam Barati from comment #3) > > Comment on attachment 345596 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=345596&action=review > > > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:538 > > > + return numberOfDFGCompilerThreads ?: Options::numberOfDFGCompilerThreads(); > > > > style nit: We don't use shorthand ternary operator style wise in WebKit > > AFAIK. So: > > return numberOfDFGCompilerThreads ? numberOfDFGCompilerThreads : > > Options::numberOfDFGCompilerThreads(); > > > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:543 > > > + return numberOfFTLCompilerThreads ?: Options::numberOfFTLCompilerThreads(); > > > > ditto > > I didn't know about this shorthand! Any reason not to use it? I think it's > OK to adopt new language functionality if we know that all of the compilers > we use support it. I don't think we've ever explicitly said not to use this > feature. Seems like this is not standard C++, that would be the main reason we may want to stay away: https://stackoverflow.com/questions/34679692/ternary-operator-without-second-operand I'm not sure if we care if this is an extension or not though, if all our compilers support it... 1444691 8 345596 fpizlo 2018-07-24 08:33:55 -0700 Comment on attachment 345596 Patch r=me too after Tadeu explained it to me. 1444886 9 345596 commit-queue 2018-07-24 16:42:30 -0700 Comment on attachment 345596 Patch Clearing flags on attachment: 345596 Committed r234180: <https://trac.webkit.org/changeset/234180> 1444887 10 commit-queue 2018-07-24 16:42:32 -0700 All reviewed patches have been landed. Closing bug. 1444888 11 webkit-bug-importer 2018-07-24 16:43:27 -0700 <rdar://problem/42561966> 1444959 12 ross.kirsling 2018-07-24 21:23:12 -0700 (In reply to Saam Barati from comment #7) > (In reply to Filip Pizlo from comment #5) > > (In reply to Saam Barati from comment #3) > > > Comment on attachment 345596 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=345596&action=review > > > > > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:538 > > > > + return numberOfDFGCompilerThreads ?: Options::numberOfDFGCompilerThreads(); > > > > > > style nit: We don't use shorthand ternary operator style wise in WebKit > > > AFAIK. So: > > > return numberOfDFGCompilerThreads ? numberOfDFGCompilerThreads : > > > Options::numberOfDFGCompilerThreads(); > > > > > > > Source/JavaScriptCore/dfg/DFGWorklist.cpp:543 > > > > + return numberOfFTLCompilerThreads ?: Options::numberOfFTLCompilerThreads(); > > > > > > ditto > > > > I didn't know about this shorthand! Any reason not to use it? I think it's > > OK to adopt new language functionality if we know that all of the compilers > > we use support it. I don't think we've ever explicitly said not to use this > > feature. > > Seems like this is not standard C++, that would be the main reason we may > want to stay away: > > https://stackoverflow.com/questions/34679692/ternary-operator-without-second- > operand > > I'm not sure if we care if this is an extension or not though, if all our > compilers support it... MSVC does not support this syntax, so this patch broke WinCairo: https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Release%20%28Build%29/builds/2036/steps/compile-webkit/logs/stdio 1444968 13 fujii 2018-07-24 22:30:03 -0700 Committed r234190: <https://trac.webkit.org/changeset/234190> 345596 2018-07-23 12:42:42 -0700 2018-07-24 16:42:30 -0700 Patch bug-187886-20180723164240.patch text/plain 6730 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl Zjc5ZmZkYTQyMjFmMjlkYjE1Y2NhZGY2ZDk4M2E3MmIwZDg3YTg2Li4wMzVmMTM2YWI1OGZhMDJl MzRiMjlhNjVmODVkOTBhODdiOWI2YzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOC0wNy0yMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBEb24ndCBtb2RpZnkgT3B0aW9ucyB3aGVuIHNldHRpbmcgSklUIHRocmVh ZCBsaW1pdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4Nzg4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZpb3VzbHksIHdoZW4gc2V0dGluZyB0aGUgSklUIHRocmVhZCBsaW1pdCBwcmlvciB0byB0 aGUgd29ya2xpc3QKKyAgICAgICAgaW5pdGlhbGl6YXRpb24sIGl0J2QgYmUgc2V0IHZpYSBPcHRp b25zLCB3aGljaCBkaWRuJ3Qgd29yayBpZiBPcHRpb25zCisgICAgICAgIGhhZG4ndCBiZWVuIGlu aXRpYWxpemVkIHlldC4gQ2hhbmdlIGl0IHRvIHVzZSBhIHN0YXRpYyB2YXJpYWJsZSBpbiB0aGUK KyAgICAgICAgV29ya2xpc3QgaW5zdGVhZC4KKworICAgICAgICAqIEFQSS9KU1ZpcnR1YWxNYWNo aW5lLm1tOgorICAgICAgICAoK1tKU1ZpcnR1YWxNYWNoaW5lIHNldE51bWJlck9mREZHQ29tcGls ZXJUaHJlYWRzOl0pOgorICAgICAgICAoK1tKU1ZpcnR1YWxNYWNoaW5lIHNldE51bWJlck9mRlRM Q29tcGlsZXJUaHJlYWRzOl0pOgorICAgICAgICAqIEFQSS90ZXN0cy90ZXN0YXBpLm1tOgorICAg ICAgICAodGVzdE9iamVjdGl2ZUNBUElNYWluKToKKyAgICAgICAgKiBkZmcvREZHV29ya2xpc3Qu Y3BwOgorICAgICAgICAoSlNDOjpERkc6OmdldE51bWJlck9mREZHQ29tcGlsZXJUaHJlYWRzKToK KyAgICAgICAgKEpTQzo6REZHOjpnZXROdW1iZXJPZkZUTENvbXBpbGVyVGhyZWFkcyk6CisgICAg ICAgIChKU0M6OkRGRzo6c2V0TnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMpOgorICAgICAgICAo SlNDOjpERkc6OnNldE51bWJlck9mRlRMQ29tcGlsZXJUaHJlYWRzKToKKyAgICAgICAgKEpTQzo6 REZHOjplbnN1cmVHbG9iYWxERkdXb3JrbGlzdCk6CisgICAgICAgIChKU0M6OkRGRzo6ZW5zdXJl R2xvYmFsRlRMV29ya2xpc3QpOgorICAgICAgICAqIGRmZy9ERkdXb3JrbGlzdC5oOgorCiAyMDE4 LTA3LTIyICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAg IFtKU0NdIEdldEJ5SWRWYXJpYW50IGFuZCBJbkJ5SWRWYXJpYW50IGRvIG5vdCBuZWVkIHNsb3Qg YmFzZSBpZiB0aGV5IGFyZSBub3QgImhpdCIgdmFyaWFudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvSlNWaXJ0dWFsTWFjaGluZS5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9BUEkvSlNWaXJ0dWFsTWFjaGluZS5tbQppbmRleCBiY2M4Nzk0ODllNjI3MTZjNDI3MGVm ODY1OWY5NmM3MzQ1NjYzZDY2Li42NzJhMjYxZTRkMTZjMjFmZGQwNzk2NTFkYjVmY2ZjN2Y3YmM4 MDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmlydHVhbE1hY2hp bmUubW0KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1ZpcnR1YWxNYWNoaW5lLm1t CkBAIC0yODIsMTAgKzI4Miw4IEBAICsgKE5TVUludGVnZXIpc2V0TnVtYmVyT2ZERkdDb21waWxl clRocmVhZHM6KE5TVUludGVnZXIpbnVtYmVyT2ZUaHJlYWRzCiAgICAgSlNDOjpERkc6Oldvcmts aXN0KiB3b3JrbGlzdCA9IEpTQzo6REZHOjpleGlzdGluZ0dsb2JhbERGR1dvcmtsaXN0T3JOdWxs KCk7CiAgICAgaWYgKHdvcmtsaXN0KQogICAgICAgICByZXR1cm4gd29ya2xpc3QtPnNldE51bWJl ck9mVGhyZWFkcyhudW1iZXJPZlRocmVhZHMsIEpTQzo6T3B0aW9uczo6cHJpb3JpdHlEZWx0YU9m REZHQ29tcGlsZXJUaHJlYWRzKCkpOwotCi0gICAgYXV0byBjdXJyZW50TnVtYmVyT2ZUaHJlYWRz ID0gSlNDOjpPcHRpb25zOjpudW1iZXJPZkRGR0NvbXBpbGVyVGhyZWFkcygpOwotICAgIEpTQzo6 T3B0aW9uczo6bnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMoKSA9IG51bWJlck9mVGhyZWFkczsK LSAgICByZXR1cm4gY3VycmVudE51bWJlck9mVGhyZWFkczsKKyAgICBlbHNlCisgICAgICAgIHJl dHVybiBKU0M6OkRGRzo6c2V0TnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMobnVtYmVyT2ZUaHJl YWRzKTsKIH0KIAogKyAoTlNVSW50ZWdlcilzZXROdW1iZXJPZkZUTENvbXBpbGVyVGhyZWFkczoo TlNVSW50ZWdlciludW1iZXJPZlRocmVhZHMKQEAgLTI5MywxMCArMjkxLDggQEAgKyAoTlNVSW50 ZWdlcilzZXROdW1iZXJPZkZUTENvbXBpbGVyVGhyZWFkczooTlNVSW50ZWdlciludW1iZXJPZlRo cmVhZHMKICAgICBKU0M6OkRGRzo6V29ya2xpc3QqIHdvcmtsaXN0ID0gSlNDOjpERkc6OmV4aXN0 aW5nR2xvYmFsRlRMV29ya2xpc3RPck51bGwoKTsKICAgICBpZiAod29ya2xpc3QpCiAgICAgICAg IHJldHVybiB3b3JrbGlzdC0+c2V0TnVtYmVyT2ZUaHJlYWRzKG51bWJlck9mVGhyZWFkcywgSlND OjpPcHRpb25zOjpwcmlvcml0eURlbHRhT2ZGVExDb21waWxlclRocmVhZHMoKSk7Ci0KLSAgICBh dXRvIGN1cnJlbnROdW1iZXJPZlRocmVhZHMgPSBKU0M6Ok9wdGlvbnM6Om51bWJlck9mRlRMQ29t cGlsZXJUaHJlYWRzKCk7Ci0gICAgSlNDOjpPcHRpb25zOjpudW1iZXJPZkZUTENvbXBpbGVyVGhy ZWFkcygpID0gbnVtYmVyT2ZUaHJlYWRzOwotICAgIHJldHVybiBjdXJyZW50TnVtYmVyT2ZUaHJl YWRzOworICAgIGVsc2UKKyAgICAgICAgcmV0dXJuIEpTQzo6REZHOjpzZXROdW1iZXJPZkZUTENv bXBpbGVyVGhyZWFkcyhudW1iZXJPZlRocmVhZHMpOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKERG R19KSVQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL3Rlc3RzL3Rlc3Rh cGkubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL3Rlc3RzL3Rlc3RhcGkubW0KaW5kZXgg OTEwMGFkNGU4MzdlOTQxMjQ1ODcxNDBjYWI4NDQ4MDkwMzhhNTg5ZC4uYTE2NTRhZTExZTE5MWE2 NDkyYzU1MzY4ZDhlYmQwZDU2MTlkMThhMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL0FQSS90ZXN0cy90ZXN0YXBpLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkv dGVzdHMvdGVzdGFwaS5tbQpAQCAtNTU0LDEwICs1NTQsNyBAQCBzdGF0aWMgdm9pZCBydW5KSVRU aHJlYWRMaW1pdFRlc3RzKCkKIAogc3RhdGljIHZvaWQgdGVzdE9iamVjdGl2ZUNBUElNYWluKCkK IHsKLSAgICAvLyBGSVhNRTogTWFrZSB0aGlzIHdvcmsgYWdhaW4uCi0gICAgLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzg4NgotICAgIGlmIChmYWxzZSkKLSAg ICAgICAgcnVuSklUVGhyZWFkTGltaXRUZXN0cygpOworICAgIHJ1bkpJVFRocmVhZExpbWl0VGVz dHMoKTsKIAogICAgIEBhdXRvcmVsZWFzZXBvb2wgewogICAgICAgICBKU1ZpcnR1YWxNYWNoaW5l KiB2bSA9IFtbSlNWaXJ0dWFsTWFjaGluZSBhbGxvY10gaW5pdF07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCmluZGV4IDY4ZjZhYWNiYjY5NDE0ODUzYjBhNDZhZmIz ZjMwN2JkN2RmYzE1ZWYuLjhiNTA2YjcxNDhjOTMxOTViZjY1ODIwZGZiYzQ1MmEwMDdlMzAyZWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuY3BwCkBAIC01MzAsMTIg KzUzMCwzOCBAQCB1bnNpZ25lZCBXb3JrbGlzdDo6c2V0TnVtYmVyT2ZUaHJlYWRzKHVuc2lnbmVk IG51bWJlck9mVGhyZWFkcywgaW50IHJlbGF0aXZlUHJpbwogfQogCiBzdGF0aWMgV29ya2xpc3Qq IHRoZUdsb2JhbERGR1dvcmtsaXN0Oworc3RhdGljIHVuc2lnbmVkIG51bWJlck9mREZHQ29tcGls ZXJUaHJlYWRzOworc3RhdGljIHVuc2lnbmVkIG51bWJlck9mRlRMQ29tcGlsZXJUaHJlYWRzOwor CitzdGF0aWMgdW5zaWduZWQgZ2V0TnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMoKQoreworICAg IHJldHVybiBudW1iZXJPZkRGR0NvbXBpbGVyVGhyZWFkcyA/OiBPcHRpb25zOjpudW1iZXJPZkRG R0NvbXBpbGVyVGhyZWFkcygpOworfQorCitzdGF0aWMgdW5zaWduZWQgZ2V0TnVtYmVyT2ZGVExD b21waWxlclRocmVhZHMoKQoreworICAgIHJldHVybiBudW1iZXJPZkZUTENvbXBpbGVyVGhyZWFk cyA/OiBPcHRpb25zOjpudW1iZXJPZkZUTENvbXBpbGVyVGhyZWFkcygpOworfQorCit1bnNpZ25l ZCBzZXROdW1iZXJPZkRGR0NvbXBpbGVyVGhyZWFkcyh1bnNpZ25lZCBudW1iZXJPZlRocmVhZHMp Cit7CisgICAgYXV0byBwcmV2aW91c051bWJlck9mVGhyZWFkcyA9IGdldE51bWJlck9mREZHQ29t cGlsZXJUaHJlYWRzKCk7CisgICAgbnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMgPSBudW1iZXJP ZlRocmVhZHM7CisgICAgcmV0dXJuIHByZXZpb3VzTnVtYmVyT2ZUaHJlYWRzOworfQorCit1bnNp Z25lZCBzZXROdW1iZXJPZkZUTENvbXBpbGVyVGhyZWFkcyh1bnNpZ25lZCBudW1iZXJPZlRocmVh ZHMpCit7CisgICAgYXV0byBwcmV2aW91c051bWJlck9mVGhyZWFkcyA9IGdldE51bWJlck9mRlRM Q29tcGlsZXJUaHJlYWRzKCk7CisgICAgbnVtYmVyT2ZGVExDb21waWxlclRocmVhZHMgPSBudW1i ZXJPZlRocmVhZHM7CisgICAgcmV0dXJuIHByZXZpb3VzTnVtYmVyT2ZUaHJlYWRzOworfQogCiBX b3JrbGlzdCYgZW5zdXJlR2xvYmFsREZHV29ya2xpc3QoKQogewogICAgIHN0YXRpYyBzdGQ6Om9u Y2VfZmxhZyBpbml0aWFsaXplR2xvYmFsV29ya2xpc3RPbmNlRmxhZzsKICAgICBzdGQ6OmNhbGxf b25jZShpbml0aWFsaXplR2xvYmFsV29ya2xpc3RPbmNlRmxhZywgW10gewotICAgICAgICB0aGVH bG9iYWxERkdXb3JrbGlzdCA9ICZXb3JrbGlzdDo6Y3JlYXRlKCJERkcgV29ya2xpc3QiLCBPcHRp b25zOjpudW1iZXJPZkRGR0NvbXBpbGVyVGhyZWFkcygpLCBPcHRpb25zOjpwcmlvcml0eURlbHRh T2ZERkdDb21waWxlclRocmVhZHMoKSkubGVha1JlZigpOworICAgICAgICB0aGVHbG9iYWxERkdX b3JrbGlzdCA9ICZXb3JrbGlzdDo6Y3JlYXRlKCJERkcgV29ya2xpc3QiLCBnZXROdW1iZXJPZkRG R0NvbXBpbGVyVGhyZWFkcygpLCBPcHRpb25zOjpwcmlvcml0eURlbHRhT2ZERkdDb21waWxlclRo cmVhZHMoKSkubGVha1JlZigpOwogICAgIH0pOwogICAgIHJldHVybiAqdGhlR2xvYmFsREZHV29y a2xpc3Q7CiB9CkBAIC01NTEsNyArNTc3LDcgQEAgV29ya2xpc3QmIGVuc3VyZUdsb2JhbEZUTFdv cmtsaXN0KCkKIHsKICAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgaW5pdGlhbGl6ZUdsb2JhbFdv cmtsaXN0T25jZUZsYWc7CiAgICAgc3RkOjpjYWxsX29uY2UoaW5pdGlhbGl6ZUdsb2JhbFdvcmts aXN0T25jZUZsYWcsIFtdIHsKLSAgICAgICAgdGhlR2xvYmFsRlRMV29ya2xpc3QgPSAmV29ya2xp c3Q6OmNyZWF0ZSgiRlRMIFdvcmtsaXN0IiwgT3B0aW9uczo6bnVtYmVyT2ZGVExDb21waWxlclRo cmVhZHMoKSwgT3B0aW9uczo6cHJpb3JpdHlEZWx0YU9mRlRMQ29tcGlsZXJUaHJlYWRzKCkpLmxl YWtSZWYoKTsKKyAgICAgICAgdGhlR2xvYmFsRlRMV29ya2xpc3QgPSAmV29ya2xpc3Q6OmNyZWF0 ZSgiRlRMIFdvcmtsaXN0IiwgZ2V0TnVtYmVyT2ZGVExDb21waWxlclRocmVhZHMoKSwgT3B0aW9u czo6cHJpb3JpdHlEZWx0YU9mRlRMQ29tcGlsZXJUaHJlYWRzKCkpLmxlYWtSZWYoKTsKICAgICB9 KTsKICAgICByZXR1cm4gKnRoZUdsb2JhbEZUTFdvcmtsaXN0OwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3JrbGlzdC5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdXb3JrbGlzdC5oCmluZGV4IGIzMzgyMDc2ZjE4YmYxMTk1ZGM3ZGNhMjc1OWU1 OTFhODdhOGFlN2QuLmQ2ZTFmMTE1MjZkMzdhODM3MGRmMzMxNTk1Mjk0YTE5NWM4MTYxYzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV29ya2xpc3QuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmgKQEAgLTEyMiw2ICsxMjIsOSBA QCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fbnVtYmVyT2ZBY3RpdmVUaHJlYWRzOwogfTsKIAor SlNfRVhQT1JUX1BSSVZBVEUgdW5zaWduZWQgc2V0TnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMo dW5zaWduZWQpOworSlNfRVhQT1JUX1BSSVZBVEUgdW5zaWduZWQgc2V0TnVtYmVyT2ZGVExDb21w aWxlclRocmVhZHModW5zaWduZWQpOworCiAvLyBGb3IgREZHTW9kZSBjb21waWxhdGlvbnMuCiBK U19FWFBPUlRfUFJJVkFURSBXb3JrbGlzdCYgZW5zdXJlR2xvYmFsREZHV29ya2xpc3QoKTsKIEpT X0VYUE9SVF9QUklWQVRFIFdvcmtsaXN0KiBleGlzdGluZ0dsb2JhbERGR1dvcmtsaXN0T3JOdWxs KCk7Cg==