210252 2020-04-09 00:50:15 -0700 Use more PAC diversity for JIT probe code. 2020-04-16 15:37:02 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210254 210314 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1639516 0 mark.lam 2020-04-09 00:50:15 -0700 <rdar://problem/54490367> 1639541 1 395927 mark.lam 2020-04-09 02:34:53 -0700 Created attachment 395927 work in progress. 1640280 2 396107 mark.lam 2020-04-10 11:25:47 -0700 Created attachment 396107 proposed patch. 1640321 3 396107 keith_miller 2020-04-10 13:12:55 -0700 Comment on attachment 396107 proposed patch. r=me. Can you confirm the failing JSC test isn't related to your patch though? 1640324 4 mark.lam 2020-04-10 13:21:37 -0700 Thanks for the review. (In reply to Keith Miller from comment #3) > Comment on attachment 396107 [details] > proposed patch. > > r=me. Can you confirm the failing JSC test isn't related to your patch > though? The failing test is stress/regress-189028.js.ftl-eager. It does not reproduce for me locally. Hence, it's not due to my patch. 1640333 5 mark.lam 2020-04-10 13:28:09 -0700 Landed in r259897: <http://trac.webkit.org/r259897>. 1642433 6 mark.lam 2020-04-16 14:41:09 -0700 Rolled out r259897 in r260222: <http://trac.webkit.org/r260222>. 1642457 7 mark.lam 2020-04-16 15:37:02 -0700 The issue was just a debug ASSERT that does not apply for non-ARM64E builds. Re-landed in r260223: <http://trac.webkit.org/r260223>. 395927 2020-04-09 02:34:53 -0700 2020-04-10 11:25:47 -0700 work in progress. bug-210252.patch text/plain 9631 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU5Nzg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDIwLTA0LTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgbW9yZSBQQUMgZGl2ZXJzaXR5IGZvciBKSVQgcHJvYmUgY29kZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI1MgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTQ0OTAzNjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlcjo6cHJvYmUpOgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTTY0LmNwcDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXI6OnByb2JlKToKKyAg ICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJQcmludGVyLmg6CisgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyOjpwcmludCk6CisgICAgICAgICogYXNzZW1ibGVyL1Byb2JlQ29udGV4 dC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNDUHRyVGFnLmg6CisgICAgICAgICogd2FzbS9XYXNt QWlySVJHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpXYXNtOjpBaXJJUkdlbmVyYXRvcjo6 ZW1pdExvb3BUaWVyVXBDaGVjayk6CisgICAgICAgICogd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5j cHA6CisgICAgICAgIChKU0M6Oldhc206OkIzSVJHZW5lcmF0b3I6OmVtaXRMb29wVGllclVwQ2hl Y2spOgorCiAyMDIwLTA0LTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBJbXBsZW1lbnQgYSBtb3JlIGVmZmljaWVudCB0YWdDRnVuY3Rpb24oKSB0b29sLgpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxl ci5jcHAJKHJldmlzaW9uIDI1OTc4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAK ICNpZiBFTkFCTEUoQVNTRU1CTEVSKQogCisjaW5jbHVkZSAiSlNDUHRyVGFnLmgiCiAjaW5jbHVk ZSAiT3B0aW9ucy5oIgogI2luY2x1ZGUgIlByb2JlQ29udGV4dC5oIgogI2luY2x1ZGUgPHd0Zi9Q cmludFN0cmVhbS5oPgpAQCAtNTUsOCArNTYsOSBAQCBzdGF0aWMgdm9pZCBzdGRGdW5jdGlvbkNh bGxiYWNrKFByb2JlOjpDCiAgICAgCiB2b2lkIE1hY3JvQXNzZW1ibGVyOjpwcm9iZShGdW5jdGlv bjx2b2lkKFByb2JlOjpDb250ZXh0Jik+IGZ1bmMpCiB7Ci0gICAgcHJvYmUoc3RkRnVuY3Rpb25D YWxsYmFjaywgbmV3IEZ1bmN0aW9uPHZvaWQoUHJvYmU6OkNvbnRleHQmKT4oV1RGTW92ZShmdW5j KSkpOworICAgIHByb2JlKHRhZ0NGdW5jdGlvbjxKSVRQcm9iZVB0clRhZz4oc3RkRnVuY3Rpb25D YWxsYmFjayksIG5ldyBGdW5jdGlvbjx2b2lkKFByb2JlOjpDb250ZXh0Jik+KFdURk1vdmUoZnVu YykpKTsKIH0KKwogI2VuZGlmIC8vIEVOQUJMRShNQVNNX1BST0JFKQogCiB9IC8vIG5hbWVzcGFj ZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJBUk02NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci9NYWNyb0Fzc2VtYmxlckFSTTY0LmNwcAkocmV2aXNpb24gMjU5Nzg2KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjgsNiArMjgsNyBAQAogI2lmIEVOQUJMRShBU1NFTUJMRVIpICYmIENQVShBUk02 NCkKICNpbmNsdWRlICJNYWNyb0Fzc2VtYmxlci5oIgogCisjaW5jbHVkZSAiSlNDUHRyVGFnLmgi CiAjaW5jbHVkZSAiUHJvYmVDb250ZXh0LmgiCiAjaW5jbHVkZSA8d3RmL0lubGluZUFTTS5oPgog CkBAIC0yOTcsNiArMjk4LDEzIEBAIHN0YXRpY19hc3NlcnQoTFJfUkVTVE9SQVRJT05fTFJfT0ZG U0VUID0KIHN0YXRpY19hc3NlcnQoTFJfUkVTVE9SQVRJT05fU0laRSA9PSBzaXplb2YoTFJSZXN0 b3JhdGlvblJlY29yZCksICJMUl9SRVNUT1JBVElPTl9TSVpFIGlzIGluY29ycmVjdCIpOwogc3Rh dGljX2Fzc2VydCghKHNpemVvZihMUlJlc3RvcmF0aW9uUmVjb3JkKSAmIDB4ZiksICJMUlJlc3Rv cmF0aW9uUmVjb3JkIG11c3QgYmUgMTYtYnl0ZSBhbGlnbmVkIik7CiAKKyNpZiBDUFUoQVJNNjRF KQorI2RlZmluZSBKSVRfUFJPQkVfRVhFQ1VUT1JfUFRSX1RBRyAweDI4ZGUKKyNkZWZpbmUgSklU X1BST0JFX1NUQUNLX0lOSVRJQUxJWkFUSU9OX0ZVTkNUSU9OX1BUUl9UQUcgMHgzMTVjCitzdGF0 aWNfYXNzZXJ0KEpJVF9QUk9CRV9FWEVDVVRPUl9QVFJfVEFHID09IEpJVFByb2JlRXhlY3V0b3JQ dHJUYWcpOworc3RhdGljX2Fzc2VydChKSVRfUFJPQkVfU1RBQ0tfSU5JVElBTElaQVRJT05fRlVO Q1RJT05fUFRSX1RBRyA9PSBKSVRQcm9iZVN0YWNrSW5pdGlhbGl6YXRpb25GdW5jdGlvblB0clRh Zyk7CisjZW5kaWYKKwogLy8gV2UgdXNlIHgyOSBhbmQgeDMwIGluc3RlYWQgb2YgZnAgYW5kIGxy IGJlY2F1c2UgR0NDJ3MgaW5saW5lIGFzc2VtYmxlciBkb2VzIG5vdCByZWNvZ25pemUgZnAgYW5k IGxyLgogLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU1 MTIgZm9yIGRldGFpbHMuCiBhc20gKApAQCAtMzgyLDcgKzM5MCw4IEBAIGFzbSAoCiAgICAgLy8g dGhlIGNhbGxlciBvZiB0aGUgcHJvYmUgKHdoaWNoIGlzIHdoYXQgd2Ugd2FudCBpbiBvcmRlciB0 byBwbGF5IG5pY2Ugd2l0aCBkZWJ1Z2dlcnMgZS5nLiBsbGRiKS4KICAgICAibW92ICAgICAgIHgw LCBzcCIgIlxuIiAvLyBTZXQgdGhlIFByb2JlOjpTdGF0ZSogYXJnLgogI2lmIENQVShBUk02NEUp Ci0gICAgImJscmFheiAgICB4MjgiICJcbiIgLy8gQ2FsbCB0aGUgcHJvYmUgaGFuZGxlci4KKyAg ICAibW92eiAgICAgIGxyLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoSklUX1BST0JFX0VYRUNVVE9S X1BUUl9UQUcpICJcbiIKKyAgICAiYmxyYWIgICAgIHgyOCwgbHIiICJcbiIgLy8gQ2FsbCB0aGUg cHJvYmUgaGFuZGxlci4KICNlbHNlCiAgICAgImJsciAgICAgICB4MjgiICJcbiIgLy8gQ2FsbCB0 aGUgcHJvYmUgaGFuZGxlci4KICNlbmRpZgpAQCAtNDIyLDcgKzQzMSw4IEBAIGFzbSAoCiAKICAg ICAibW92ICAgICAgIHgwLCB4MjciICJcbiIgLy8gU2V0IHRoZSBQcm9iZTo6U3RhdGUqIGFyZy4K ICNpZiBDUFUoQVJNNjRFKQotICAgICJibHJhYXogICAgeDIiICJcbiIgLy8gQ2FsbCB0aGUgaW5p dGlhbGl6ZVN0YWNrRnVuY3Rpb24gKGxvYWRlZCBpbnRvIHgyIGFib3ZlKS4KKyAgICAibW92eiAg ICAgIGxyLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoSklUX1BST0JFX1NUQUNLX0lOSVRJQUxJWkFU SU9OX0ZVTkNUSU9OX1BUUl9UQUcpICJcbiIKKyAgICAiYmxyYWIgICAgIHgyLCBsciIgIlxuIiAv LyBDYWxsIHRoZSBpbml0aWFsaXplU3RhY2tGdW5jdGlvbiAobG9hZGVkIGludG8geDIgYWJvdmUp LmFsbCB0aGUgcHJvYmUgaGFuZGxlci4KICNlbHNlCiAgICAgImJsciAgICAgICB4MiIgIlxuIiAv LyBDYWxsIHRoZSBpbml0aWFsaXplU3RhY2tGdW5jdGlvbiAobG9hZGVkIGludG8geDIgYWJvdmUp LgogI2VuZGlmCkBAIC01MzEsMTEgKzU0MSwxMiBAQCB2b2lkIE1hY3JvQXNzZW1ibGVyOjpwcm9i ZShQcm9iZTo6RnVuY3RpCiAgICAgc3RvcmVQYWlyNjQoeDI0LCB4MjUsIHNwLCBUcnVzdGVkSW1t MzIob2Zmc2V0b2YoSW5jb21pbmdQcm9iZVJlY29yZCwgeDI0KSkpOwogICAgIHN0b3JlUGFpcjY0 KHgyNiwgeDI3LCBzcCwgVHJ1c3RlZEltbTMyKG9mZnNldG9mKEluY29taW5nUHJvYmVSZWNvcmQs IHgyNikpKTsKICAgICBzdG9yZVBhaXI2NCh4MjgsIHgzMCwgc3AsIFRydXN0ZWRJbW0zMihvZmZz ZXRvZihJbmNvbWluZ1Byb2JlUmVjb3JkLCB4MjgpKSk7IC8vIE5vdGU6IHgzMCBpcyBsci4KLSAg ICBtb3ZlKFRydXN0ZWRJbW1QdHIocmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oY3RpTWFzbVByb2Jl VHJhbXBvbGluZSkpLCB4MjYpOwotICAgIG1vdmUoVHJ1c3RlZEltbVB0cihyZWludGVycHJldF9j YXN0PHZvaWQqPihQcm9iZTo6ZXhlY3V0ZVByb2JlKSksIHgyOCk7CisgICAgbW92ZShUcnVzdGVk SW1tUHRyKHRhZ0NGdW5jdGlvbjxKSVRQcm9iZVRyYW1wb2xpbmVQdHJUYWc+KGN0aU1hc21Qcm9i ZVRyYW1wb2xpbmUpKSwgeDI2KTsKKyAgICBtb3ZlKFRydXN0ZWRJbW1QdHIodGFnQ0Z1bmN0aW9u PEpJVFByb2JlRXhlY3V0b3JQdHJUYWc+KFByb2JlOjpleGVjdXRlUHJvYmUpKSwgeDI4KTsKKyAg ICBBU1NFUlQoaXNUYWdnZWRXaXRoKGZ1bmN0aW9uLCBKSVRQcm9iZVB0clRhZykpOwogICAgIG1v dmUoVHJ1c3RlZEltbVB0cihyZWludGVycHJldF9jYXN0PHZvaWQqPihmdW5jdGlvbikpLCB4MjQp OwogICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhcmcpLCB4MjUpOwotICAgIGNhbGwoeDI2LCBDRnVu Y3Rpb25QdHJUYWcpOworICAgIGNhbGwoeDI2LCBKSVRQcm9iZVRyYW1wb2xpbmVQdHJUYWcpOwog CiAgICAgLy8gY3RpTWFzbVByb2JlVHJhbXBvbGluZSBzaG91bGQgaGF2ZSByZXN0b3JlZCBldmVy eSByZWdpc3RlciBleGNlcHQgZm9yIGxyIGFuZCB0aGUgc3AuCiAgICAgbG9hZDY0KEFkZHJlc3Mo c3AsIG9mZnNldG9mKExSUmVzdG9yYXRpb25SZWNvcmQsIGxyKSksIGxyKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJQcmludGVyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclBy aW50ZXIuaAkocmV2aXNpb24gMjU5Nzg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlclByaW50ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUs NyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkpTQ1B0clRhZy5oIgogI2luY2x1ZGUg Ik1hY3JvQXNzZW1ibGVyLmgiCiAjaW5jbHVkZSAiUHJpbnRlci5oIgogI2luY2x1ZGUgIlByb2Jl Q29udGV4dC5oIgpAQCAtMjMyLDEyICsyMzMsMTIgQEAgdGVtcGxhdGU8dHlwZW5hbWUuLi4gQXJn dW1lbnRzPgogaW5saW5lIHZvaWQgTWFjcm9Bc3NlbWJsZXI6OnByaW50KEFyZ3VtZW50cyYmLi4u IGFyZ3VtZW50cykKIHsKICAgICBhdXRvIHByaW50UmVjb3JkTGlzdCA9IFByaW50ZXI6Om1ha2VQ cmludFJlY29yZExpc3Qoc3RkOjpmb3J3YXJkPEFyZ3VtZW50cz4oYXJndW1lbnRzKS4uLik7Ci0g ICAgcHJvYmUoUHJpbnRlcjo6cHJpbnRDYWxsYmFjaywgcHJpbnRSZWNvcmRMaXN0KTsKKyAgICBw cm9iZSh0YWdDRnVuY3Rpb248SklUUHJvYmVQdHJUYWc+KFByaW50ZXI6OnByaW50Q2FsbGJhY2sp LCBwcmludFJlY29yZExpc3QpOwogfQogCiBpbmxpbmUgdm9pZCBNYWNyb0Fzc2VtYmxlcjo6cHJp bnQoUHJpbnRlcjo6UHJpbnRSZWNvcmRMaXN0KiBwcmludFJlY29yZExpc3QpCiB7Ci0gICAgcHJv YmUoUHJpbnRlcjo6cHJpbnRDYWxsYmFjaywgcHJpbnRSZWNvcmRMaXN0KTsKKyAgICBwcm9iZSh0 YWdDRnVuY3Rpb248SklUUHJvYmVQdHJUYWc+KFByaW50ZXI6OnByaW50Q2FsbGJhY2spLCBwcmlu dFJlY29yZExpc3QpOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKE1BU01fUFJPQkUpCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1Byb2JlQ29udGV4dC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvUHJvYmVDb250ZXh0LmgJKHJldmlz aW9uIDI1OTc4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvUHJvYmVDb250 ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NSwxMCArMTc1LDE4IEBAIFQgQ1BVU3RhdGU6OnNw KCkgY29uc3QKIHN0cnVjdCBTdGF0ZTsKIHR5cGVkZWYgdm9pZCAoKlN0YWNrSW5pdGlhbGl6YXRp b25GdW5jdGlvbikoU3RhdGUqKTsKIAorI2lmIENQVShBUk02NEUpCisjZGVmaW5lIFBST0JFX0ZV TkNUSU9OX1BUUkFVVEggX19wdHJhdXRoKHB0cmF1dGhfa2V5X3Byb2Nlc3NfZGVwZW5kZW50X2Nv ZGUsIDAsIEpJVFByb2JlUHRyVGFnKQorI2RlZmluZSBQUk9CRV9TVEFDS19JTklUSUFMSVpBVElP Tl9GVU5DVElPTl9QVFJBVVRIIF9fcHRyYXV0aChwdHJhdXRoX2tleV9wcm9jZXNzX2RlcGVuZGVu dF9jb2RlLCAwLCBKSVRQcm9iZVN0YWNrSW5pdGlhbGl6YXRpb25GdW5jdGlvblB0clRhZykKKyNl bHNlCisjZGVmaW5lIFBST0JFX0ZVTkNUSU9OX1BUUkFVVEgKKyNkZWZpbmUgUFJPQkVfU1RBQ0tf SU5JVElBTElaQVRJT05fRlVOQ1RJT05fUFRSQVVUSAorI2VuZGlmCisKIHN0cnVjdCBTdGF0ZSB7 Ci0gICAgUHJvYmU6OkZ1bmN0aW9uIHByb2JlRnVuY3Rpb247CisgICAgUHJvYmU6OkZ1bmN0aW9u IFBST0JFX0ZVTkNUSU9OX1BUUkFVVEggcHJvYmVGdW5jdGlvbjsKICAgICB2b2lkKiBhcmc7Ci0g ICAgU3RhY2tJbml0aWFsaXphdGlvbkZ1bmN0aW9uIGluaXRpYWxpemVTdGFja0Z1bmN0aW9uOwor ICAgIFN0YWNrSW5pdGlhbGl6YXRpb25GdW5jdGlvbiBQUk9CRV9TVEFDS19JTklUSUFMSVpBVElP Tl9GVU5DVElPTl9QVFJBVVRIIGluaXRpYWxpemVTdGFja0Z1bmN0aW9uOwogICAgIHZvaWQqIGlu aXRpYWxpemVTdGFja0FyZzsKICAgICBDUFVTdGF0ZSBjcHU7CiB9OwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDUHRyVGFnLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDUHRyVGFnLmgJKHJldmlzaW9uIDI1OTc4NikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ1B0clRhZy5oCSh3b3JraW5nIGNvcHkpCkBA IC0zOSw2ICszOSwxMCBAQCB1c2luZyBQdHJUYWcgPSBXVEY6OlB0clRhZzsKICAgICB2KERpc2Fz c2VtYmx5UHRyVGFnKSBcCiAgICAgdihFeGNlcHRpb25IYW5kbGVyUHRyVGFnKSBcCiAgICAgdihF eGVjdXRhYmxlTWVtb3J5UHRyVGFnKSBcCisgICAgdihKSVRQcm9iZVB0clRhZykgXAorICAgIHYo SklUUHJvYmVUcmFtcG9saW5lUHRyVGFnKSBcCisgICAgdihKSVRQcm9iZUV4ZWN1dG9yUHRyVGFn KSBcCisgICAgdihKSVRQcm9iZVN0YWNrSW5pdGlhbGl6YXRpb25GdW5jdGlvblB0clRhZykgXAog ICAgIHYoSklUVGh1bmtQdHJUYWcpIFwKICAgICB2KEpJVFN0dWJSb3V0aW5lUHRyVGFnKSBcCiAg ICAgdihKU0VudHJ5UHRyVGFnKSBcCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtQWlySVJHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL1dhc21BaXJJUkdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDI1OTc4NikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21BaXJJUkdlbmVyYXRvci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOS0yMDIwIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA QCAtMTgyNiw3ICsxODI2LDcgQEAgdm9pZCBBaXJJUkdlbmVyYXRvcjo6ZW1pdExvb3BUaWVyVXBD aGVjawogICAgICAgICAgICAgZm9yY2VPU1JFbnRyeS5saW5rKCZqaXQpOwogICAgICAgICAgICAg dGllclVwLmxpbmsoJmppdCk7CiAKLSAgICAgICAgICAgIGppdC5wcm9iZShvcGVyYXRpb25XYXNt VHJpZ2dlck9TUkVudHJ5Tm93LCBvc3JFbnRyeURhdGFQdHIpOworICAgICAgICAgICAgaml0LnBy b2JlKHRhZ0NGdW5jdGlvbjxKSVRQcm9iZVB0clRhZz4ob3BlcmF0aW9uV2FzbVRyaWdnZXJPU1JF bnRyeU5vdyksIG9zckVudHJ5RGF0YVB0cik7CiAgICAgICAgICAgICBqaXQuYnJhbmNoVGVzdFB0 cihDQ2FsbEhlbHBlcnM6Olplcm8sIEdQUkluZm86OmFyZ3VtZW50R1BSMCkubGlua1RvKHRpZXJV cFJlc3VtZSwgJmppdCk7CiAgICAgICAgICAgICBqaXQuZmFySnVtcChHUFJJbmZvOjphcmd1bWVu dEdQUjEsIFdhc21FbnRyeVB0clRhZyk7CiAgICAgICAgIH0pOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3dhc20vV2FzbUIzSVJHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21CM0lSR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gMjU5 Nzg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUIzSVJHZW5lcmF0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMzM4LDcgKzEzMzgsNyBAQCB2b2lkIEIzSVJHZW5lcmF0b3I6 OmVtaXRMb29wVGllclVwQ2hlY2soCiAgICAgICAgICAgICBmb3JjZU9TUkVudHJ5LmxpbmsoJmpp dCk7CiAgICAgICAgICAgICB0aWVyVXAubGluaygmaml0KTsKIAotICAgICAgICAgICAgaml0LnBy b2JlKG9wZXJhdGlvbldhc21UcmlnZ2VyT1NSRW50cnlOb3csIG9zckVudHJ5RGF0YVB0cik7Cisg ICAgICAgICAgICBqaXQucHJvYmUodGFnQ0Z1bmN0aW9uPEpJVFByb2JlUHRyVGFnPihvcGVyYXRp b25XYXNtVHJpZ2dlck9TUkVudHJ5Tm93KSwgb3NyRW50cnlEYXRhUHRyKTsKICAgICAgICAgICAg IGppdC5icmFuY2hUZXN0UHRyKENDYWxsSGVscGVyczo6WmVybywgR1BSSW5mbzo6YXJndW1lbnRH UFIwKS5saW5rVG8odGllclVwUmVzdW1lLCAmaml0KTsKICAgICAgICAgICAgIGppdC5mYXJKdW1w KEdQUkluZm86OmFyZ3VtZW50R1BSMSwgV2FzbUVudHJ5UHRyVGFnKTsKICAgICAgICAgfSk7Cg== 396107 2020-04-10 11:25:47 -0700 2020-04-10 13:12:55 -0700 proposed patch. bug-210252.patch text/plain 11436 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU5ODg1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSArMSwzNSBAQAor MjAyMC0wNC0xMCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNl IG1vcmUgUEFDIGRpdmVyc2l0eSBmb3IgSklUIHByb2JlIGNvZGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyNTIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzU0NDkwMzY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEludHJvZHVjaW5nIG5ldyBQdHJUYWdzOgorICAgICAgICAgICAgSklUUHJvYmVQ dHJUYWcgLSBmb3IgdGhlIGNsaWVudCBwcm9iZSBmdW5jdGlvbi4KKyAgICAgICAgICAgIEpJVFBy b2JlVHJhbXBvbGluZVB0clRhZyAtIGZvciBjYWxsaW5nIHRoZSBjdGlNYXNtUHJvYmVUcmFtcG9s aW5lLgorICAgICAgICAgICAgSklUUHJvYmVFeGVjdXRvclB0clRhZyAtIGZvciBjYWxsaW5nIHRo ZSBwcm9iZSBleGVjdXRvci4KKyAgICAgICAgICAgICAgICBDdXJyZW50bHksIHRoaXMgaXMgb25s eSB0aGUgUHJvYmU6OmV4ZWN1dGVQcm9iZSgpLgorICAgICAgICAgICAgSklUUHJvYmVTdGFja0lu aXRpYWxpemF0aW9uRnVuY3Rpb25QdHJUYWcgLSBmb3IgY2FsbGluZyB0aGUgb3B0aW9uYWwgc3Rh Y2sKKyAgICAgICAgICAgICAgICBpbml0aWFsaXphdGlvbiBmdW5jdGlvbiB0aGF0IHRoZSBjbGll bnQgcHJvYmUgZnVuY3Rpb24gbWF5IHNldC4KKworICAgICAgICBXZSdsbCBub3cgdXNlIHRoZXNl IGluIHRoZSBKSVQgcHJvYmUgbWVjaGFuaXNtIGluc3RlYWQgb2YgYWRvcHRpbmcgdGhlIGRlZmF1 bHQKKyAgICAgICAgQ0Z1bmN0aW9uUHRyVGFnLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyLmNwcDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXI6OnByb2JlKToKKyAg ICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5jcHA6CisgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyOjpwcm9iZSk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyUHJpbnRlci5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6cHJpbnQpOgorICAg ICAgICAqIGFzc2VtYmxlci9Qcm9iZUNvbnRleHQuaDoKKyAgICAgICAgKiBydW50aW1lL0pTQ1B0 clRhZy5oOgorICAgICAgICAqIHRvb2xzL0pTRG9sbGFyVk0uY3BwOgorICAgICAgICAoSlNDOjpj YWxsV2l0aFN0YWNrU2l6ZVByb2JlRnVuY3Rpb24pOgorICAgICAgICAqIHdhc20vV2FzbUFpcklS R2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6V2FzbTo6QWlySVJHZW5lcmF0b3I6OmVtaXRM b29wVGllclVwQ2hlY2spOgorICAgICAgICAqIHdhc20vV2FzbUIzSVJHZW5lcmF0b3IuY3BwOgor ICAgICAgICAoSlNDOjpXYXNtOjpCM0lSR2VuZXJhdG9yOjplbWl0TG9vcFRpZXJVcENoZWNrKToK KwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIwMjAtMDQtMTAgPT0KSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCShy ZXZpc2lvbiAyNTk4ODUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5B QkxFKEFTU0VNQkxFUikKIAorI2luY2x1ZGUgIkpTQ1B0clRhZy5oIgogI2luY2x1ZGUgIk9wdGlv bnMuaCIKICNpbmNsdWRlICJQcm9iZUNvbnRleHQuaCIKICNpbmNsdWRlIDx3dGYvUHJpbnRTdHJl YW0uaD4KQEAgLTU1LDggKzU2LDkgQEAgc3RhdGljIHZvaWQgc3RkRnVuY3Rpb25DYWxsYmFjayhQ cm9iZTo6QwogICAgIAogdm9pZCBNYWNyb0Fzc2VtYmxlcjo6cHJvYmUoRnVuY3Rpb248dm9pZChQ cm9iZTo6Q29udGV4dCYpPiBmdW5jKQogewotICAgIHByb2JlKHN0ZEZ1bmN0aW9uQ2FsbGJhY2ss IG5ldyBGdW5jdGlvbjx2b2lkKFByb2JlOjpDb250ZXh0Jik+KFdURk1vdmUoZnVuYykpKTsKKyAg ICBwcm9iZSh0YWdDRnVuY3Rpb248SklUUHJvYmVQdHJUYWc+KHN0ZEZ1bmN0aW9uQ2FsbGJhY2sp LCBuZXcgRnVuY3Rpb248dm9pZChQcm9iZTo6Q29udGV4dCYpPihXVEZNb3ZlKGZ1bmMpKSk7CiB9 CisKICNlbmRpZiAvLyBFTkFCTEUoTUFTTV9QUk9CRSkKIAogfSAvLyBuYW1lc3BhY2UgSlNDCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJBUk02NC5jcHAJKHJldmlzaW9uIDI1OTg4NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI4LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUoQVNTRU1CTEVSKSAmJiBDUFUoQVJNNjQpCiAjaW5j bHVkZSAiTWFjcm9Bc3NlbWJsZXIuaCIKIAorI2luY2x1ZGUgIkpTQ1B0clRhZy5oIgogI2luY2x1 ZGUgIlByb2JlQ29udGV4dC5oIgogI2luY2x1ZGUgPHd0Zi9JbmxpbmVBU00uaD4KIApAQCAtMjk3 LDYgKzI5OCwxMyBAQCBzdGF0aWNfYXNzZXJ0KExSX1JFU1RPUkFUSU9OX0xSX09GRlNFVCA9CiBz dGF0aWNfYXNzZXJ0KExSX1JFU1RPUkFUSU9OX1NJWkUgPT0gc2l6ZW9mKExSUmVzdG9yYXRpb25S ZWNvcmQpLCAiTFJfUkVTVE9SQVRJT05fU0laRSBpcyBpbmNvcnJlY3QiKTsKIHN0YXRpY19hc3Nl cnQoIShzaXplb2YoTFJSZXN0b3JhdGlvblJlY29yZCkgJiAweGYpLCAiTFJSZXN0b3JhdGlvblJl Y29yZCBtdXN0IGJlIDE2LWJ5dGUgYWxpZ25lZCIpOwogCisjaWYgQ1BVKEFSTTY0RSkKKyNkZWZp bmUgSklUX1BST0JFX0VYRUNVVE9SX1BUUl9UQUcgMHgyOGRlCisjZGVmaW5lIEpJVF9QUk9CRV9T VEFDS19JTklUSUFMSVpBVElPTl9GVU5DVElPTl9QVFJfVEFHIDB4MzE1Yworc3RhdGljX2Fzc2Vy dChKSVRfUFJPQkVfRVhFQ1VUT1JfUFRSX1RBRyA9PSBKSVRQcm9iZUV4ZWN1dG9yUHRyVGFnKTsK K3N0YXRpY19hc3NlcnQoSklUX1BST0JFX1NUQUNLX0lOSVRJQUxJWkFUSU9OX0ZVTkNUSU9OX1BU Ul9UQUcgPT0gSklUUHJvYmVTdGFja0luaXRpYWxpemF0aW9uRnVuY3Rpb25QdHJUYWcpOworI2Vu ZGlmCisKIC8vIFdlIHVzZSB4MjkgYW5kIHgzMCBpbnN0ZWFkIG9mIGZwIGFuZCBsciBiZWNhdXNl IEdDQydzIGlubGluZSBhc3NlbWJsZXIgZG9lcyBub3QgcmVjb2duaXplIGZwIGFuZCBsci4KIC8v IFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1NTEyIGZvciBk ZXRhaWxzLgogYXNtICgKQEAgLTM4Miw3ICszOTAsOCBAQCBhc20gKAogICAgIC8vIHRoZSBjYWxs ZXIgb2YgdGhlIHByb2JlICh3aGljaCBpcyB3aGF0IHdlIHdhbnQgaW4gb3JkZXIgdG8gcGxheSBu aWNlIHdpdGggZGVidWdnZXJzIGUuZy4gbGxkYikuCiAgICAgIm1vdiAgICAgICB4MCwgc3AiICJc biIgLy8gU2V0IHRoZSBQcm9iZTo6U3RhdGUqIGFyZy4KICNpZiBDUFUoQVJNNjRFKQotICAgICJi bHJhYXogICAgeDI4IiAiXG4iIC8vIENhbGwgdGhlIHByb2JlIGhhbmRsZXIuCisgICAgIm1vdnog ICAgICBsciwgIyIgU1RSSU5HSVpFX1ZBTFVFX09GKEpJVF9QUk9CRV9FWEVDVVRPUl9QVFJfVEFH KSAiXG4iCisgICAgImJscmFiICAgICB4MjgsIGxyIiAiXG4iIC8vIENhbGwgdGhlIHByb2JlIGhh bmRsZXIuCiAjZWxzZQogICAgICJibHIgICAgICAgeDI4IiAiXG4iIC8vIENhbGwgdGhlIHByb2Jl IGhhbmRsZXIuCiAjZW5kaWYKQEAgLTQyMiw3ICs0MzEsOCBAQCBhc20gKAogCiAgICAgIm1vdiAg ICAgICB4MCwgeDI3IiAiXG4iIC8vIFNldCB0aGUgUHJvYmU6OlN0YXRlKiBhcmcuCiAjaWYgQ1BV KEFSTTY0RSkKLSAgICAiYmxyYWF6ICAgIHgyIiAiXG4iIC8vIENhbGwgdGhlIGluaXRpYWxpemVT dGFja0Z1bmN0aW9uIChsb2FkZWQgaW50byB4MiBhYm92ZSkuCisgICAgIm1vdnogICAgICBsciwg IyIgU1RSSU5HSVpFX1ZBTFVFX09GKEpJVF9QUk9CRV9TVEFDS19JTklUSUFMSVpBVElPTl9GVU5D VElPTl9QVFJfVEFHKSAiXG4iCisgICAgImJscmFiICAgICB4MiwgbHIiICJcbiIgLy8gQ2FsbCB0 aGUgaW5pdGlhbGl6ZVN0YWNrRnVuY3Rpb24gKGxvYWRlZCBpbnRvIHgyIGFib3ZlKS5hbGwgdGhl IHByb2JlIGhhbmRsZXIuCiAjZWxzZQogICAgICJibHIgICAgICAgeDIiICJcbiIgLy8gQ2FsbCB0 aGUgaW5pdGlhbGl6ZVN0YWNrRnVuY3Rpb24gKGxvYWRlZCBpbnRvIHgyIGFib3ZlKS4KICNlbmRp ZgpAQCAtNTMxLDExICs1NDEsMTIgQEAgdm9pZCBNYWNyb0Fzc2VtYmxlcjo6cHJvYmUoUHJvYmU6 OkZ1bmN0aQogICAgIHN0b3JlUGFpcjY0KHgyNCwgeDI1LCBzcCwgVHJ1c3RlZEltbTMyKG9mZnNl dG9mKEluY29taW5nUHJvYmVSZWNvcmQsIHgyNCkpKTsKICAgICBzdG9yZVBhaXI2NCh4MjYsIHgy Nywgc3AsIFRydXN0ZWRJbW0zMihvZmZzZXRvZihJbmNvbWluZ1Byb2JlUmVjb3JkLCB4MjYpKSk7 CiAgICAgc3RvcmVQYWlyNjQoeDI4LCB4MzAsIHNwLCBUcnVzdGVkSW1tMzIob2Zmc2V0b2YoSW5j b21pbmdQcm9iZVJlY29yZCwgeDI4KSkpOyAvLyBOb3RlOiB4MzAgaXMgbHIuCi0gICAgbW92ZShU cnVzdGVkSW1tUHRyKHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGN0aU1hc21Qcm9iZVRyYW1wb2xp bmUpKSwgeDI2KTsKLSAgICBtb3ZlKFRydXN0ZWRJbW1QdHIocmVpbnRlcnByZXRfY2FzdDx2b2lk Kj4oUHJvYmU6OmV4ZWN1dGVQcm9iZSkpLCB4MjgpOworICAgIG1vdmUoVHJ1c3RlZEltbVB0cih0 YWdDRnVuY3Rpb248SklUUHJvYmVUcmFtcG9saW5lUHRyVGFnPihjdGlNYXNtUHJvYmVUcmFtcG9s aW5lKSksIHgyNik7CisgICAgbW92ZShUcnVzdGVkSW1tUHRyKHRhZ0NGdW5jdGlvbjxKSVRQcm9i ZUV4ZWN1dG9yUHRyVGFnPihQcm9iZTo6ZXhlY3V0ZVByb2JlKSksIHgyOCk7CisgICAgQVNTRVJU KGlzVGFnZ2VkV2l0aChmdW5jdGlvbiwgSklUUHJvYmVQdHJUYWcpKTsKICAgICBtb3ZlKFRydXN0 ZWRJbW1QdHIocmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oZnVuY3Rpb24pKSwgeDI0KTsKICAgICBt b3ZlKFRydXN0ZWRJbW1QdHIoYXJnKSwgeDI1KTsKLSAgICBjYWxsKHgyNiwgQ0Z1bmN0aW9uUHRy VGFnKTsKKyAgICBjYWxsKHgyNiwgSklUUHJvYmVUcmFtcG9saW5lUHRyVGFnKTsKIAogICAgIC8v IGN0aU1hc21Qcm9iZVRyYW1wb2xpbmUgc2hvdWxkIGhhdmUgcmVzdG9yZWQgZXZlcnkgcmVnaXN0 ZXIgZXhjZXB0IGZvciBsciBhbmQgdGhlIHNwLgogICAgIGxvYWQ2NChBZGRyZXNzKHNwLCBvZmZz ZXRvZihMUlJlc3RvcmF0aW9uUmVjb3JkLCBscikpLCBscik7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyUHJpbnRlci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJQcmludGVyLmgJ KHJldmlzaW9uIDI1OTg4NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJQcmludGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDcgQEAKIAog I3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlICJKU0NQdHJUYWcuaCIKICNpbmNsdWRlICJNYWNyb0Fz c2VtYmxlci5oIgogI2luY2x1ZGUgIlByaW50ZXIuaCIKICNpbmNsdWRlICJQcm9iZUNvbnRleHQu aCIKQEAgLTIzMiwxMiArMjMzLDEyIEBAIHRlbXBsYXRlPHR5cGVuYW1lLi4uIEFyZ3VtZW50cz4K IGlubGluZSB2b2lkIE1hY3JvQXNzZW1ibGVyOjpwcmludChBcmd1bWVudHMmJi4uLiBhcmd1bWVu dHMpCiB7CiAgICAgYXV0byBwcmludFJlY29yZExpc3QgPSBQcmludGVyOjptYWtlUHJpbnRSZWNv cmRMaXN0KHN0ZDo6Zm9yd2FyZDxBcmd1bWVudHM+KGFyZ3VtZW50cykuLi4pOwotICAgIHByb2Jl KFByaW50ZXI6OnByaW50Q2FsbGJhY2ssIHByaW50UmVjb3JkTGlzdCk7CisgICAgcHJvYmUodGFn Q0Z1bmN0aW9uPEpJVFByb2JlUHRyVGFnPihQcmludGVyOjpwcmludENhbGxiYWNrKSwgcHJpbnRS ZWNvcmRMaXN0KTsKIH0KIAogaW5saW5lIHZvaWQgTWFjcm9Bc3NlbWJsZXI6OnByaW50KFByaW50 ZXI6OlByaW50UmVjb3JkTGlzdCogcHJpbnRSZWNvcmRMaXN0KQogewotICAgIHByb2JlKFByaW50 ZXI6OnByaW50Q2FsbGJhY2ssIHByaW50UmVjb3JkTGlzdCk7CisgICAgcHJvYmUodGFnQ0Z1bmN0 aW9uPEpJVFByb2JlUHRyVGFnPihQcmludGVyOjpwcmludENhbGxiYWNrKSwgcHJpbnRSZWNvcmRM aXN0KTsKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShNQVNNX1BST0JFKQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9Qcm9iZUNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1Byb2JlQ29udGV4dC5oCShyZXZpc2lvbiAyNTk4 ODUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1Byb2JlQ29udGV4dC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xNzUsMTAgKzE3NSwxOCBAQCBUIENQVVN0YXRlOjpzcCgpIGNvbnN0 CiBzdHJ1Y3QgU3RhdGU7CiB0eXBlZGVmIHZvaWQgKCpTdGFja0luaXRpYWxpemF0aW9uRnVuY3Rp b24pKFN0YXRlKik7CiAKKyNpZiBDUFUoQVJNNjRFKQorI2RlZmluZSBQUk9CRV9GVU5DVElPTl9Q VFJBVVRIIF9fcHRyYXV0aChwdHJhdXRoX2tleV9wcm9jZXNzX2RlcGVuZGVudF9jb2RlLCAwLCBK SVRQcm9iZVB0clRhZykKKyNkZWZpbmUgUFJPQkVfU1RBQ0tfSU5JVElBTElaQVRJT05fRlVOQ1RJ T05fUFRSQVVUSCBfX3B0cmF1dGgocHRyYXV0aF9rZXlfcHJvY2Vzc19kZXBlbmRlbnRfY29kZSwg MCwgSklUUHJvYmVTdGFja0luaXRpYWxpemF0aW9uRnVuY3Rpb25QdHJUYWcpCisjZWxzZQorI2Rl ZmluZSBQUk9CRV9GVU5DVElPTl9QVFJBVVRICisjZGVmaW5lIFBST0JFX1NUQUNLX0lOSVRJQUxJ WkFUSU9OX0ZVTkNUSU9OX1BUUkFVVEgKKyNlbmRpZgorCiBzdHJ1Y3QgU3RhdGUgewotICAgIFBy b2JlOjpGdW5jdGlvbiBwcm9iZUZ1bmN0aW9uOworICAgIFByb2JlOjpGdW5jdGlvbiBQUk9CRV9G VU5DVElPTl9QVFJBVVRIIHByb2JlRnVuY3Rpb247CiAgICAgdm9pZCogYXJnOwotICAgIFN0YWNr SW5pdGlhbGl6YXRpb25GdW5jdGlvbiBpbml0aWFsaXplU3RhY2tGdW5jdGlvbjsKKyAgICBTdGFj a0luaXRpYWxpemF0aW9uRnVuY3Rpb24gUFJPQkVfU1RBQ0tfSU5JVElBTElaQVRJT05fRlVOQ1RJ T05fUFRSQVVUSCBpbml0aWFsaXplU3RhY2tGdW5jdGlvbjsKICAgICB2b2lkKiBpbml0aWFsaXpl U3RhY2tBcmc7CiAgICAgQ1BVU3RhdGUgY3B1OwogfTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQ1B0clRhZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQ1B0clRhZy5oCShyZXZpc2lvbiAyNTk4ODUpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0NQdHJUYWcuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiAr MzksMTAgQEAgdXNpbmcgUHRyVGFnID0gV1RGOjpQdHJUYWc7CiAgICAgdihEaXNhc3NlbWJseVB0 clRhZykgXAogICAgIHYoRXhjZXB0aW9uSGFuZGxlclB0clRhZykgXAogICAgIHYoRXhlY3V0YWJs ZU1lbW9yeVB0clRhZykgXAorICAgIHYoSklUUHJvYmVQdHJUYWcpIFwKKyAgICB2KEpJVFByb2Jl VHJhbXBvbGluZVB0clRhZykgXAorICAgIHYoSklUUHJvYmVFeGVjdXRvclB0clRhZykgXAorICAg IHYoSklUUHJvYmVTdGFja0luaXRpYWxpemF0aW9uRnVuY3Rpb25QdHJUYWcpIFwKICAgICB2KEpJ VFRodW5rUHRyVGFnKSBcCiAgICAgdihKSVRTdHViUm91dGluZVB0clRhZykgXAogICAgIHYoSlNF bnRyeVB0clRhZykgXApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFy Vk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9KU0RvbGxh clZNLmNwcAkocmV2aXNpb24gMjU5ODg1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xz L0pTRG9sbGFyVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAxNS0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxNS0yMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjEzNiw3ICsyMTM2LDEwIEBAIHN0 YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmMKIHN0YXRpYyB2b2lkIGNhbGxX aXRoU3RhY2tTaXplUHJvYmVGdW5jdGlvbihQcm9iZTo6U3RhdGUqIHN0YXRlKQogewogICAgIEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBiaXR3aXNlX2Nhc3Q8SlNHbG9iYWxPYmplY3Qq PihzdGF0ZS0+YXJnKTsKLSAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9IGJpdHdpc2VfY2FzdDxK U0Z1bmN0aW9uKj4oc3RhdGUtPnByb2JlRnVuY3Rpb24pOworICAgIC8vIFRoZSBiaXRzIGxvYWRl ZCBmcm9tIHN0YXRlLT5wcm9iZUZ1bmN0aW9uIHdpbGwgYmUgdGFnZ2VkIGxpa2UKKyAgICAvLyBh IEMgZnVuY3Rpb24uIFNvLCB3ZSdsbCBuZWVkIHRvIHVudGFnIGl0IHRvIGV4dHJhY3QgdGhlIGJp dHMKKyAgICAvLyBmb3IgdGhlIEpTRnVuY3Rpb24qLgorICAgIEpTRnVuY3Rpb24qIGZ1bmN0aW9u ID0gYml0d2lzZV9jYXN0PEpTRnVuY3Rpb24qPih1bnRhZ0NvZGVQdHI8Q0Z1bmN0aW9uUHRyVGFn PihzdGF0ZS0+cHJvYmVGdW5jdGlvbikpOwogICAgIHN0YXRlLT5pbml0aWFsaXplU3RhY2tGdW5j dGlvbiA9IG51bGxwdHI7CiAgICAgc3RhdGUtPmluaXRpYWxpemVTdGFja0FyZyA9IG51bGxwdHI7 CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21BaXJJUkdlbmVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUFpcklSR2Vu ZXJhdG9yLmNwcAkocmV2aXNpb24gMjU5ODg1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vV2FzbUFpcklSR2VuZXJhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDE5LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xODI2LDcgKzE4MjYsNyBA QCB2b2lkIEFpcklSR2VuZXJhdG9yOjplbWl0TG9vcFRpZXJVcENoZWNrCiAgICAgICAgICAgICBm b3JjZU9TUkVudHJ5LmxpbmsoJmppdCk7CiAgICAgICAgICAgICB0aWVyVXAubGluaygmaml0KTsK IAotICAgICAgICAgICAgaml0LnByb2JlKG9wZXJhdGlvbldhc21UcmlnZ2VyT1NSRW50cnlOb3cs IG9zckVudHJ5RGF0YVB0cik7CisgICAgICAgICAgICBqaXQucHJvYmUodGFnQ0Z1bmN0aW9uPEpJ VFByb2JlUHRyVGFnPihvcGVyYXRpb25XYXNtVHJpZ2dlck9TUkVudHJ5Tm93KSwgb3NyRW50cnlE YXRhUHRyKTsKICAgICAgICAgICAgIGppdC5icmFuY2hUZXN0UHRyKENDYWxsSGVscGVyczo6WmVy bywgR1BSSW5mbzo6YXJndW1lbnRHUFIwKS5saW5rVG8odGllclVwUmVzdW1lLCAmaml0KTsKICAg ICAgICAgICAgIGppdC5mYXJKdW1wKEdQUkluZm86OmFyZ3VtZW50R1BSMSwgV2FzbUVudHJ5UHRy VGFnKTsKICAgICAgICAgfSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNt QjNJUkdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vV2FzbUIzSVJHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAyNTk4ODUpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzMzgsNyArMTMzOCw3IEBAIHZvaWQgQjNJUkdlbmVyYXRvcjo6ZW1pdExvb3BUaWVyVXBDaGVj aygKICAgICAgICAgICAgIGZvcmNlT1NSRW50cnkubGluaygmaml0KTsKICAgICAgICAgICAgIHRp ZXJVcC5saW5rKCZqaXQpOwogCi0gICAgICAgICAgICBqaXQucHJvYmUob3BlcmF0aW9uV2FzbVRy aWdnZXJPU1JFbnRyeU5vdywgb3NyRW50cnlEYXRhUHRyKTsKKyAgICAgICAgICAgIGppdC5wcm9i ZSh0YWdDRnVuY3Rpb248SklUUHJvYmVQdHJUYWc+KG9wZXJhdGlvbldhc21UcmlnZ2VyT1NSRW50 cnlOb3cpLCBvc3JFbnRyeURhdGFQdHIpOwogICAgICAgICAgICAgaml0LmJyYW5jaFRlc3RQdHIo Q0NhbGxIZWxwZXJzOjpaZXJvLCBHUFJJbmZvOjphcmd1bWVudEdQUjApLmxpbmtUbyh0aWVyVXBS ZXN1bWUsICZqaXQpOwogICAgICAgICAgICAgaml0LmZhckp1bXAoR1BSSW5mbzo6YXJndW1lbnRH UFIxLCBXYXNtRW50cnlQdHJUYWcpOwogICAgICAgICB9KTsK