225983 2021-05-19 14:30:10 -0700 Ripping out broken Baseline JIT rare case profiling. 2021-05-19 15:31:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1761710 0 mark.lam 2021-05-19 14:30:10 -0700 The profiling has been broken in recent times. Fixing it to work does not appear to improve performance. Ripping out the profiling appears to not hurt performance. However, ripping out the profiling appears to save on code size generated for the Baseline JIT. 1761714 1 429098 mark.lam 2021-05-19 14:47:38 -0700 Created attachment 429098 proposed patch. 1761716 2 ysuzuki 2021-05-19 14:55:19 -0700 *** Bug 224618 has been marked as a duplicate of this bug. *** 1761717 3 429098 rmorisset 2021-05-19 14:55:38 -0700 Comment on attachment 429098 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=429098&action=review r=me too > Source/JavaScriptCore/ChangeLog:9 > + to improve performance. Ripping out the profiling appears to not hurt performance. Can you mention in the Changelog what performance test you ran to verify this (JetStream2? Speedometer?)?. 1761732 4 mark.lam 2021-05-19 15:30:57 -0700 Thanks for the reviews. Landed in r277758: <http://trac.webkit.org/r277758>. 1761733 5 webkit-bug-importer 2021-05-19 15:31:18 -0700 <rdar://problem/78227853> 429098 2021-05-19 14:47:38 -0700 2021-05-19 14:51:00 -0700 proposed patch. bug-225983.patch text/plain 12985 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc3NzU0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU5IEBA CisyMDIxLTA1LTE5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS aXBwaW5nIG91dCBicm9rZW4gQmFzZWxpbmUgSklUIHJhcmUgY2FzZSBwcm9maWxpbmcuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU5ODMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvZmlsaW5n IGhhcyBiZWVuIGJyb2tlbiBpbiByZWNlbnQgdGltZXMuICBGaXhpbmcgaXQgdG8gd29yayBkb2Vz IG5vdCBhcHBlYXIKKyAgICAgICAgdG8gaW1wcm92ZSBwZXJmb3JtYW5jZS4gIFJpcHBpbmcgb3V0 IHRoZSBwcm9maWxpbmcgYXBwZWFycyB0byBub3QgaHVydCBwZXJmb3JtYW5jZS4KKyAgICAgICAg SG93ZXZlciwgcmlwcGluZyBvdXQgdGhlIHByb2ZpbGluZyBhcHBlYXJzIHRvIHNhdmUgb24gY29k ZSBzaXplIGdlbmVyYXRlZCBmb3IgdGhlCisgICAgICAgIEJhc2VsaW5lIEpJVC4KKworICAgICAg ICAgICAgICAgICAgICAgICAgQmFzZSAgICAgICAgICAgICAgICAgICAgIE5ldyAgICAgICAgICAg ICAgICAgICAgICBEaWZmCisKKyAgICAgICAgICAgQmFzZWxpbmVKSVQ6IDczMjk5MTEyICg2OS45 MDM0ODEgTUIpICA2NTkxMDEyOCAoNjIuODU2Nzk2IE1CKSAgMC45MHggKHJlZHVjdGlvbikKKyAg ICAgICAgICAgICAgICAgICBERkc6IDM2ODUwNTQwICgzNS4xNDM0MTQgTUIpICAzNjM3NDQwMCAo MzQuNjg5MzMxIE1CKSAgMC45OXgKKyAgICAgICAgICAgICAgICAgVGh1bms6IDIzMTI4NjUyICgy Mi4wNTcyMDEgTUIpICAyMjg5MjI5MiAoMjEuODMxNzkxIE1CKSAgMC45OXgKKyAgICAgICAgICAg SW5saW5lQ2FjaGU6IDIyMjEwOTcyICgyMS4xODIwMzQgTUIpICAyMjA4MzUwOCAoMjEuMDYwNDc0 IE1CKSAgMC45OXgKKyAgICAgICAgICAgICAgICAgICBGVEw6IDYwNjUwNjQgKDUuNzg0MDk2IE1C KSAgICA2MTI4MDgwICg1Ljg0NDE5MyBNQikgICAgMS4wMXgKKyAgICAgICAgICAgICAgICAgIFdh c206IDIzMDUxMjQgKDIuMTk4MzM4IE1CKSAgICAyMzA5NzMyICgyLjIwMjczMiBNQikgICAgMS4w MHgKKyAgICAgICAgICAgICAgIFlhcnJKSVQ6IDE1MjI3MTIgKDEuNDUyMTcxIE1CKSAgICAxNTM2 MTA0ICgxLjQ2NDk0MyBNQikgICAgMS4wMXgKKyAgICAgICAgICAgICAgICBDU1NKSVQ6IDAgICAg ICAgICAgICAgICAgICAgICAgICAwCisgICAgICAgICBVbmNhdGVnb3JpemVkOiAwICAgICAgICAg ICAgICAgICAgICAgICAgMAorCisgICAgICAgIEN1bXVsYXRpdmUgZGlmZiBzaW5jZSB0aGUgc3Rh cnQgb2YgdGhpcyBlZmZvcnQgdG8gcHV0IG1vcmUgY29kZSBpbiBKSVQgdGh1bmtzOgorCisgICAg ICAgICAgICAgICAgICAgICAgICBCYXNlICAgICAgICAgICAgICAgICAgICAgTmV3ICAgICAgICAg ICAgICAgICAgICAgIERpZmYKKworICAgICAgICAgICBCYXNlbGluZUpJVDogODkwODk5NjQgKDg0 Ljk2MjgxMSBNQikgIDY1OTEwMTI4ICg2Mi44NTY3OTYgTUIpICAwLjc0eCAocmVkdWN0aW9uKQor ICAgICAgICAgICAgICAgICAgIERGRzogMzkxMTczNjAgKDM3LjMwNTIyMiBNQikgIDM2Mzc0NDAw ICgzNC42ODkzMzEgTUIpICAwLjkzeCAocmVkdWN0aW9uKQorICAgICAgICAgICAgICAgICBUaHVu azogMjMyMzA5NjggKDIyLjE1NDc3OCBNQikgIDIyODkyMjkyICgyMS44MzE3OTEgTUIpICAwLjk5 eAorICAgICAgICAgICBJbmxpbmVDYWNoZTogMjIwMjc0MTYgKDIxLjAwNjk4MSBNQikgIDIyMDgz NTA4ICgyMS4wNjA0NzQgTUIpICAxLjAweAorICAgICAgICAgICAgICAgICAgIEZUTDogNjU3NTc3 MiAoNi4yNzExNDUgTUIpICAgIDYxMjgwODAgKDUuODQ0MTkzIE1CKSAgICAwLjkzeCAocmVkdWN0 aW9uKQorICAgICAgICAgICAgICAgICAgV2FzbTogMjMwMjcyNCAoMi4xOTYwNDkgTUIpICAgIDIz MDk3MzIgKDIuMjAyNzMyIE1CKSAgICAxLjAweAorICAgICAgICAgICAgICAgWWFyckpJVDogMTUz ODk1NiAoMS40Njc2NjMgTUIpICAgIDE1MzYxMDQgKDEuNDY0OTQzIE1CKSAgICAxLjAweAorICAg ICAgICAgICAgICAgIENTU0pJVDogMCAgICAgICAgICAgICAgICAgICAgICAgIDAKKyAgICAgICAg IFVuY2F0ZWdvcml6ZWQ6IDAgICAgICAgICAgICAgICAgICAgICAgICAwCisKKyAgICAgICAgKiBi eXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OkpJVERhdGE6 OnNpemUgY29uc3QpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmR1bXBWYWx1ZVByb2ZpbGVz KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpzZXRSYXJlQ2FzZVByb2ZpbGVzKTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpyYXJlQ2FzZVByb2ZpbGVGb3JCeXRlY29kZUlu ZGV4KTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpyYXJlQ2FzZVByb2ZpbGVD b3VudEZvckJ5dGVjb2RlSW5kZXgpOiBEZWxldGVkLgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVC bG9jay5oOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6Omxpa2VseVRvVGFrZVNsb3dDYXNlKTog RGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpjb3VsZFRha2VTbG93Q2FzZSk6IERl bGV0ZWQuCisgICAgICAgICogYnl0ZWNvZGUvVmFsdWVQcm9maWxlLmg6CisgICAgICAgIChKU0M6 OlJhcmVDYXNlUHJvZmlsZTo6UmFyZUNhc2VQcm9maWxlKTogRGVsZXRlZC4KKyAgICAgICAgKEpT Qzo6Z2V0UmFyZUNhc2VQcm9maWxlQnl0ZWNvZGVJbmRleCk6IERlbGV0ZWQuCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBh cnNlcjo6bWFrZVNhZmUpOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpwYXJz ZUJsb2NrKToKKyAgICAgICAgKiBqaXQvSklULmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpwcml2 YXRlQ29tcGlsZVNsb3dDYXNlcyk6CisKIDIwMjEtMDUtMTkgIFJvYmluIE1vcmlzc2V0ICA8cm1v cmlzc2V0QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdHlwbyBpbiBBaXJVc2VDb3VudHMKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZp c2lvbiAyNzc3NDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2Nr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0MCw3ICsxMDQwLDYgQEAgc2l6ZV90IENvZGVCbG9j azo6SklURGF0YTo6c2l6ZShjb25zdCBDbwogICAgIHNpemUgKz0gbV9zdWJJQ3MuZXN0aW1hdGVk QWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7CiAgICAgc2l6ZSArPSBtX2J5VmFsSW5mb3MuZXN0aW1h dGVkQWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7CiAgICAgc2l6ZSArPSBtX2NhbGxMaW5rSW5mb3Mu ZXN0aW1hdGVkQWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7Ci0gICAgc2l6ZSArPSBtX3JhcmVDYXNl UHJvZmlsZXMuc2l6ZSgpICogc2l6ZW9mKGRlY2x0eXBlKCptX3JhcmVDYXNlUHJvZmlsZXMuZGF0 YSgpKSk7CiAgICAgc2l6ZSArPSBtX3N3aXRjaEp1bXBUYWJsZXMuc2l6ZSgpICogc2l6ZW9mKGRl Y2x0eXBlKCptX3N3aXRjaEp1bXBUYWJsZXMuZGF0YSgpKSk7CiAgICAgc2l6ZSArPSBtX3N0cmlu Z1N3aXRjaEp1bXBUYWJsZXMuc2l6ZSgpICogc2l6ZW9mKGRlY2x0eXBlKCptX3N0cmluZ1N3aXRj aEp1bXBUYWJsZXMuZGF0YSgpKSk7CiAgICAgLy8gRklYTUU6IGFjY291bnQgZm9yIG1fY2FsbGVl U2F2ZVJlZ2lzdGVycyBidXQgaXQncyBub3QgYSBiaWcgZGVhbCBzaW5jZSBpdCdzIGEgZml4ZWQg c2l6ZSBhbmQgc21hbGwuCkBAIC0xNzY0LDMwICsxNzYzLDYgQEAgQ2FsbExpbmtJbmZvKiBDb2Rl QmxvY2s6OmdldENhbGxMaW5rSW5mbwogICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lkIENv ZGVCbG9jazo6c2V0UmFyZUNhc2VQcm9maWxlcyhGaXhlZFZlY3RvcjxSYXJlQ2FzZVByb2ZpbGU+ JiYgcmFyZUNhc2VQcm9maWxlcykKLXsKLSAgICBDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKG1f bG9jayk7Ci0gICAgZW5zdXJlSklURGF0YShsb2NrZXIpLm1fcmFyZUNhc2VQcm9maWxlcyA9IFdU Rk1vdmUocmFyZUNhc2VQcm9maWxlcyk7Ci19Ci0KLVJhcmVDYXNlUHJvZmlsZSogQ29kZUJsb2Nr OjpyYXJlQ2FzZVByb2ZpbGVGb3JCeXRlY29kZUluZGV4KGNvbnN0IENvbmN1cnJlbnRKU0xvY2tl ciYsIEJ5dGVjb2RlSW5kZXggYnl0ZWNvZGVJbmRleCkKLXsKLSAgICBpZiAoYXV0byogaml0RGF0 YSA9IG1faml0RGF0YS5nZXQoKSkgewotICAgICAgICByZXR1cm4gdHJ5QmluYXJ5U2VhcmNoPFJh cmVDYXNlUHJvZmlsZSwgQnl0ZWNvZGVJbmRleD4oCi0gICAgICAgICAgICBqaXREYXRhLT5tX3Jh cmVDYXNlUHJvZmlsZXMsIGppdERhdGEtPm1fcmFyZUNhc2VQcm9maWxlcy5zaXplKCksIGJ5dGVj b2RlSW5kZXgsCi0gICAgICAgICAgICBnZXRSYXJlQ2FzZVByb2ZpbGVCeXRlY29kZUluZGV4KTsK LSAgICB9Ci0gICAgcmV0dXJuIG51bGxwdHI7Ci19Ci0KLXVuc2lnbmVkIENvZGVCbG9jazo6cmFy ZUNhc2VQcm9maWxlQ291bnRGb3JCeXRlY29kZUluZGV4KGNvbnN0IENvbmN1cnJlbnRKU0xvY2tl ciYgbG9ja2VyLCBCeXRlY29kZUluZGV4IGJ5dGVjb2RlSW5kZXgpCi17Ci0gICAgUmFyZUNhc2VQ cm9maWxlKiBwcm9maWxlID0gcmFyZUNhc2VQcm9maWxlRm9yQnl0ZWNvZGVJbmRleChsb2NrZXIs IGJ5dGVjb2RlSW5kZXgpOwotICAgIGlmIChwcm9maWxlKQotICAgICAgICByZXR1cm4gcHJvZmls ZS0+bV9jb3VudGVyOwotICAgIHJldHVybiAwOwotfQotCiB2b2lkIENvZGVCbG9jazo6c2V0Q2Fs bGVlU2F2ZVJlZ2lzdGVycyhSZWdpc3RlclNldCByZWdpc3RlclNldCkKIHsKICAgICBhdXRvIGNh bGxlZVNhdmVSZWdpc3RlcnMgPSBSZWdpc3RlckF0T2Zmc2V0TGlzdChyZWdpc3RlclNldCk7CkBA IC0zMTM3LDExICszMTEyLDYgQEAgdm9pZCBDb2RlQmxvY2s6OmR1bXBWYWx1ZVByb2ZpbGVzKCkK ICAgICAgICAgcHJvZmlsZS5kdW1wKFdURjo6ZGF0YUZpbGUoKSk7CiAgICAgICAgIGRhdGFMb2dG KCJcbiIpOwogICAgIH0pOwotICAgIGRhdGFMb2coIlJhcmVDYXNlUHJvZmlsZSBmb3IgIiwgKnRo aXMsICI6XG4iKTsKLSAgICBpZiAoYXV0byogaml0RGF0YSA9IG1faml0RGF0YS5nZXQoKSkgewot ICAgICAgICBmb3IgKFJhcmVDYXNlUHJvZmlsZSogcHJvZmlsZSA6IGppdERhdGEtPm1fcmFyZUNh c2VQcm9maWxlcykKLSAgICAgICAgICAgIGRhdGFMb2dGKCIgICBiYyA9ICVkOiAldVxuIiwgcHJv ZmlsZS0+bV9ieXRlY29kZU9mZnNldCwgcHJvZmlsZS0+bV9jb3VudGVyKTsKLSAgICB9CiB9CiAj ZW5kaWYgLy8gRU5BQkxFKFZFUkJPU0VfVkFMVUVfUFJPRklMRSkKIApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMjc3NzQ4KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkp CkBAIC0yODEsNyArMjgxLDYgQEAgcHVibGljOgogICAgICAgICBCYWc8Q2FsbExpbmtJbmZvPiBt X2NhbGxMaW5rSW5mb3M7CiAgICAgICAgIFNlbnRpbmVsTGlua2VkTGlzdDxDYWxsTGlua0luZm8s IFBhY2tlZFJhd1NlbnRpbmVsTm9kZTxDYWxsTGlua0luZm8+PiBtX2luY29taW5nQ2FsbHM7CiAg ICAgICAgIFNlbnRpbmVsTGlua2VkTGlzdDxQb2x5bW9ycGhpY0NhbGxOb2RlLCBQYWNrZWRSYXdT ZW50aW5lbE5vZGU8UG9seW1vcnBoaWNDYWxsTm9kZT4+IG1faW5jb21pbmdQb2x5bW9ycGhpY0Nh bGxzOwotICAgICAgICBGaXhlZFZlY3RvcjxSYXJlQ2FzZVByb2ZpbGU+IG1fcmFyZUNhc2VQcm9m aWxlczsKICAgICAgICAgRml4ZWRWZWN0b3I8U2ltcGxlSnVtcFRhYmxlPiBtX3N3aXRjaEp1bXBU YWJsZXM7CiAgICAgICAgIEZpeGVkVmVjdG9yPFN0cmluZ0p1bXBUYWJsZT4gbV9zdHJpbmdTd2l0 Y2hKdW1wVGFibGVzOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8UENUb0NvZGVPcmlnaW5NYXA+ IG1fcGNUb0NvZGVPcmlnaW5NYXA7CkBAIC0zNDgsMjggKzM0Nyw2IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldENhbGxlZVNhdmVSZWdpc3RlcnMoUmVnaXN0ZXJTZXQpOwogICAgIHZvaWQgc2V0Q2Fs bGVlU2F2ZVJlZ2lzdGVycyhSZWdpc3RlckF0T2Zmc2V0TGlzdCYmKTsKIAotICAgIHZvaWQgc2V0 UmFyZUNhc2VQcm9maWxlcyhGaXhlZFZlY3RvcjxSYXJlQ2FzZVByb2ZpbGU+JiYpOwotICAgIFJh cmVDYXNlUHJvZmlsZSogcmFyZUNhc2VQcm9maWxlRm9yQnl0ZWNvZGVJbmRleChjb25zdCBDb25j dXJyZW50SlNMb2NrZXImLCBCeXRlY29kZUluZGV4KTsKLSAgICB1bnNpZ25lZCByYXJlQ2FzZVBy b2ZpbGVDb3VudEZvckJ5dGVjb2RlSW5kZXgoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyJiwgQnl0 ZWNvZGVJbmRleCk7Ci0KLSAgICBib29sIGxpa2VseVRvVGFrZVNsb3dDYXNlKEJ5dGVjb2RlSW5k ZXggYnl0ZWNvZGVJbmRleCkKLSAgICB7Ci0gICAgICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9m aWxpbmcoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgQ29uY3VycmVudEpT TG9ja2VyIGxvY2tlcihtX2xvY2spOwotICAgICAgICB1bnNpZ25lZCB2YWx1ZSA9IHJhcmVDYXNl UHJvZmlsZUNvdW50Rm9yQnl0ZWNvZGVJbmRleChsb2NrZXIsIGJ5dGVjb2RlSW5kZXgpOwotICAg ICAgICByZXR1cm4gdmFsdWUgPj0gT3B0aW9uczo6bGlrZWx5VG9UYWtlU2xvd0Nhc2VNaW5pbXVt Q291bnQoKTsKLSAgICB9Ci0KLSAgICBib29sIGNvdWxkVGFrZVNsb3dDYXNlKEJ5dGVjb2RlSW5k ZXggYnl0ZWNvZGVJbmRleCkKLSAgICB7Ci0gICAgICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9m aWxpbmcoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgQ29uY3VycmVudEpT TG9ja2VyIGxvY2tlcihtX2xvY2spOwotICAgICAgICB1bnNpZ25lZCB2YWx1ZSA9IHJhcmVDYXNl UHJvZmlsZUNvdW50Rm9yQnl0ZWNvZGVJbmRleChsb2NrZXIsIGJ5dGVjb2RlSW5kZXgpOwotICAg ICAgICByZXR1cm4gdmFsdWUgPj0gT3B0aW9uczo6Y291bGRUYWtlU2xvd0Nhc2VNaW5pbXVtQ291 bnQoKTsKLSAgICB9Ci0KICAgICAvLyBXZSBjYWxsIHRoaXMgd2hlbiB3ZSB3YW50IHRvIHJlYXR0 ZW1wdCBjb21waWxpbmcgc29tZXRoaW5nIHdpdGggdGhlIGJhc2VsaW5lIEpJVC4gSWRlYWxseQog ICAgIC8vIHRoZSBiYXNlbGluZSBKSVQgd291bGQgbm90IGFkZCBkYXRhIHRvIENvZGVCbG9jaywg YnV0IGluc3RlYWQgaXQgd291bGQgcHV0IGl0cyBkYXRhIGludG8KICAgICAvLyBhIG5ld2x5IGNy ZWF0ZWQgSklUQ29kZSwgd2hpY2ggY291bGQgYmUgdGhyb3duIGF3YXkgaWYgd2UgYmFpbCBvbiBK SVQgY29tcGlsYXRpb24uIFRoZW4gd2UKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9WYWx1ZVByb2ZpbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvVmFsdWVQcm9maWxlLmgJKHJldmlzaW9uIDI3Nzc0OCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9WYWx1ZVByb2ZpbGUuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1 ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEtMjAxOSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEtMjAyMSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE1 OCwyNCArMTU4LDYgQEAgc3RydWN0IFZhbHVlUHJvZmlsZSA6IHB1YmxpYyBWYWx1ZVByb2ZpbAog ICAgIFZhbHVlUHJvZmlsZSgpIDogVmFsdWVQcm9maWxlV2l0aExvZ051bWJlck9mQnVja2V0czww PigpIHsgfQogfTsKIAotLy8gVGhpcyBpcyBhIG1pbmkgdmFsdWUgcHJvZmlsZSB0byBjYXRjaCBw YXRob2xvZ2llcy4gSXQgaXMgYSBjb3VudGVyIHRoYXQgZ2V0cwotLy8gaW5jcmVtZW50ZWQgd2hl biB3ZSB0YWtlIHRoZSBzbG93IHBhdGggb24gYW55IGluc3RydWN0aW9uLgotc3RydWN0IFJhcmVD YXNlUHJvZmlsZSB7Ci0gICAgUmFyZUNhc2VQcm9maWxlKEJ5dGVjb2RlSW5kZXggYnl0ZWNvZGVJ bmRleCkKLSAgICAgICAgOiBtX2J5dGVjb2RlSW5kZXgoYnl0ZWNvZGVJbmRleCkKLSAgICB7Ci0g ICAgfQotICAgIFJhcmVDYXNlUHJvZmlsZSgpID0gZGVmYXVsdDsKLSAgICAKLSAgICBCeXRlY29k ZUluZGV4IG1fYnl0ZWNvZGVJbmRleCB7IH07Ci0gICAgdWludDMyX3QgbV9jb3VudGVyIHsgMCB9 OwotfTsKLQotaW5saW5lIEJ5dGVjb2RlSW5kZXggZ2V0UmFyZUNhc2VQcm9maWxlQnl0ZWNvZGVJ bmRleChSYXJlQ2FzZVByb2ZpbGUqIHJhcmVDYXNlUHJvZmlsZSkKLXsKLSAgICByZXR1cm4gcmFy ZUNhc2VQcm9maWxlLT5tX2J5dGVjb2RlSW5kZXg7Ci19Ci0KIHN0cnVjdCBWYWx1ZVByb2ZpbGVB bmRWaXJ0dWFsUmVnaXN0ZXIgOiBwdWJsaWMgVmFsdWVQcm9maWxlIHsKICAgICBWaXJ0dWFsUmVn aXN0ZXIgbV9vcGVyYW5kOwogfTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAyNzc3NDgpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTA2NywyMiArMTA2Nyw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogICAgICAgICAKLSAgICAgICAgaWYgKG1faW5saW5lU3RhY2tUb3AtPm1fcHJvZmlsZWRCbG9j ay0+bGlrZWx5VG9UYWtlU2xvd0Nhc2UobV9jdXJyZW50SW5kZXgpKSB7Ci0gICAgICAgICAgICBz d2l0Y2ggKG5vZGUtPm9wKCkpIHsKLSAgICAgICAgICAgIGNhc2UgVUludDMyVG9OdW1iZXI6Ci0g ICAgICAgICAgICBjYXNlIEFyaXRoQWRkOgotICAgICAgICAgICAgY2FzZSBBcml0aFN1YjoKLSAg ICAgICAgICAgIGNhc2UgVmFsdWVBZGQ6Ci0gICAgICAgICAgICBjYXNlIFZhbHVlTW9kOgotICAg ICAgICAgICAgY2FzZSBBcml0aE1vZDogLy8gZm9yIEFyaXRoTW9kICJNYXlPdmVyZmxvdyIgbWVh bnMgd2UgdHJpZWQgdG8gZGl2aWRlIGJ5IHplcm8sIG9yIHdlIHNhdyBkb3VibGUuCi0gICAgICAg ICAgICAgICAgbm9kZS0+bWVyZ2VGbGFncyhOb2RlTWF5T3ZlcmZsb3dJbnQzMkluQmFzZWxpbmUp OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAg ZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAg fQotICAgICAgICAKICAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgfQogICAgIApAQCAtNTQzNSw3 ICs1NDE5LDYgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZAogICAg ICAgICAgICAgaWYgKG1ldGFkYXRhLm1fdG9UaGlzU3RhdHVzICE9IFRvVGhpc09LCiAgICAgICAg ICAgICAgICAgfHwgIWNhY2hlZFN0cnVjdHVyZQogICAgICAgICAgICAgICAgIHx8IGNhY2hlZFN0 cnVjdHVyZS0+Y2xhc3NJbmZvKCktPm1ldGhvZFRhYmxlLnRvVGhpcyAhPSBKU09iamVjdDo6aW5m bygpLT5tZXRob2RUYWJsZS50b1RoaXMKLSAgICAgICAgICAgICAgICB8fCBtX2lubGluZVN0YWNr VG9wLT5tX3Byb2ZpbGVkQmxvY2stPmNvdWxkVGFrZVNsb3dDYXNlKG1fY3VycmVudEluZGV4KQog ICAgICAgICAgICAgICAgIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhp dFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlKQogICAgICAgICAgICAgICAgIHx8IChvcDEt Pm9wKCkgPT0gR2V0TG9jYWwgJiYgb3AxLT52YXJpYWJsZUFjY2Vzc0RhdGEoKS0+c3RydWN0dXJl Q2hlY2tIb2lzdGluZ0ZhaWxlZCgpKSkgewogICAgICAgICAgICAgICAgIHNldFRoaXMoYWRkVG9H cmFwaChUb1RoaXMsIE9wSW5mbyhieXRlY29kZS5tX2VjbWFNb2RlKSwgT3BJbmZvKGdldFByZWRp Y3Rpb24oKSksIG9wMSkpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAkocmV2aXNp b24gMjc3NzQ4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01MTUsMTAgKzUxNSw2IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZVNsb3dD YXNlcygpCiAgICAgbV9ieVZhbEluc3RydWN0aW9uSW5kZXggPSAwOwogICAgIG1fY2FsbExpbmtJ bmZvSW5kZXggPSAwOwogCi0gICAgRml4ZWRWZWN0b3I8UmFyZUNhc2VQcm9maWxlPiByYXJlQ2Fz ZVByb2ZpbGVzOwotICAgIGlmIChzaG91bGRFbWl0UHJvZmlsaW5nKCkpCi0gICAgICAgIHJhcmVD YXNlUHJvZmlsZXMgPSBGaXhlZFZlY3RvcjxSYXJlQ2FzZVByb2ZpbGU+KG1fYnl0ZWNvZGVDb3Vu dEhhdmluZ1Nsb3dDYXNlKTsKLSAgICAKICAgICB1bnNpZ25lZCBieXRlY29kZUNvdW50SGF2aW5n U2xvd0Nhc2UgPSAwOwogICAgIGZvciAoVmVjdG9yPFNsb3dDYXNlRW50cnk+OjppdGVyYXRvciBp dGVyID0gbV9zbG93Q2FzZXMuYmVnaW4oKTsgaXRlciAhPSBtX3Nsb3dDYXNlcy5lbmQoKTspIHsK ICAgICAgICAgbV9ieXRlY29kZUluZGV4ID0gaXRlci0+dG87CkBAIC01MjksMTAgKzUyNSw2IEBA IHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZVNsb3dDYXNlcygpCiAKICAgICAgICAgY29uc3QgSW5z dHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiA9IG1fY29kZUJsb2NrLT5pbnN0cnVjdGlvbnMo KS5hdChtX2J5dGVjb2RlSW5kZXgpLnB0cigpOwogICAgICAgICAKLSAgICAgICAgUmFyZUNhc2VQ cm9maWxlKiByYXJlQ2FzZVByb2ZpbGUgPSBudWxscHRyOwotICAgICAgICBpZiAoc2hvdWxkRW1p dFByb2ZpbGluZygpKQotICAgICAgICAgICAgcmFyZUNhc2VQcm9maWxlID0gJnJhcmVDYXNlUHJv ZmlsZXMuYXQoYnl0ZWNvZGVDb3VudEhhdmluZ1Nsb3dDYXNlKTsKLQogICAgICAgICBpZiAoSklU SW50ZXJuYWw6OnZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9nTG4oIkJhc2VsaW5lIEpJVCBl bWl0dGluZyBzbG93IGNvZGUgZm9yICIsIG1fYnl0ZWNvZGVJbmRleCwgIiBhdCBvZmZzZXQgIiwg KGxvbmcpZGVidWdPZmZzZXQoKSk7CiAKQEAgLTY0Nyw5ICs2MzksNiBAQCB2b2lkIEpJVDo6cHJp dmF0ZUNvbXBpbGVTbG93Q2FzZXMoKQogICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX01FU1NB R0UoaXRlciA9PSBtX3Nsb3dDYXNlcy5lbmQoKSB8fCBmaXJzdFRvLm9mZnNldCgpICE9IGl0ZXIt PnRvLm9mZnNldCgpLCAiTm90IGVub3VnaCBqdW1wcyBsaW5rZWQgaW4gc2xvdyBjYXNlIGNvZGVn ZW4uIik7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRShmaXJzdFRvLm9mZnNl dCgpID09IChpdGVyIC0gMSktPnRvLm9mZnNldCgpLCAiVG9vIG1hbnkganVtcHMgbGlua2VkIGlu IHNsb3cgY2FzZSBjb2RlZ2VuLiIpOwogICAgICAgICAKLSAgICAgICAgaWYgKHNob3VsZEVtaXRQ cm9maWxpbmcoKSkKLSAgICAgICAgICAgIGFkZDMyKFRydXN0ZWRJbW0zMigxKSwgQWJzb2x1dGVB ZGRyZXNzKCZyYXJlQ2FzZVByb2ZpbGUtPm1fY291bnRlcikpOwotCiAgICAgICAgIGVtaXRKdW1w U2xvd1RvSG90KGp1bXAoKSwgMCk7CiAgICAgICAgICsrYnl0ZWNvZGVDb3VudEhhdmluZ1Nsb3dD YXNlOwogICAgIH0KQEAgLTY2Myw5ICs2NTIsNiBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVT bG93Q2FzZXMoKQogICAgIFJFTEVBU0VfQVNTRVJUKG1fcHJpdmF0ZUJyYW5kQWNjZXNzSW5kZXgg PT0gbV9wcml2YXRlQnJhbmRBY2Nlc3Nlcy5zaXplKCkpOwogICAgIFJFTEVBU0VfQVNTRVJUKG1f Y2FsbExpbmtJbmZvSW5kZXggPT0gbV9jYWxsQ29tcGlsYXRpb25JbmZvLnNpemUoKSk7CiAKLSAg ICBpZiAoc2hvdWxkRW1pdFByb2ZpbGluZygpKQotICAgICAgICBtX2NvZGVCbG9jay0+c2V0UmFy ZUNhc2VQcm9maWxlcyhXVEZNb3ZlKHJhcmVDYXNlUHJvZmlsZXMpKTsKLQogI2lmbmRlZiBOREVC VUcKICAgICAvLyBSZXNldCB0aGlzLCBpbiBvcmRlciB0byBndWFyZCBpdHMgdXNlIHdpdGggQVNT RVJUcy4KICAgICBtX2J5dGVjb2RlSW5kZXggPSBCeXRlY29kZUluZGV4KCk7Cg==