159274 2016-06-29 14:09:22 -0700 Add support for collecting cumulative LLINT stats via a JSC_llintStatsFile option. 2016-06-29 15:01:13 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1206489 0 mark.lam 2016-06-29 14:09:22 -0700 Patch coming. 1206490 1 282372 mark.lam 2016-06-29 14:13:20 -0700 Created attachment 282372 proposed patch. 1206510 2 282372 keith_miller 2016-06-29 14:55:33 -0700 Comment on attachment 282372 proposed patch. r=me. 1206518 3 mark.lam 2016-06-29 15:01:13 -0700 Thanks for the review. Landed in r202650: <http://trac.webkit.org/r202650>. 282372 2016-06-29 14:13:20 -0700 2016-06-29 14:55:33 -0700 proposed patch. bug-159274.patch text/plain 12666 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyNjMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE2LTA2LTI5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgc3VwcG9ydCBmb3IgY29sbGVjdGluZyBjdW11bGF0aXZlIExMSU5UIHN0YXRzIHZpYSBhIEpT Q19sbGludFN0YXRzRmlsZSBvcHRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTkyNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBs bGludC9MTEludERhdGEuY3BwOgorICAgICAgICAoSlNDOjpMTEludDo6aW5pdGlhbGl6ZSk6Cisg ICAgICAgIChKU0M6OkxMSW50OjpEYXRhOjpmaW5hbGl6ZVN0YXRzKToKKyAgICAgICAgKEpTQzo6 TExJbnQ6OmNvbXBhcmVTdGF0cyk6CisgICAgICAgIChKU0M6OkxMSW50OjpEYXRhOjpkdW1wU3Rh dHMpOgorICAgICAgICAoSlNDOjpMTEludDo6RGF0YTo6ZW5zdXJlU3RhdHMpOgorICAgICAgICAo SlNDOjpMTEludDo6RGF0YTo6bG9hZFN0YXRzKToKKyAgICAgICAgKEpTQzo6TExJbnQ6OkRhdGE6 OnJlc2V0U3RhdHMpOgorICAgICAgICAoSlNDOjpMTEludDo6RGF0YTo6c2F2ZVN0YXRzKToKKyAg ICAgICAgKiBsbGludC9MTEludERhdGEuaDoKKyAgICAgICAgKEpTQzo6TExJbnQ6OkRhdGE6Om9w Y29kZVN0YXRzKToKKyAgICAgICAgKiBydW50aW1lL09wdGlvbnMuY3BwOgorICAgICAgICAoSlND OjpPcHRpb25zOjppc0F2YWlsYWJsZSk6CisgICAgICAgIChKU0M6OnJlY29tcHV0ZURlcGVuZGVu dE9wdGlvbnMpOgorICAgICAgICAoSlNDOjpPcHRpb25zOjppbml0aWFsaXplKToKKyAgICAgICAg KiBydW50aW1lL09wdGlvbnMuaDoKKwogMjAxNi0wNi0yOSAgQ2FpbyBMaW1hICA8dGljYWlvbGlt YUBnbWFpbC5jb20+CiAKICAgICAgICAgTExJbnQgc2hvdWxkIHN1cHBvcnQgb3RoZXIgdHlwZXMg b2YgcHJvdG90eXBlIEdldEJ5SWQgY2FjaGluZy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qc2MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCShy ZXZpc2lvbiAyMDI2MzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTk4NSw3ICsxOTg1LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBh cmd2KQogICAgIGlmIChPcHRpb25zOjpsb2dIZWFwU3RhdGlzdGljc0F0RXhpdCgpKQogICAgICAg ICBIZWFwU3RhdGlzdGljczo6cmVwb3J0U3VjY2VzcygpOwogICAgIGlmIChPcHRpb25zOjpyZXBv cnRMTEludFN0YXRzKCkpCi0gICAgICAgIExMSW50OjpEYXRhOjpkdW1wU3RhdHMoKTsKKyAgICAg ICAgTExJbnQ6OkRhdGE6OmZpbmFsaXplU3RhdHMoKTsKIAogI2lmIFBMQVRGT1JNKEVGTCkKICAg ICBlY29yZV9zaHV0ZG93bigpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xM SW50RGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xM SW50RGF0YS5jcHAJKHJldmlzaW9uIDIwMjYzMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9s bGludC9MTEludERhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTEsIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVk ZSAiQnl0ZWNvZGVDb252ZW50aW9ucy5oIgogI2luY2x1ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1 ZGUgIkNvZGVUeXBlLmgiCisjaW5jbHVkZSAiSW5pdGlhbGl6ZVRocmVhZGluZy5oIgogI2luY2x1 ZGUgIkluc3RydWN0aW9uLmgiCiAjaW5jbHVkZSAiSlNTY29wZS5oIgogI2luY2x1ZGUgIkxMSW50 Q0xvb3AuaCIKQEAgLTM4LDYgKzM5LDggQEAKICNpbmNsdWRlICJQcm9wZXJ0eU9mZnNldC5oIgog I2luY2x1ZGUgIlNoYWRvd0NoaWNrZW4uaCIKICNpbmNsdWRlICJXcml0ZUJhcnJpZXIuaCIKKyNp bmNsdWRlIDxzdHJpbmc+CisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKICNkZWZp bmUgU1RBVElDX0FTU0VSVChjb25kKSBzdGF0aWNfYXNzZXJ0KGNvbmQsICJMTEludCBhc3N1bWVz ICIgI2NvbmQpCiAKQEAgLTY3LDEwICs3MCw3IEBAIHZvaWQgaW5pdGlhbGl6ZSgpCiAjZW5kaWYg Ly8gRU5BQkxFKEpJVCkKIAogI2lmIEVOQUJMRShMTElOVF9TVEFUUykKLSAgICBEYXRhOjpzX29w Y29kZVN0YXRzQXJyYXkgPSBuZXcgT3Bjb2RlU3RhdHNBcnJheSgpOwotICAgIHVuc2lnbmVkIGkg PSAwOwotICAgIGZvciAoYXV0byYgc3RhdHMgOiAqRGF0YTo6c19vcGNvZGVTdGF0c0FycmF5KQot ICAgICAgICBzdGF0cy5pZCA9IHN0YXRpY19jYXN0PE9wY29kZUlEPihpKyspOworICAgIERhdGE6 OmVuc3VyZVN0YXRzKCk7CiAjZW5kaWYKIH0KIApAQCAtMjI4LDI5ICsyMjgsMTM2IEBAIHZvaWQg RGF0YTo6cGVyZm9ybUFzc2VydGlvbnMoVk0mIHZtKQogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGlj IHBvcAogI2VuZGlmCiAKLXZvaWQgRGF0YTo6ZHVtcFN0YXRzKCkKK3ZvaWQgRGF0YTo6ZmluYWxp emVTdGF0cygpCiB7CiAjaWYgRU5BQkxFKExMSU5UX1NUQVRTKQogICAgIGlmICghT3B0aW9uczo6 cmVwb3J0TExJbnRTdGF0cygpKQogICAgICAgICByZXR1cm47CisgICAgCisgICAgaWYgKE9wdGlv bnM6OmxsaW50U3RhdHNGaWxlKCkpCisgICAgICAgIHNhdmVTdGF0cygpOworICAgIAorICAgIGR1 bXBTdGF0cygpOworI2VuZGlmCit9CiAKKyNpZiBFTkFCTEUoTExJTlRfU1RBVFMpCitzdGF0aWMg Y29uc3QgYm9vbCB2ZXJib3NlU3RhdHMgPSBmYWxzZTsKKworc3RhdGljIGJvb2wgY29tcGFyZVN0 YXRzKGNvbnN0IE9wY29kZVN0YXRzJiBhLCBjb25zdCBPcGNvZGVTdGF0cyYgYikKK3sKKyAgICBp ZiAoYS5jb3VudCA+IGIuY291bnQpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChhLmNv dW50IDwgYi5jb3VudCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBhLnNsb3dQ YXRoQ291bnQgPiBiLnNsb3dQYXRoQ291bnQ7Cit9CisKK3ZvaWQgRGF0YTo6ZHVtcFN0YXRzKCkK K3sKKyAgICBBU1NFUlQoT3B0aW9uczo6cmVwb3J0TExJbnRTdGF0cygpKTsKICAgICBhdXRvIHN0 YXRzQ29weSA9ICpzX29wY29kZVN0YXRzQXJyYXk7Ci0gICAgc3RkOjpzb3J0KHN0YXRzQ29weS5i ZWdpbigpLCBzdGF0c0NvcHkuZW5kKCksIFtdIChPcGNvZGVTdGF0cyYgYSwgT3Bjb2RlU3RhdHMm IGIpIC0+IGJvb2wgewotICAgICAgICBpZiAoYS5jb3VudCA+IGIuY291bnQpCi0gICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgaWYgKGEuY291bnQgPCBiLmNvdW50KQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICByZXR1cm4gYS5zbG93UGF0aENvdW50ID4gYi5zbG93 UGF0aENvdW50OwotICAgIH0pOwotICAgIAorICAgIHN0ZDo6c29ydChzdGF0c0NvcHkuYmVnaW4o KSwgc3RhdHNDb3B5LmVuZCgpLCBjb21wYXJlU3RhdHMpOworCiAgICAgZGF0YUxvZygiT3Bjb2Rl IHN0YXRzOlxuIik7CiAgICAgdW5zaWduZWQgaSA9IDA7CiAgICAgZm9yIChhdXRvJiBzdGF0cyA6 IHN0YXRzQ29weSkgewotICAgICAgICBpZiAoc3RhdHMuY291bnQpCisgICAgICAgIGlmIChzdGF0 cy5jb3VudCB8fCBzdGF0cy5zbG93UGF0aENvdW50KQogICAgICAgICAgICAgZGF0YUxvZygiICAg WyIsIGkrKywgIl06IGZhc3Q6Iiwgc3RhdHMuY291bnQsICIgc2xvdzoiLCBzdGF0cy5zbG93UGF0 aENvdW50LCAiICIsIG9wY29kZU5hbWVzW3N0YXRzLmlkXSwgIlxuIik7CiAgICAgfQotI2VuZGlm CiB9CiAKK3ZvaWQgRGF0YTo6ZW5zdXJlU3RhdHMoKQoreworICAgIHN0YXRpYyBzdGQ6Om9uY2Vf ZmxhZyBpbml0aWFsaXplT3B0aW9uc09uY2VGbGFnOworICAgIHN0ZDo6Y2FsbF9vbmNlKGluaXRp YWxpemVPcHRpb25zT25jZUZsYWcsIFtdIHsKKyAgICAgICAgc19vcGNvZGVTdGF0c0FycmF5ID0g bmV3IE9wY29kZVN0YXRzQXJyYXkoKTsKKyAgICAgICAgcmVzZXRTdGF0cygpOworICAgIH0pOwor fQorCit2b2lkIERhdGE6OmxvYWRTdGF0cygpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PHN0ZDo6c3RyaW5nPiBpbnN0YWxsZWRTdGF0c0ZpbGU7CisgICAgaWYgKCFPcHRpb25zOjpsbGlu dFN0YXRzRmlsZSgpIHx8ICFpbnN0YWxsZWRTdGF0c0ZpbGUuZ2V0KCkuY29tcGFyZShPcHRpb25z OjpsbGludFN0YXRzRmlsZSgpKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgT3B0aW9uczo6cmVw b3J0TExJbnRTdGF0cygpID0gdHJ1ZTsgLy8gRm9yY2Ugc3RhdHMgY29sbGVjdGlvbi4KKyAgICBp bnN0YWxsZWRTdGF0c0ZpbGUuZ2V0KCkgPSBPcHRpb25zOjpsbGludFN0YXRzRmlsZSgpOworCisg ICAgZW5zdXJlU3RhdHMoKTsKKworICAgIGNvbnN0IGNoYXIqIGZpbGVuYW1lID0gT3B0aW9uczo6 bGxpbnRTdGF0c0ZpbGUoKTsKKyAgICBGSUxFKiBmaWxlID0gZm9wZW4oZmlsZW5hbWUsICJyIik7 CisgICAgaWYgKCFmaWxlKSB7CisgICAgICAgIGRhdGFMb2dGKCJGYWlsZWQgdG8gb3BlbiBmaWxl ICVzLiBEaWQgeW91IGFkZCB0aGUgZmlsZS1yZWFkLXdyaXRlLWRhdGEgZW50aXRsZW1lbnQgdG8g V2ViUHJvY2Vzcy5zYj9cbiIsIGZpbGVuYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIHJlc2V0U3RhdHMoKTsKKworICAgIE9wY29kZVN0YXRzIGxvYWRlZDsKKyAgICB1bnNpZ25l ZCBpbmRleDsKKyAgICBjaGFyIG9wY29kZU5hbWVbMTAwXTsKKyAgICB3aGlsZSAoZnNjYW5mKGZp bGUsICJbJXVdOiBmYXN0OiV6dSBzbG93OiV6dSBpZDoldSAlc1xuIiwgJmluZGV4LCAmbG9hZGVk LmNvdW50LCAmbG9hZGVkLnNsb3dQYXRoQ291bnQsICZsb2FkZWQuaWQsIG9wY29kZU5hbWUpICE9 IEVPRikgeworICAgICAgICBpZiAodmVyYm9zZVN0YXRzKQorICAgICAgICAgICAgZGF0YUxvZ0Yo ImxvYWRlZCBbJXVdOiBmYXN0ICV6dSBzbG93ICV6dSBpZDoldSAlc1xuIiwgaW5kZXgsIGxvYWRl ZC5jb3VudCwgbG9hZGVkLnNsb3dQYXRoQ291bnQsIGxvYWRlZC5pZCwgb3Bjb2RlTmFtZSk7CisK KyAgICAgICAgT3Bjb2RlU3RhdHMmIHN0YXRzID0gb3Bjb2RlU3RhdHMobG9hZGVkLmlkKTsKKyAg ICAgICAgc3RhdHMuY291bnQgPSBsb2FkZWQuY291bnQ7CisgICAgICAgIHN0YXRzLnNsb3dQYXRo Q291bnQgPSBsb2FkZWQuc2xvd1BhdGhDb3VudDsKKyAgICB9CisKKyAgICBpZiAodmVyYm9zZVN0 YXRzKSB7CisgICAgICAgIGRhdGFMb2dGKCJBZnRlciBsb2FkaW5nIGZyb20gJXMsICIsIGZpbGVu YW1lKTsKKyAgICAgICAgZHVtcFN0YXRzKCk7CisgICAgfQorCisgICAgaW50IHJlc3VsdCA9IGZj bG9zZShmaWxlKTsKKyAgICBpZiAocmVzdWx0KQorICAgICAgICBkYXRhTG9nRigiRmFpbGVkIHRv IGNsb3NlIGZpbGUgJXM6ICVzXG4iLCBmaWxlbmFtZSwgc3RyZXJyb3IoZXJybm8pKTsKK30KKwor dm9pZCBEYXRhOjpyZXNldFN0YXRzKCkKK3sKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICBmb3Ig KGF1dG8mIHN0YXRzIDogKnNfb3Bjb2RlU3RhdHNBcnJheSkgeworICAgICAgICBzdGF0cy5pZCA9 IHN0YXRpY19jYXN0PE9wY29kZUlEPihpKyspOworICAgICAgICBzdGF0cy5jb3VudCA9IDA7Cisg ICAgICAgIHN0YXRzLnNsb3dQYXRoQ291bnQgPSAwOworICAgIH0KK30KKwordm9pZCBEYXRhOjpz YXZlU3RhdHMoKQoreworICAgIEFTU0VSVChPcHRpb25zOjpyZXBvcnRMTEludFN0YXRzKCkgJiYg T3B0aW9uczo6bGxpbnRTdGF0c0ZpbGUoKSk7CisgICAgY29uc3QgY2hhciogZmlsZW5hbWUgPSBP cHRpb25zOjpsbGludFN0YXRzRmlsZSgpOworCisgICAgRklMRSogZmlsZSA9IGZvcGVuKGZpbGVu YW1lLCAidyIpOworICAgIGlmICghZmlsZSkgeworICAgICAgICBkYXRhTG9nRigiRmFpbGVkIHRv IG9wZW4gZmlsZSAlcy4gRGlkIHlvdSBhZGQgdGhlIGZpbGUtcmVhZC13cml0ZS1kYXRhIGVudGl0 bGVtZW50IHRvIFdlYlByb2Nlc3Muc2I/XG4iLCBmaWxlbmFtZSk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBhdXRvIHN0YXRzQ29weSA9ICpzX29wY29kZVN0YXRzQXJyYXk7CisgICAg c3RkOjpzb3J0KHN0YXRzQ29weS5iZWdpbigpLCBzdGF0c0NvcHkuZW5kKCksIGNvbXBhcmVTdGF0 cyk7CisKKyAgICBpbnQgaW5kZXggPSAwOworICAgIGZvciAoYXV0byYgc3RhdHMgOiBzdGF0c0Nv cHkpIHsKKyAgICAgICAgaWYgKCFzdGF0cy5jb3VudCAmJiAhc3RhdHMuc2xvd1BhdGhDb3VudCkK KyAgICAgICAgICAgIGJyZWFrOyAvLyBzdGF0cyBhcmUgc29ydGVkLiBJZiB3ZSBlbmNvdW50ZXJl ZCAwIGNvdW50cywgdGhlbiB0aGVyZSBhcmUgbm8gbW9yZSBub24temVybyBjb3VudHMuCisKKyAg ICAgICAgaWYgKHZlcmJvc2VTdGF0cykKKyAgICAgICAgICAgIGRhdGFMb2dGKCJzYXZlZCBbJXVd OiBmYXN0OiV6dSBzbG93OiV6dSBpZDoldSAlc1xuIiwgaW5kZXgsIHN0YXRzLmNvdW50LCBzdGF0 cy5zbG93UGF0aENvdW50LCBzdGF0cy5pZCwgb3Bjb2RlTmFtZXNbc3RhdHMuaWRdKTsKKworICAg ICAgICBmcHJpbnRmKGZpbGUsICJbJXVdOiBmYXN0OiV6dSBzbG93OiV6dSBpZDoldSAlc1xuIiwg aW5kZXgsIHN0YXRzLmNvdW50LCBzdGF0cy5zbG93UGF0aENvdW50LCBzdGF0cy5pZCwgb3Bjb2Rl TmFtZXNbc3RhdHMuaWRdKTsKKyAgICAgICAgaW5kZXgrKzsKKyAgICB9CisKKyAgICBpbnQgcmVz dWx0ID0gZmNsb3NlKGZpbGUpOworICAgIGlmIChyZXN1bHQpCisgICAgICAgIGRhdGFMb2dGKCJG YWlsZWQgdG8gY2xvc2UgZmlsZSAlczogJXNcbiIsIGZpbGVuYW1lLCBzdHJlcnJvcihlcnJubykp OworfQorI2VuZGlmCiAKIH0gfSAvLyBuYW1lc3BhY2UgSlNDOjpMTEludApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50RGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9sbGludC9MTEludERhdGEuaAkocmV2aXNpb24gMjAyNjMwKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTYgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01Niw5 ICs1NiwxNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgcGVyZm9ybUFzc2VydGlvbnMoVk0m KTsKICAgICBzdGF0aWMgT3Bjb2RlU3RhdHMmIG9wY29kZVN0YXRzKE9wY29kZUlEIGlkKSB7IHJl dHVybiAoKnNfb3Bjb2RlU3RhdHNBcnJheSlbaWRdOyB9CiAKLSAgICBKU19FWFBPUlRfUFJJVkFU RSBzdGF0aWMgdm9pZCBkdW1wU3RhdHMoKTsKKyAgICBKU19FWFBPUlRfUFJJVkFURSBzdGF0aWMg dm9pZCBmaW5hbGl6ZVN0YXRzKCk7CisKKyAgICBzdGF0aWMgdm9pZCBkdW1wU3RhdHMoKTsKKyAg ICBzdGF0aWMgdm9pZCBsb2FkU3RhdHMoKTsKIAogcHJpdmF0ZToKKyAgICBzdGF0aWMgdm9pZCBl bnN1cmVTdGF0cygpOworICAgIHN0YXRpYyB2b2lkIHJlc2V0U3RhdHMoKTsKKyAgICBzdGF0aWMg dm9pZCBzYXZlU3RhdHMoKTsKKwogICAgIHN0YXRpYyBJbnN0cnVjdGlvbiogc19leGNlcHRpb25J bnN0cnVjdGlvbnM7CiAgICAgc3RhdGljIE9wY29kZSBzX29wY29kZU1hcFtudW1PcGNvZGVJRHNd OwogICAgIHN0YXRpYyBPcGNvZGVTdGF0c0FycmF5KiBzX29wY29kZVN0YXRzQXJyYXk7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmNwcAkocmV2aXNpb24gMjAy NjMwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLTIwMTIs IDIwMTQtMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTEtMjAxMiwgMjAxNC0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1 ZGUgIk9wdGlvbnMuaCIKIAogI2luY2x1ZGUgIkxMSW50Q29tbW9uLmgiCisjaW5jbHVkZSAiTExJ bnREYXRhLmgiCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPGxpbWl0cz4KICNpbmNs dWRlIDxtYXRoLmg+CkBAIC0xMzIsNyArMTMzLDcgQEAgYm9vbCBPcHRpb25zOjppc0F2YWlsYWJs ZShPcHRpb25zOjpJRCBpZAogICAgIAogICAgIFVOVVNFRF9QQVJBTShpZCk7CiAjaWYgRU5BQkxF KExMSU5UX1NUQVRTKQotICAgIGlmIChpZCA9PSByZXBvcnRMTEludFN0YXRzSUQpCisgICAgaWYg KGlkID09IHJlcG9ydExMSW50U3RhdHNJRCB8fCBpZCA9PSBsbGludFN0YXRzRmlsZUlEKQogICAg ICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgogICAgIHJldHVybiBmYWxzZTsKQEAgLTM4OSw2ICsz OTAsMTAgQEAgc3RhdGljIHZvaWQgcmVjb21wdXRlRGVwZW5kZW50T3B0aW9ucygpCiAgICAgQVNT RVJUKChzdGF0aWNfY2FzdDxpbnQ2NF90PihPcHRpb25zOjp0aHJlc2hvbGRGb3JPcHRpbWl6ZUFm dGVyTG9uZ1dhcm1VcCgpKSA8PCBPcHRpb25zOjpyZW9wdGltaXphdGlvblJldHJ5Q291bnRlck1h eCgpKSA+IDApOwogICAgIEFTU0VSVCgoc3RhdGljX2Nhc3Q8aW50NjRfdD4oT3B0aW9uczo6dGhy ZXNob2xkRm9yT3B0aW1pemVBZnRlckxvbmdXYXJtVXAoKSkgPDwgT3B0aW9uczo6cmVvcHRpbWl6 YXRpb25SZXRyeUNvdW50ZXJNYXgoKSkgPD0gc3RhdGljX2Nhc3Q8aW50NjRfdD4oc3RkOjpudW1l cmljX2xpbWl0czxpbnQzMl90Pjo6bWF4KCkpKTsKICAgICBBU1NFUlQoT3B0aW9uczo6ZGVmZXJH Q1Byb2JhYmlsaXR5KCkgPj0gMC4wICYmIE9wdGlvbnM6OmRlZmVyR0NQcm9iYWJpbGl0eSgpIDw9 IDEuMCk7CisKKyNpZiBFTkFCTEUoTExJTlRfU1RBVFMpCisgICAgTExJbnQ6OkRhdGE6OmxvYWRT dGF0cygpOworI2VuZGlmCiB9CiAKIHZvaWQgT3B0aW9uczo6aW5pdGlhbGl6ZSgpCkBAIC00Mzcs OCArNDQyLDYgQEAgdm9pZCBPcHRpb25zOjppbml0aWFsaXplKCkKICAgICAgICAgICAgICAgICA7 IC8vIERlY29uZnVzZSBlZGl0b3JzIHRoYXQgZG8gYXV0byBpbmRlbnRhdGlvbgogI2VuZGlmCiAg ICAgCi0gICAgICAgICAgICByZWNvbXB1dGVEZXBlbmRlbnRPcHRpb25zKCk7Ci0KICNpZiBVU0Uo T1BUSU9OU19GSUxFKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIq IGZpbGVuYW1lID0gT1BUSU9OU19GSUxFTkFNRTsKQEAgLTQ2NCw2ICs0NjcsOCBAQCB2b2lkIE9w dGlvbnM6OmluaXRpYWxpemUoKQogICAgICAgICAgICAgfQogI2VuZGlmCiAKKyAgICAgICAgICAg IHJlY29tcHV0ZURlcGVuZGVudE9wdGlvbnMoKTsKKwogICAgICAgICAgICAgLy8gRG8gcmFuZ2Ug Y2hlY2tzIHdoZXJlIG5lZWRlZCBhbmQgbWFrZSBjb3JyZWN0aW9ucyB0byB0aGUgb3B0aW9uczoK ICAgICAgICAgICAgIEFTU0VSVChPcHRpb25zOjp0aHJlc2hvbGRGb3JPcHRpbWl6ZUFmdGVyTG9u Z1dhcm1VcCgpID49IE9wdGlvbnM6OnRocmVzaG9sZEZvck9wdGltaXplQWZ0ZXJXYXJtVXAoKSk7 CiAgICAgICAgICAgICBBU1NFUlQoT3B0aW9uczo6dGhyZXNob2xkRm9yT3B0aW1pemVBZnRlcldh cm1VcCgpID49IE9wdGlvbnM6OnRocmVzaG9sZEZvck9wdGltaXplU29vbigpKTsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgJKHJldmlzaW9uIDIwMjYzMCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAkod29ya2luZyBjb3B5KQpA QCAtMzc1LDcgKzM3NSw4IEBAIHR5cGVkZWYgY29uc3QgY2hhciogb3B0aW9uU3RyaW5nOwogICAg IFwKICAgICB2KGJvb2wsIHVzZVN1cGVyU2FtcGxlciwgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikg XAogICAgIFwKLSAgICB2KGJvb2wsIHJlcG9ydExMSW50U3RhdHMsIGZhbHNlLCBDb25maWd1cmFi bGUsICJSZXBvcnRzIExMSW50IHN0YXRpc3RpY3MiKQorICAgIHYoYm9vbCwgcmVwb3J0TExJbnRT dGF0cywgZmFsc2UsIENvbmZpZ3VyYWJsZSwgIlJlcG9ydHMgTExJbnQgc3RhdGlzdGljcyIpIFwK KyAgICB2KG9wdGlvblN0cmluZywgbGxpbnRTdGF0c0ZpbGUsIG51bGxwdHIsIENvbmZpZ3VyYWJs ZSwgIkZpbGUgdG8gY29sbGVjdCBMTEludCBzdGF0aXN0aWNzIGluIikgXAogCiBlbnVtIE9wdGlv bkVxdWl2YWxlbmNlIHsKICAgICBTYW1lT3B0aW9uLApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyNjQ1KQorKysgVG9vbHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDYtMjkgIE1h cmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBj b2xsZWN0aW5nIGN1bXVsYXRpdmUgTExJTlQgc3RhdHMgdmlhIGEgSlNDX2xsaW50U3RhdHNGaWxl IG9wdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1OTI3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAoRHVtcFJl bmRlclRyZWVNYWluKToKKwogMjAxNi0wNi0yOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFdLV2ViVmlldyBzaG91bGQgYXNrIFdLTmF2aWdh dGlvbkRlbGVnYXRlIGFib3V0IGJhZCBzc2wgY2VydGlmaWNhdGVzCkluZGV4OiBUb29scy9EdW1w UmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCShyZXZpc2lvbiAyMDI2MzApCisrKyBU b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0JKHdvcmtpbmcgY29weSkK QEAgLTE0NDQsNyArMTQ0NCw3IEBAIGludCBEdW1wUmVuZGVyVHJlZU1haW4oaW50IGFyZ2MsIGNv bnN0IGMKICAgICBpZiAoSlNDOjpPcHRpb25zOjpsb2dIZWFwU3RhdGlzdGljc0F0RXhpdCgpKQog ICAgICAgICBKU0M6OkhlYXBTdGF0aXN0aWNzOjpyZXBvcnRTdWNjZXNzKCk7CiAgICAgaWYgKEpT Qzo6T3B0aW9uczo6cmVwb3J0TExJbnRTdGF0cygpKQotICAgICAgICBKU0M6OkxMSW50OjpEYXRh OjpkdW1wU3RhdHMoKTsKKyAgICAgICAgSlNDOjpMTEludDo6RGF0YTo6ZmluYWxpemVTdGF0cygp OwogICAgIFtwb29sIHJlbGVhc2VdOwogICAgIHJldHVybmluZ0Zyb21NYWluID0gdHJ1ZTsKICAg ICByZXR1cm4gMDsK