133090 2014-05-19 16:26:06 -0700 Take care of some ARM64 test failures 2014-05-21 03:11:52 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 133145 133149 1 fpizlo fpizlo barraclough clopez commit-queue ggaren mark.lam mhahnenberg msaboff oliver rniwa sam oldest_to_newest 1010330 0 fpizlo 2014-05-19 16:26:06 -0700 Patch forthcoming. 1010334 1 231734 fpizlo 2014-05-19 16:30:26 -0700 Created attachment 231734 the patch 1010335 2 commit-queue 2014-05-19 16:31:37 -0700 Attachment 231734 did not pass style-queue: ERROR: Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:2411: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1010336 3 fpizlo 2014-05-19 16:32:11 -0700 (In reply to comment #2) > Attachment 231734 [details] did not pass style-queue: > > > ERROR: Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:2411: Place brace on its own line for function definitions. [whitespace/braces] [4] > Total errors found: 1 in 7 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Fixed. 1010349 4 231734 mjs 2014-05-19 16:57:15 -0700 Comment on attachment 231734 the patch Is there a form of blinding that doesn't use the scratch register? If not, then maybe it should be folded into shouldBlind. Otherwise the code seems to be saying that we should but won't. 1010350 5 231734 mjs 2014-05-19 16:57:36 -0700 Comment on attachment 231734 the patch Is there a form of blinding that doesn't use the scratch register? If not, then maybe it should be folded into shouldBlind. Otherwise the code seems to be saying that we should but won't. 1010353 6 fpizlo 2014-05-19 17:00:23 -0700 (In reply to comment #5) > (From update of attachment 231734 [details]) > Is there a form of blinding that doesn't use the scratch register? If not, then maybe it should be folded into shouldBlind. Otherwise the code seems to be saying that we should but won't. Most forms of blinding don't require the scratch register. 1010362 7 231734 ggaren 2014-05-19 17:25:22 -0700 Comment on attachment 231734 the patch r=me 1010388 8 fpizlo 2014-05-19 18:54:47 -0700 Landed in http://trac.webkit.org/changeset/169092 1010732 9 clopez 2014-05-21 03:11:52 -0700 (In reply to comment #8) > Landed in http://trac.webkit.org/changeset/169092 This broke the script Tools/Scripts/run-jsc-stress-tests on Linux: "otool" is a Mac-only command Tracked here: https://bugs.webkit.org/show_bug.cgi?id=133145 231734 2014-05-19 16:30:26 -0700 2014-05-19 17:25:22 -0700 the patch blah.patch text/plain 8317 fpizlo SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvU3VuU3BpZGVyL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBQZXJmb3JtYW5jZVRlc3RzL1N1blNwaWRlci9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTA4MCkK KysrIFBlcmZvcm1hbmNlVGVzdHMvU3VuU3BpZGVyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDE0LTA1LTE5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5j b20+CisKKyAgICAgICAgVGFrZSBjYXJlIG9mIHNvbWUgQVJNNjQgdGVzdCBmYWlsdXJlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMDkwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwcm9maWxlci10 ZXN0LnlhbWw6IFNraXAgdGhlc2Ugb24gbm90LXg4Ni4KKwogMjAxNC0wMy0xNCAgTWFjaWVqIFN0 YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFJlcGxhY2UgIkFwcGxlIENvbXB1 dGVyLCBJbmMuIiB3aXRoICJBcHBsZSBJbmMuIiBpbiBjb3B5cmlnaHQgaGVhZGVycwpJbmRleDog UGVyZm9ybWFuY2VUZXN0cy9TdW5TcGlkZXIvcHJvZmlsZXItdGVzdC55YW1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFBlcmZvcm1hbmNlVGVzdHMvU3VuU3BpZGVyL3Byb2ZpbGVyLXRlc3QueWFtbAkocmV2aXNp b24gMTY5MDY1KQorKysgUGVyZm9ybWFuY2VUZXN0cy9TdW5TcGlkZXIvcHJvZmlsZXItdGVzdC55 YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTMg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTMsIDIw MTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCkBAIC0yNSw0ICsyNSw5IEBACiAjIHdpdGggdGhlIHJ1blByb2ZpbGVyIGNvbW1hbmQu CiAKIC0gcGF0aDogdGVzdHMvc3Vuc3BpZGVyLTEuMAotICBjbWQ6IHJ1blByb2ZpbGVyCisgIGNt ZDogfAorICAgICAgaWYgJGFyY2hpdGVjdHVyZSA9fiAveDg2LworICAgICAgICAgIHJ1blByb2Zp bGVyCisgICAgICBlbHNlCisgICAgICAgICAgc2tpcAorICAgICAgZW5kCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTA4MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wNS0xOSAg RmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgorCisgICAgICAgIFRha2UgY2FyZSBvZiBz b21lIEFSTTY0IHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzMzA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorICAgICAgICAKKyAgICAgICAgQ29uc3RhbnQgYmxpbmRpbmcgb24gQVJNNjQgY2Fubm90 IHVzZSB0aGUgc2NyYXRjaCByZWdpc3Rlci4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fz c2VtYmxlci5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6Y29udmVydEludDMyVG9E b3VibGUpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6YnJhbmNoUHRyKToKKyAgICAg ICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXI6OnN0b3JlUHRyKToKKyAgICAgICAgKEpTQzo6TWFjcm9B c3NlbWJsZXI6OnN0b3JlNjQpOgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TTY0Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OnNjcmF0Y2hSZWdpc3Rl ckZvckJsaW5kaW5nKToKKwogMjAxNC0wNS0xOSAgVGFuYXkgQyAgPHRhbmF5LmNAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgUmVtb3Zpbmcgc29tZSBjaGVjay13ZWJraXQtc3R5bGUgd2FybmluZ3Mg ZnJvbSAuL2RmZwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXIuaAkocmV2aXNpb24gMTY5MDY1KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTQwLDcg KzExNDAsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNvbnZlcnRJbnQzMlRvRG91YmxlKEltbTMy IGltbSwgRlBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBpZiAoc2hvdWxkQmxpbmQo aW1tKSkgeworICAgICAgICBpZiAoc2hvdWxkQmxpbmQoaW1tKSAmJiBoYXZlU2NyYXRjaFJlZ2lz dGVyRm9yQmxpbmRpbmcoKSkgewogICAgICAgICAgICAgUmVnaXN0ZXJJRCBzY3JhdGNoUmVnaXN0 ZXIgPSBzY3JhdGNoUmVnaXN0ZXJGb3JCbGluZGluZygpOwogICAgICAgICAgICAgbG9hZFhvckJs aW5kZWRDb25zdGFudCh4b3JCbGluZENvbnN0YW50KGltbSksIHNjcmF0Y2hSZWdpc3Rlcik7CiAg ICAgICAgICAgICBjb252ZXJ0SW50MzJUb0RvdWJsZShzY3JhdGNoUmVnaXN0ZXIsIGRlc3QpOwpA QCAtMTE3Niw3ICsxMTc2LDcgQEAgcHVibGljOgogCiAgICAgSnVtcCBicmFuY2hQdHIoUmVsYXRp b25hbENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIGxlZnQsIEltbVB0ciByaWdodCkKICAgICB7 Ci0gICAgICAgIGlmIChzaG91bGRCbGluZChyaWdodCkpIHsKKyAgICAgICAgaWYgKHNob3VsZEJs aW5kKHJpZ2h0KSAmJiBoYXZlU2NyYXRjaFJlZ2lzdGVyRm9yQmxpbmRpbmcoKSkgewogICAgICAg ICAgICAgUmVnaXN0ZXJJRCBzY3JhdGNoUmVnaXN0ZXIgPSBzY3JhdGNoUmVnaXN0ZXJGb3JCbGlu ZGluZygpOwogICAgICAgICAgICAgbG9hZFJvdGF0aW9uQmxpbmRlZENvbnN0YW50KHJvdGF0aW9u QmxpbmRDb25zdGFudChyaWdodCksIHNjcmF0Y2hSZWdpc3Rlcik7CiAgICAgICAgICAgICByZXR1 cm4gYnJhbmNoUHRyKGNvbmQsIGxlZnQsIHNjcmF0Y2hSZWdpc3Rlcik7CkBAIC0xMTg2LDcgKzEx ODYsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzdG9yZVB0cihJbW1QdHIgaW1tLCBBZGRy ZXNzIGRlc3QpCiAgICAgewotICAgICAgICBpZiAoc2hvdWxkQmxpbmQoaW1tKSkgeworICAgICAg ICBpZiAoc2hvdWxkQmxpbmQoaW1tKSAmJiBoYXZlU2NyYXRjaFJlZ2lzdGVyRm9yQmxpbmRpbmco KSkgewogICAgICAgICAgICAgUmVnaXN0ZXJJRCBzY3JhdGNoUmVnaXN0ZXIgPSBzY3JhdGNoUmVn aXN0ZXJGb3JCbGluZGluZygpOwogICAgICAgICAgICAgbG9hZFJvdGF0aW9uQmxpbmRlZENvbnN0 YW50KHJvdGF0aW9uQmxpbmRDb25zdGFudChpbW0pLCBzY3JhdGNoUmVnaXN0ZXIpOwogICAgICAg ICAgICAgc3RvcmVQdHIoc2NyYXRjaFJlZ2lzdGVyLCBkZXN0KTsKQEAgLTExOTYsNyArMTE5Niw3 IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc3RvcmU2NChJbW02NCBpbW0sIEFkZHJlc3MgZGVzdCkK ICAgICB7Ci0gICAgICAgIGlmIChzaG91bGRCbGluZChpbW0pKSB7CisgICAgICAgIGlmIChzaG91 bGRCbGluZChpbW0pICYmIGhhdmVTY3JhdGNoUmVnaXN0ZXJGb3JCbGluZGluZygpKSB7CiAgICAg ICAgICAgICBSZWdpc3RlcklEIHNjcmF0Y2hSZWdpc3RlciA9IHNjcmF0Y2hSZWdpc3RlckZvckJs aW5kaW5nKCk7CiAgICAgICAgICAgICBsb2FkUm90YXRpb25CbGluZGVkQ29uc3RhbnQocm90YXRp b25CbGluZENvbnN0YW50KGltbSksIHNjcmF0Y2hSZWdpc3Rlcik7CiAgICAgICAgICAgICBzdG9y ZTY0KHNjcmF0Y2hSZWdpc3RlciwgZGVzdCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAkocmV2aXNpb24gMTY5 MDY1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TTY0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI0MDgsNyArMjQwOCwxMSBAQCBwdWJsaWM6CiAgICAg ICAgIHJldHVybiBBUk02NEFzc2VtYmxlcjo6bWF4SnVtcFJlcGxhY2VtZW50U2l6ZSgpOwogICAg IH0KIAotICAgIFJlZ2lzdGVySUQgc2NyYXRjaFJlZ2lzdGVyRm9yQmxpbmRpbmcoKSB7IHJldHVy biBnZXRDYWNoZWREYXRhVGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCk7IH0KKyAgICBSZWdp c3RlcklEIHNjcmF0Y2hSZWdpc3RlckZvckJsaW5kaW5nKCkgeworICAgICAgICAvLyBXZSAqZG8g bm90KiBoYXZlIGEgc2NyYXRjaCByZWdpc3RlciBmb3IgYmxpbmRpbmcuCisgICAgICAgIFJFTEVB U0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBnZXRDYWNoZWREYXRhVGVt cFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCk7CisgICAgfQogCiAgICAgc3RhdGljIGJvb2wgY2Fu SnVtcFJlcGxhY2VQYXRjaGFibGVCcmFuY2hQdHJXaXRoUGF0Y2goKSB7IHJldHVybiBmYWxzZTsg fQogICAgIHN0YXRpYyBib29sIGNhbkp1bXBSZXBsYWNlUGF0Y2hhYmxlQnJhbmNoMzJXaXRoUGF0 Y2goKSB7IHJldHVybiBmYWxzZTsgfQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5MDgwKQorKysgVG9vbHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTQtMDUtMTkgIEZpbGlwIFBpemxv ICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICBUYWtlIGNhcmUgb2Ygc29tZSBBUk02NCB0 ZXN0IGZhaWx1cmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzMwOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHM6IE1ha2UgaXQgZWFzaWVyIHRvIGNv bmRpdGlvbmFsbHkgc2tpcCB0aGluZ3MuCisKIDIwMTQtMDUtMTkgIERhdmlkIEZhcmxlciAgPGRm YXJsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIERhc2hib2FyZDogT3BlblNvdXJjZSByZXZpc2lv biBrZXkgY2hhbmdlZCBmcm9tIFdlYktpdE9wZW5Tb3VyY2UgdG8gV2ViS2l0CkluZGV4OiBUb29s cy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMJKHJldmlzaW9uIDE2OTA2NSkKKysrIFRvb2xzL1Njcmlw dHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTE3Niw2ICsxNzYsNDAg QEAgdW5sZXNzICRqc2NQYXRoCiAgICAgZXhpdCAxCiBlbmQKIAorIyBUcnkgdG8gZGV0ZXJtaW5l IGFyY2hpdGVjdHVyZS4gUmV0dXJuIG5pbCBvbiBmYWlsdXJlLgorZGVmIG1hY2hPQXJjaGl0ZWN0 dXJlQ29kZQorICAgIG90b29sTGluZXMgPSBgb3Rvb2wgLWFTZmggI3tTaGVsbHdvcmRzLnNoZWxs ZXNjYXBlKCRqc2NQYXRoLnRvX3MpfWAuc3BsaXQoIlxuIikKKyAgICBvdG9vbExpbmVzLmVhY2hf d2l0aF9pbmRleCB7CisgICAgICAgIHwgdmFsdWUsIGluZGV4IHwKKyAgICAgICAgaWYgdmFsdWUg PX4gL21hZ2ljLyBhbmQgdmFsdWUgPX4gL2NwdXR5cGUvCisgICAgICAgICAgICByZXR1cm4gb3Rv b2xMaW5lc1tpbmRleCArIDFdLnNwbGl0WzFdLnRvX2kKKyAgICAgICAgZW5kCisgICAgfQorICAg ICRzdGRlcnIucHV0cyAiV2FybmluZzogdW5hYmxlIHRvIGRldGVybWluZSBhcmNoaXRlY3R1cmUu IgorICAgIG5pbAorZW5kCisKK2RlZiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKKyAgICBjb2RlID0g bWFjaE9BcmNoaXRlY3R1cmVDb2RlCisgICAgcmV0dXJuIG5pbCB1bmxlc3MgY29kZQorICAgIGlz NjRCaXRGbGFnID0gMHgwMTAwMDAwMAorICAgIGNhc2UgY29kZQorICAgIHdoZW4gNworICAgICAg ICAieDg2IgorICAgIHdoZW4gNyB8IGlzNjRCaXRGbGFnCisgICAgICAgICJ4ODYtNjQiCisgICAg d2hlbiAxMgorICAgICAgICAiYXJtIgorICAgIHdoZW4gMTIgfCBpczY0Qml0RmxhZworICAgICAg ICAiYXJtNjQiCisgICAgZWxzZQorICAgICAgICAkc3RkZXJyLnB1dHMgIldhcm5pbmc6IHVuYWJs ZSB0byBkZXRlcm1pbmUgYXJjaGl0ZWN0dXJlIGZyb20gY29kZTogI3tjb2RlfSIKKyAgICAgICAg bmlsCisgICAgZW5kCitlbmQKKworJGFyY2hpdGVjdHVyZSA9IGRldGVybWluZUFyY2hpdGVjdHVy ZQorCiAkbnVtRmFpbHVyZXMgPSAwCiAKIEVBR0VSX09QVElPTlMgPSBbIi0tdGhyZXNob2xkRm9y SklUQWZ0ZXJXYXJtVXA9MTAiLCAiLS10aHJlc2hvbGRGb3JKSVRTb29uPTEwIiwgIi0tdGhyZXNo b2xkRm9yT3B0aW1pemVBZnRlcldhcm1VcD0yMCIsICItLXRocmVzaG9sZEZvck9wdGltaXplQWZ0 ZXJMb25nV2FybVVwPTIwIiwgIi0tdGhyZXNob2xkRm9yT3B0aW1pemVTb29uPTIwIiwgIi0tdGhy ZXNob2xkRm9yRlRMT3B0aW1pemVBZnRlcldhcm1VcD0yMCIsICItLXRocmVzaG9sZEZvckZUTE9w dGltaXplU29vbj0yMCJdCkBAIC00NzgsNiArNTEyLDcgQEAgZGVmIGJhc2VPdXRwdXROYW1lKGtp bmQpCiBlbmQKIAogZGVmIGFkZFJ1bkNvbW1hbmQoa2luZCwgY29tbWFuZCwgb3V0cHV0SGFuZGxl ciwgZXJyb3JIYW5kbGVyKQorICAgICRkaWRBZGRSdW5Db21tYW5kID0gdHJ1ZQogICAgIHBsYW4g PSBQbGFuLm5ldygkYmVuY2htYXJrRGlyZWN0b3J5LCBjb21tYW5kLCBiYXNlT3V0cHV0TmFtZShr aW5kKSwgb3V0cHV0SGFuZGxlciwgZXJyb3JIYW5kbGVyKQogICAgIGlmICRudW1Qcm9jZXNzb3Jz ID4gMSBhbmQgJHJ1bkNvbW1hbmRPcHRpb25zWzppc1Nsb3ddCiAgICAgICAgICRydW5saXN0LnVu c2hpZnQgcGxhbgpAQCAtNDkwLDcgKzUyNSw4IEBAIGVuZAogIyAkYmVuY2htYXJrKSwgaW4gd2hp Y2ggY2FzZSB0aG9zZSBydW4gY29tbWFuZHMgaGF2ZSBhbHJlYWR5IGJlZW4gZXhlY3V0ZWQuIE90 aGVyd2lzZQogIyByZXR1cm5zIGZhbHNlLCBpbiB3aGljaCBjYXNlIHlvdSdyZSBzdXBwb3NlZCB0 byBhZGQgeW91ciBvd24gcnVuIGNvbW1hbmRzLgogZGVmIHBhcnNlUnVuQ29tbWFuZHMKLSAgICBk aWRSdW4gPSBmYWxzZQorICAgIG9sZERpZEFkZFJ1bkNvbW1hbmQgPSAkZGlkQWRkUnVuQ29tbWFu ZAorICAgICRkaWRBZGRSdW5Db21tYW5kID0gZmFsc2UKIAogICAgIERpci5jaGRpcigkb3V0cHV0 RGlyKSB7CiAgICAgICAgIEZpbGUub3BlbigkYmVuY2htYXJrRGlyZWN0b3J5ICsgJGJlbmNobWFy aykgewpAQCAtNTA2LDEyICs1NDIsMTMgQEAgZGVmIHBhcnNlUnVuQ29tbWFuZHMKICAgICAgICAg ICAgICAgICBlbmQKICAgICAgICAgICAgICAgICBuZXh0IHVubGVzcyBkb2VzTWF0Y2gKICAgICAg ICAgICAgICAgICBldmFsICR+LnBvc3RfbWF0Y2gKLSAgICAgICAgICAgICAgICBkaWRSdW4gPSB0 cnVlCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBkaWRSdW4KKyAgICBy ZXN1bHQgPSAkZGlkQWRkUnVuQ29tbWFuZAorICAgICRkaWRBZGRSdW5Db21tYW5kID0gcmVzdWx0 IG9yIG9sZERpZEFkZFJ1bkNvbW1hbmQKKyAgICByZXN1bHQKIGVuZAogCiBkZWYgc2xvdyEKQEAg LTc5Nyw2ICs4MzQsNyBAQCBkZWYgZGVmYXVsdFJ1bk1vemlsbGFUZXN0KG1vZGUsICpleHRyYUZp CiBlbmQKIAogZGVmIHNraXAKKyAgICAkZGlkQWRkUnVuQ29tbWFuZCA9IHRydWUKICAgICBwdXRz ICJTa2lwcGluZyAjeyRjb2xsZWN0aW9uTmFtZX0vI3skYmVuY2htYXJrfSIKIGVuZAogCg==