157584 2016-05-11 13:31:18 -0700 Beef up JSC profiler event log 2016-05-11 14:41:28 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1192062 0 fpizlo 2016-05-11 13:31:18 -0700 Also log more about compilation. 1192070 1 278663 fpizlo 2016-05-11 13:47:52 -0700 Created attachment 278663 the patch 1192073 2 commit-queue 2016-05-11 13:50:09 -0700 Attachment 278663 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGPlan.cpp:225: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1192090 3 278663 saam 2016-05-11 14:33:42 -0700 Comment on attachment 278663 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=278663&action=review r=me > Source/JavaScriptCore/dfg/DFGPlan.cpp:222 > + RELEASE_ASSERT_NOT_REACHED(); Do we need that stupid COMPILE_QUIRK(...) thingy here? 1192091 4 fpizlo 2016-05-11 14:34:57 -0700 (In reply to comment #3) > Comment on attachment 278663 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=278663&action=review > > r=me > > > Source/JavaScriptCore/dfg/DFGPlan.cpp:222 > > + RELEASE_ASSERT_NOT_REACHED(); > > Do we need that stupid COMPILE_QUIRK(...) thingy here? No because I unconditionally initialized the variable to null. 1192096 5 fpizlo 2016-05-11 14:41:28 -0700 Landed in http://trac.webkit.org/changeset/200705 278663 2016-05-11 13:47:52 -0700 2016-05-11 14:33:42 -0700 the patch blah.patch text/plain 11040 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwNzAwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE2LTA1LTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QmVlZiB1cCBKU0MgcHJvZmlsZXIgZXZlbnQgbG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEFsc28gbG9nIG1vcmUgYWJvdXQgY29tcGls YXRpb24uCisKKyAgICAgICAgKiBieXRlY29kZS9FeGVjdXRpb25Db3VudGVyLmNwcDogQ2hhbmdl ZCB0aGUgbWVhbmluZyBvZiBjb2RlQmxvY2sgdG8gYmUgdGhlIGNvZGVCbG9jayB0aGF0IGlzIGRv aW5nIHRoZSBwcm9maWxpbmcuIFRoaXMgd2lsbCBub3cgZ2V0IHRoZSBiYXNlbGluZSB2ZXJzaW9u IGlmIGl0IG5lZWRzIGl0LiBUaGlzIGlzIG5lZWRlZCBmb3IgbG9nZ2luZyB0aGUgdGhyZXNob2xk IGNoZWNraW5nIGV2ZW50LgorICAgICAgICAoSlNDOjphcHBseU1lbW9yeVVzYWdlSGV1cmlzdGlj cyk6CisgICAgICAgIChKU0M6OkV4ZWN1dGlvbkNvdW50ZXI8Y291bnRpbmdWYXJpYW50Pjo6aGFz Q3Jvc3NlZFRocmVzaG9sZCk6CisgICAgICAgICogZGZnL0RGR0pJVENvZGUuY3BwOiBQYXNzIHRo ZSByaWdodCBjb2RlQmxvY2suCisgICAgICAgIChKU0M6OkRGRzo6SklUQ29kZTo6Y2hlY2tJZk9w dGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQpOgorICAgICAgICAoSlNDOjpERkc6OkpJVENvZGU6 Om9wdGltaXplTmV4dEludm9jYXRpb24pOgorICAgICAgICAoSlNDOjpERkc6OkpJVENvZGU6OmRv bnRPcHRpbWl6ZUFueXRpbWVTb29uKToKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb2RlOjpvcHRp bWl6ZVNvb24pOgorICAgICAgICAoSlNDOjpERkc6OkpJVENvZGU6OmZvcmNlT3B0aW1pemF0aW9u U2xvd1BhdGhDb25jdXJyZW50bHkpOgorICAgICAgICAqIGRmZy9ERkdQbGFuLmNwcDogTG9nIHRo aW5ncyBhYm91dCBjb21waWxlIHRpbWVzIGFuZCB3aGV0aGVyIHRoZSBjb21waWxlciBzdWNjZWVk ZWQgb3IgZmFpbGVkLgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OmNvbXB1dGVDb21waWxlVGlt ZXMpOgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OnJlcG9ydENvbXBpbGVUaW1lcyk6CisgICAg ICAgIChKU0M6OkRGRzo6UGxhbjo6Y29tcGlsZUluVGhyZWFkKToKKyAgICAgICAgKEpTQzo6REZH OjpQbGFuOjpmaW5hbGl6ZVdpdGhvdXROb3RpZnlpbmdDYWxsYmFjayk6CisgICAgICAgICogaml0 L0V4ZWN1dGFibGVBbGxvY2F0b3JGaXhlZFZNUG9vbC5jcHA6IE1ha2UgaXQgcG9zc2libGUgdG8g bG9vayBhdCBtZW1vcnkgdXNhZ2UsIHRob3VnaCBzZXBhcmF0ZWx5IGZyb20gdGhlIGxvZywgZm9y IG5vdy4KKyAgICAgICAgKEpTQzo6RXhlY3V0YWJsZUFsbG9jYXRvcjo6YWxsb2NhdGUpOgorICAg ICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorCiAyMDE2LTA1LTExICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSBlcnJvciBtZXNzYWdlcyBm b3IgYWNjZXNzaW5nIGFyZ3VtZW50cy5jYWxsZWUgYW5kIHNpbWlsYXIgZ2V0dGVycyBpbiBzdHJp Y3QgbW9kZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0V4ZWN1dGlvbkNv dW50ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9F eGVjdXRpb25Db3VudGVyLmNwcAkocmV2aXNpb24gMjAwNjQ3KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0V4ZWN1dGlvbkNvdW50ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMiwgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTQsIDIwMTYgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiQ29kZUJsb2NrLmgiCiAjaW5jbHVkZSAi RXhlY3V0YWJsZUFsbG9jYXRvci5oIgogI2luY2x1ZGUgIkpTQ0lubGluZXMuaCIKKyNpbmNsdWRl ICJWTUlubGluZXMuaCIKICNpbmNsdWRlIDx3dGYvU3RyaW5nRXh0cmFzLmg+CiAKIG5hbWVzcGFj ZSBKU0MgewpAQCAtNzgsNyArNzksNyBAQCBkb3VibGUgYXBwbHlNZW1vcnlVc2FnZUhldXJpc3Rp Y3MoaW50MzJfCiAjaWYgRU5BQkxFKEpJVCkKICAgICBkb3VibGUgbXVsdGlwbGllciA9CiAgICAg ICAgIEV4ZWN1dGFibGVBbGxvY2F0b3I6Om1lbW9yeVByZXNzdXJlTXVsdGlwbGllcigKLSAgICAg ICAgICAgIGNvZGVCbG9jay0+cHJlZGljdGVkTWFjaGluZUNvZGVTaXplKCkpOworICAgICAgICAg ICAgY29kZUJsb2NrLT5iYXNlbGluZUFsdGVybmF0aXZlKCktPnByZWRpY3RlZE1hY2hpbmVDb2Rl U2l6ZSgpKTsKICNlbHNlCiAgICAgLy8gVGhpcyBjb2RlIHBhdGggd2lsbCBwcm9iYWJseSBub3Qg YmUgdGFrZW4sIGJ1dCBpZiBpdCBpcywgd2UgZmFrZSBpdC4KICAgICBkb3VibGUgbXVsdGlwbGll ciA9IDEuMDsKQEAgLTEyMyw5ICsxMjQsMTUgQEAgYm9vbCBFeGVjdXRpb25Db3VudGVyPGNvdW50 aW5nVmFyaWFudD46OgogICAgIAogICAgIGRvdWJsZSBtb2RpZmllZFRocmVzaG9sZCA9IGFwcGx5 TWVtb3J5VXNhZ2VIZXVyaXN0aWNzKG1fYWN0aXZlVGhyZXNob2xkLCBjb2RlQmxvY2spOwogICAg IAotICAgIHJldHVybiBzdGF0aWNfY2FzdDxkb3VibGU+KG1fdG90YWxDb3VudCkgKyBtX2NvdW50 ZXIgPj0KLSAgICAgICAgbW9kaWZpZWRUaHJlc2hvbGQgLSBzdGF0aWNfY2FzdDxkb3VibGU+KAot ICAgICAgICAgICAgc3RkOjptaW4obV9hY3RpdmVUaHJlc2hvbGQsIG1heGltdW1FeGVjdXRpb25D b3VudHNCZXR3ZWVuQ2hlY2twb2ludHMoKSkpIC8gMjsKKyAgICBkb3VibGUgYWN0dWFsQ291bnQg PSBzdGF0aWNfY2FzdDxkb3VibGU+KG1fdG90YWxDb3VudCkgKyBtX2NvdW50ZXI7CisgICAgZG91 YmxlIGRlc2lyZWRDb3VudCA9IG1vZGlmaWVkVGhyZXNob2xkIC0gc3RhdGljX2Nhc3Q8ZG91Ymxl PigKKyAgICAgICAgc3RkOjptaW4obV9hY3RpdmVUaHJlc2hvbGQsIG1heGltdW1FeGVjdXRpb25D b3VudHNCZXR3ZWVuQ2hlY2twb2ludHMoKSkpIC8gMjsKKyAgICAKKyAgICBib29sIHJlc3VsdCA9 IGFjdHVhbENvdW50ID49IGRlc2lyZWRDb3VudDsKKyAgICAKKyAgICBDT0RFQkxPQ0tfTE9HX0VW RU5UKGNvZGVCbG9jaywgInRocmVzaG9sZENoZWNrIiwgKCJhY3RpdmVUaHJlc2hvbGQgPSAiLCBt X2FjdGl2ZVRocmVzaG9sZCwgIiwgbW9kaWZpZWRUaHJlc2hvbGQgPSAiLCBtb2RpZmllZFRocmVz aG9sZCwgIiwgYWN0dWFsQ291bnQgPSAiLCBhY3R1YWxDb3VudCwgIiwgZGVzaXJlZENvdW50ID0g IiwgZGVzaXJlZENvdW50KSk7CisgICAgCisgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAogdGVtcGxh dGU8Q291bnRpbmdWYXJpYW50IGNvdW50aW5nVmFyaWFudD4KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHSklUQ29kZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdKSVRDb2RlLmNwcAkocmV2aXNpb24gMjAwNjQ3KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIzLDcg KzEyMyw3IEBAIFJlZ2lzdGVyU2V0IEpJVENvZGU6OmxpdmVSZWdpc3RlcnNUb1ByZXMKIGJvb2wg SklUQ29kZTo6Y2hlY2tJZk9wdGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQoQ29kZUJsb2NrKiBj b2RlQmxvY2spCiB7CiAgICAgQVNTRVJUKGNvZGVCbG9jay0+aml0VHlwZSgpID09IEpJVENvZGU6 OkRGR0pJVCk7Ci0gICAgcmV0dXJuIHRpZXJVcENvdW50ZXIuY2hlY2tJZlRocmVzaG9sZENyb3Nz ZWRBbmRTZXQoY29kZUJsb2NrLT5iYXNlbGluZVZlcnNpb24oKSk7CisgICAgcmV0dXJuIHRpZXJV cENvdW50ZXIuY2hlY2tJZlRocmVzaG9sZENyb3NzZWRBbmRTZXQoY29kZUJsb2NrKTsKIH0KIAog dm9pZCBKSVRDb2RlOjpvcHRpbWl6ZU5leHRJbnZvY2F0aW9uKENvZGVCbG9jayogY29kZUJsb2Nr KQpAQCAtMTMxLDcgKzEzMSw3IEBAIHZvaWQgSklUQ29kZTo6b3B0aW1pemVOZXh0SW52b2NhdGlv bihDb2QKICAgICBBU1NFUlQoY29kZUJsb2NrLT5qaXRUeXBlKCkgPT0gSklUQ29kZTo6REZHSklU KTsKICAgICBpZiAoT3B0aW9uczo6dmVyYm9zZU9TUigpKQogICAgICAgICBkYXRhTG9nKCpjb2Rl QmxvY2ssICI6IEZUTC1vcHRpbWl6aW5nIG5leHQgaW52b2NhdGlvbi5cbiIpOwotICAgIHRpZXJV cENvdW50ZXIuc2V0TmV3VGhyZXNob2xkKDAsIGNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCkp OworICAgIHRpZXJVcENvdW50ZXIuc2V0TmV3VGhyZXNob2xkKDAsIGNvZGVCbG9jayk7CiB9CiAK IHZvaWQgSklUQ29kZTo6ZG9udE9wdGltaXplQW55dGltZVNvb24oQ29kZUJsb2NrKiBjb2RlQmxv Y2spCkBAIC0xNjEsNyArMTYxLDcgQEAgdm9pZCBKSVRDb2RlOjpvcHRpbWl6ZVNvb24oQ29kZUJs b2NrKiBjbwogICAgIENvZGVCbG9jayogYmFzZWxpbmUgPSBjb2RlQmxvY2stPmJhc2VsaW5lVmVy c2lvbigpOwogICAgIHRpZXJVcENvdW50ZXIuc2V0TmV3VGhyZXNob2xkKAogICAgICAgICBiYXNl bGluZS0+YWRqdXN0ZWRDb3VudGVyVmFsdWUoT3B0aW9uczo6dGhyZXNob2xkRm9yRlRMT3B0aW1p emVTb29uKCkpLAotICAgICAgICBiYXNlbGluZSk7CisgICAgICAgIGNvZGVCbG9jayk7CiB9CiAK IHZvaWQgSklUQ29kZTo6Zm9yY2VPcHRpbWl6YXRpb25TbG93UGF0aENvbmN1cnJlbnRseShDb2Rl QmxvY2sqIGNvZGVCbG9jaykKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxh bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmNw cAkocmV2aXNpb24gMjAwNjQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTMtMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTMtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTc5LDYgKzc5LDcgQEAKICNpbmNsdWRlICJPcGVyYW5k c0lubGluZXMuaCIKICNpbmNsdWRlICJQcm9maWxlckRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiVHJh Y2tlZFJlZmVyZW5jZXMuaCIKKyNpbmNsdWRlICJWTUlubGluZXMuaCIKICNpbmNsdWRlIDx3dGYv Q3VycmVudFRpbWUuaD4KIAogI2lmIEVOQUJMRShGVExfSklUKQpAQCAtMTU4LDcgKzE1OSw4IEBA IFBsYW46On5QbGFuKCkKIGJvb2wgUGxhbjo6Y29tcHV0ZUNvbXBpbGVUaW1lcygpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIHJlcG9ydENvbXBpbGVUaW1lcygpCi0gICAgICAgIHx8IE9wdGlvbnM6OnJl cG9ydFRvdGFsQ29tcGlsZVRpbWVzKCk7CisgICAgICAgIHx8IE9wdGlvbnM6OnJlcG9ydFRvdGFs Q29tcGlsZVRpbWVzKCkKKyAgICAgICAgfHwgdm0ubV9wZXJCeXRlY29kZVByb2ZpbGVyOwogfQog CiBib29sIFBsYW46OnJlcG9ydENvbXBpbGVUaW1lcygpIGNvbnN0CkBAIC0yMDIsMjggKzIwNCwz MSBAQCB2b2lkIFBsYW46OmNvbXBpbGVJblRocmVhZChMb25nTGl2ZWRTdGF0CiAgICAgICAgICAg ICAgICAgdG90YWxERkdDb21waWxlVGltZSArPSBhZnRlciAtIGJlZm9yZTsKICAgICAgICAgfQog ICAgIH0KKyAgICBjb25zdCBjaGFyKiBwYXRoTmFtZSA9IG51bGxwdHI7CisgICAgc3dpdGNoIChw YXRoKSB7CisgICAgY2FzZSBGYWlsUGF0aDoKKyAgICAgICAgcGF0aE5hbWUgPSAiTi9BIChmYWls KSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgREZHUGF0aDoKKyAgICAgICAgcGF0aE5hbWUg PSAiREZHIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGVExQYXRoOgorICAgICAgICBwYXRo TmFtZSA9ICJGVEwiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIENhbmNlbFBhdGg6CisgICAg ICAgIHBhdGhOYW1lID0gIkNhbmNlbGxlZCI7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOwor ICAgIH0KKyAgICBpZiAoY29kZUJsb2NrKSB7IC8vIGNvZGVCbG9jayB3aWxsIGJlIG51bGwgaWYg dGhlIGNvbXBpbGF0aW9uIHdhcyBjYW5jZWxsZWQuCisgICAgICAgIGlmIChwYXRoID09IEZUTFBh dGgpCisgICAgICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImZ0bENvbXBp bGUiLCAoInRvb2sgIiwgYWZ0ZXIgLSBiZWZvcmUsICIgbXMgKERGRzogIiwgbV90aW1lQmVmb3Jl RlRMIC0gYmVmb3JlLCAiLCBCMzogIiwgYWZ0ZXIgLSBtX3RpbWVCZWZvcmVGVEwsICIpIHdpdGgg IiwgcGF0aE5hbWUpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgQ09ERUJMT0NLX0xPR19F VkVOVChjb2RlQmxvY2ssICJkZmdDb21waWxlIiwgKCJ0b29rICIsIGFmdGVyIC0gYmVmb3JlLCAi IG1zIHdpdGggIiwgcGF0aE5hbWUpKTsKKyAgICB9CiAgICAgaWYgKFVOTElLRUxZKHJlcG9ydENv bXBpbGVUaW1lcygpKSkgewotICAgICAgICBjb25zdCBjaGFyKiBwYXRoTmFtZTsKLSAgICAgICAg c3dpdGNoIChwYXRoKSB7Ci0gICAgICAgIGNhc2UgRmFpbFBhdGg6Ci0gICAgICAgICAgICBwYXRo TmFtZSA9ICJOL0EgKGZhaWwpIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIERG R1BhdGg6Ci0gICAgICAgICAgICBwYXRoTmFtZSA9ICJERkciOwotICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgIGNhc2UgRlRMUGF0aDoKLSAgICAgICAgICAgIHBhdGhOYW1lID0gIkZUTCI7Ci0g ICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBDYW5jZWxQYXRoOgotICAgICAgICAgICAg cGF0aE5hbWUgPSAiQ2FuY2VsbGVkIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZh dWx0OgotICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSNpZiBDT01Q SUxFUl9RVUlSSyhDT05TSURFUlNfVU5SRUFDSEFCTEVfQ09ERSkKLSAgICAgICAgICAgIHBhdGhO YW1lID0gIiI7Ci0jZW5kaWYKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9CiAgICAgICAg IGRhdGFMb2coIk9wdGltaXplZCAiLCBjb2RlQmxvY2tOYW1lLCAiIHVzaW5nICIsIG1vZGUsICIg d2l0aCAiLCBwYXRoTmFtZSwgIiBpbnRvICIsIGZpbmFsaXplciA/IGZpbmFsaXplci0+Y29kZVNp emUoKSA6IDAsICIgYnl0ZXMgaW4gIiwgYWZ0ZXIgLSBiZWZvcmUsICIgbXMiKTsKICAgICAgICAg aWYgKHBhdGggPT0gRlRMUGF0aCkKICAgICAgICAgICAgIGRhdGFMb2coIiAoREZHOiAiLCBtX3Rp bWVCZWZvcmVGVEwgLSBiZWZvcmUsICIsIEIzOiAiLCBhZnRlciAtIG1fdGltZUJlZm9yZUZUTCwg IikiKTsKQEAgLTU1OCw4ICs1NjMsMTAgQEAgQ29tcGlsYXRpb25SZXN1bHQgUGxhbjo6ZmluYWxp emVXaXRob3V0TgogICAgIC8vIFdlIHdpbGwgZXN0YWJsaXNoIG5ldyByZWZlcmVuY2VzIGZyb20g dGhlIGNvZGUgYmxvY2sgdG8gdGhpbmdzLiBTbywgd2UgbmVlZCBhIGJhcnJpZXIuCiAgICAgdm0u aGVhcC53cml0ZUJhcnJpZXIoY29kZUJsb2NrKTsKICAgICAKLSAgICBpZiAoIWlzU3RpbGxWYWxp ZCgpKQorICAgIGlmICghaXNTdGlsbFZhbGlkKCkpIHsKKyAgICAgICAgQ09ERUJMT0NLX0xPR19F VkVOVChjb2RlQmxvY2ssICJkZmdGaW5hbGl6ZSIsICgiaW52YWxpZGF0ZWQiKSk7CiAgICAgICAg IHJldHVybiBDb21waWxhdGlvbkludmFsaWRhdGVkOworICAgIH0KIAogICAgIGJvb2wgcmVzdWx0 OwogICAgIGlmIChjb2RlQmxvY2stPmNvZGVUeXBlKCkgPT0gRnVuY3Rpb25Db2RlKQpAQCAtNTY3 LDggKzU3NCwxMCBAQCBDb21waWxhdGlvblJlc3VsdCBQbGFuOjpmaW5hbGl6ZVdpdGhvdXROCiAg ICAgZWxzZQogICAgICAgICByZXN1bHQgPSBmaW5hbGl6ZXItPmZpbmFsaXplKCk7CiAgICAgCi0g ICAgaWYgKCFyZXN1bHQpCisgICAgaWYgKCFyZXN1bHQpIHsKKyAgICAgICAgQ09ERUJMT0NLX0xP R19FVkVOVChjb2RlQmxvY2ssICJkZmdGaW5hbGl6ZSIsICgiZmFpbGVkIikpOwogICAgICAgICBy ZXR1cm4gQ29tcGlsYXRpb25GYWlsZWQ7CisgICAgfQogICAgIAogICAgIHJlYWxseUFkZChjb2Rl QmxvY2stPmppdENvZGUoKS0+ZGZnQ29tbW9uKCkpOwogICAgIApAQCAtNTg3LDYgKzU5Niw3IEBA IENvbXBpbGF0aW9uUmVzdWx0IFBsYW46OmZpbmFsaXplV2l0aG91dE4KICAgICAgICAgY29kZUJs b2NrLT5qaXRDb2RlKCktPnZhbGlkYXRlUmVmZXJlbmNlcyh0cmFja2VkUmVmZXJlbmNlcyk7CiAg ICAgfQogICAgIAorICAgIENPREVCTE9DS19MT0dfRVZFTlQoY29kZUJsb2NrLCAiZGZnRmluYWxp emUiLCAoInN1Y2NlZWRlZCIpKTsKICAgICByZXR1cm4gQ29tcGlsYXRpb25TdWNjZXNzZnVsOwog fQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVBbGxvY2F0b3JG aXhlZFZNUG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9F eGVjdXRhYmxlQWxsb2NhdG9yRml4ZWRWTVBvb2wuY3BwCShyZXZpc2lvbiAyMDA2NDcpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVBbGxvY2F0b3JGaXhlZFZNUG9vbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM2Miw2ICszNjIsMTEgQEAgZG91YmxlIEV4ZWN1dGFibGVB bGxvY2F0b3I6Om1lbW9yeVByZXNzdQogCiBSZWZQdHI8RXhlY3V0YWJsZU1lbW9yeUhhbmRsZT4g RXhlY3V0YWJsZUFsbG9jYXRvcjo6YWxsb2NhdGUoVk0mLCBzaXplX3Qgc2l6ZUluQnl0ZXMsIHZv aWQqIG93bmVyVUlELCBKSVRDb21waWxhdGlvbkVmZm9ydCBlZmZvcnQpCiB7CisgICAgaWYgKE9w dGlvbnM6OmxvZ0V4ZWN1dGFibGVBbGxvY2F0aW9uKCkpIHsKKyAgICAgICAgTWV0YUFsbG9jYXRv cjo6U3RhdGlzdGljcyBzdGF0cyA9IGFsbG9jYXRvci0+Y3VycmVudFN0YXRpc3RpY3MoKTsKKyAg ICAgICAgZGF0YUxvZygiQWxsb2NhdGluZyAiLCBzaXplSW5CeXRlcywgIiBieXRlcyBvZiBleGVj dXRhYmxlIG1lbW9yeSB3aXRoICIsIHN0YXRzLmJ5dGVzQWxsb2NhdGVkLCAiIGJ5dGVzIGFsbG9j YXRlZCwgIiwgc3RhdHMuYnl0ZXNSZXNlcnZlZCwgIiBieXRlcyByZXNlcnZlZCwgYW5kICIsIHN0 YXRzLmJ5dGVzQ29tbWl0dGVkLCAiIGNvbW1pdHRlZC5cbiIpOworICAgIH0KKyAgICAKICAgICBp ZiAoZWZmb3J0ICE9IEpJVENvbXBpbGF0aW9uQ2FuRmFpbCAmJiBPcHRpb25zOjpyZXBvcnRNdXN0 U3VjY2VlZEV4ZWN1dGFibGVBbGxvY2F0aW9ucygpKSB7CiAgICAgICAgIGRhdGFMb2coIkFsbG9j YXRpbmcgIiwgc2l6ZUluQnl0ZXMsICIgYnl0ZXMgb2YgZXhlY3V0YWJsZSBtZW1vcnkgd2l0aCBK SVRDb21waWxhdGlvbk11c3RTdWNjZWVkLlxuIik7CiAgICAgICAgIFdURlJlcG9ydEJhY2t0cmFj ZSgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAkocmV2aXNp b24gMjAwNjQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yMTEsNiArMjExLDcgQEAgdHlwZWRlZiBjb25zdCBjaGFyKiBvcHRp b25TdHJpbmc7CiAgICAgdihib29sLCB1c2VNb3ZIaW50UmVtb3ZhbCwgdHJ1ZSwgTm9ybWFsLCBu dWxscHRyKSBcCiAgICAgdihib29sLCB1c2VQdXRTdGFja1NpbmtpbmcsIHRydWUsIE5vcm1hbCwg bnVsbHB0cikgXAogICAgIHYoYm9vbCwgdXNlT2JqZWN0QWxsb2NhdGlvblNpbmtpbmcsIHRydWUs IE5vcm1hbCwgbnVsbHB0cikgXAorICAgIHYoYm9vbCwgbG9nRXhlY3V0YWJsZUFsbG9jYXRpb24s IGZhbHNlLCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICBcCiAgICAgdihib29sLCB1c2VDb25jdXJy ZW50SklULCB0cnVlLCBOb3JtYWwsICJhbGxvd3MgdGhlIERGRyAvIEZUTCBjb21waWxhdGlvbiBp biB0aHJlYWRzIG90aGVyIHRoYW4gdGhlIGV4ZWN1dGluZyBKUyB0aHJlYWQiKSBcCiAgICAgdih1 bnNpZ25lZCwgbnVtYmVyT2ZERkdDb21waWxlclRocmVhZHMsIGNvbXB1dGVOdW1iZXJPZldvcmtl clRocmVhZHMoMiwgMikgLSAxLCBOb3JtYWwsIG51bGxwdHIpIFwK