220008 2020-12-17 23:30:26 -0800 Add tagging to JIT probe's return address. 2020-12-18 11:27:03 -0800 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 oldest_to_newest 1715665 0 mark.lam 2020-12-17 23:30:26 -0800 rdar://71279530 1715666 1 416500 mark.lam 2020-12-17 23:35:32 -0800 Created attachment 416500 proposed patch. 1715727 2 416500 rmorisset 2020-12-18 08:42:37 -0800 Comment on attachment 416500 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=416500&action=review LGTM, but I don't understand this code well enough to r+ it. > Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp:524 > + "sub x27, x27, #" STRINGIZE_VALUE_OF(2 * GPREG_SIZE) "\n" // The retun point PC is at 2 instructions before the end of the probe. retun -> return 1715756 3 416500 keith_miller 2020-12-18 10:58:33 -0800 Comment on attachment 416500 proposed patch. r=me 1715767 4 mark.lam 2020-12-18 11:27:03 -0800 Thanks for the reviews. Landed in r270981: <http://trac.webkit.org/r270981>. 416500 2020-12-17 23:35:32 -0800 2020-12-18 10:58:33 -0800 proposed patch. bug-220008.patch text/plain 7567 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjcwOTY0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDIwLTEyLTE3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgdGFnZ2luZyB0byBKSVQgcHJvYmUncyByZXR1cm4gYWRkcmVzcy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDAwOAorICAgICAgICByZGFyOi8v NzEyNzk1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmNwcDoKKyAgICAgICAgKiBhc3NlbWJs ZXIvdGVzdG1hc20uY3BwOgorICAgICAgICAoSlNDOjp0ZXN0UHJvYmVNb2RpZmllc1Byb2dyYW1D b3VudGVyKToKKyAgICAgICAgKiBydW50aW1lL0pTQ1B0clRhZy5oOgorCiAyMDIwLTEyLTE3ICBE bWl0cnkgQmV6aGV0c2tvdiAgPGRiZXpoZXRza292QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dB U00tUmVmZXJlbmNlc10gQWRkIHN1cHBvcnQgZm9yIG1lbW9yeS5jb3B5LCBtZW1vcnkuaW5pdCBh bmQgZGF0YS5kcm9wCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5jcHAJKHJldmlzaW9uIDI3MDk2NCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIw MTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEz LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCkBAIC0zMDAsOCArMzAwLDEwIEBAIHN0YXRpY19hc3NlcnQoTFJfUkVTVE9S QVRJT05fU0laRSA9PSBzaXoKIHN0YXRpY19hc3NlcnQoIShzaXplb2YoTFJSZXN0b3JhdGlvblJl Y29yZCkgJiAweGYpLCAiTFJSZXN0b3JhdGlvblJlY29yZCBtdXN0IGJlIDE2LWJ5dGUgYWxpZ25l ZCIpOwogCiAjaWYgQ1BVKEFSTTY0RSkKKyNkZWZpbmUgSklUX1BST0JFX1BDX1BUUl9UQUcgMHhl ZWFjCiAjZGVmaW5lIEpJVF9QUk9CRV9FWEVDVVRPUl9QVFJfVEFHIDB4MjhkZQogI2RlZmluZSBK SVRfUFJPQkVfU1RBQ0tfSU5JVElBTElaQVRJT05fRlVOQ1RJT05fUFRSX1RBRyAweDMxNWMKK3N0 YXRpY19hc3NlcnQoSklUX1BST0JFX1BDX1BUUl9UQUcgPT0gSklUUHJvYmVQQ1B0clRhZyk7CiBz dGF0aWNfYXNzZXJ0KEpJVF9QUk9CRV9FWEVDVVRPUl9QVFJfVEFHID09IEpJVFByb2JlRXhlY3V0 b3JQdHJUYWcpOwogc3RhdGljX2Fzc2VydChKSVRfUFJPQkVfU1RBQ0tfSU5JVElBTElaQVRJT05f RlVOQ1RJT05fUFRSX1RBRyA9PSBKSVRQcm9iZVN0YWNrSW5pdGlhbGl6YXRpb25GdW5jdGlvblB0 clRhZyk7CiAjZW5kaWYKQEAgLTM2MCw5ICszNjIsMTIgQEAgYXNtICgKICAgICAic3RwICAgICAg IHg2LCB4MjksIFtzcCwgIyIgU1RSSU5HSVpFX1ZBTFVFX09GKFBST0JFX0NQVV9YMjhfT0ZGU0VU KSAiXSIgIlxuIgogICAgICJzdHAgICAgICAgeDcsIHgyNiwgW3NwLCAjIiBTVFJJTkdJWkVfVkFM VUVfT0YoUFJPQkVfQ1BVX0xSX09GRlNFVCkgIl0iICJcbiIgLy8gU2F2ZSB2YWx1ZXMgbHIgYW5k IHNwIChvcmlnaW5hbCBzcCB2YWx1ZSBjb21wdXRlZCBpbnRvIHgyNiBhYm92ZSkuCiAKLSAgICAi c3RyICAgICAgIHgzMCwgW3NwLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoU0FWRURfUFJPQkVfUkVU VVJOX1BDX09GRlNFVCkgIl0iICJcbiIgLy8gU2F2ZSBhIGR1cGxpY2F0ZSBjb3B5IG9mIHJldHVy biBwYyAoaW4gbHIpLgotCiAgICAgImFkZCAgICAgICB4MzAsIHgzMCwgIyIgU1RSSU5HSVpFX1ZB TFVFX09GKDIgKiBHUFJFR19TSVpFKSAiXG4iIC8vIFRoZSBQQyBhZnRlciB0aGUgcHJvYmUgaXMg YXQgMiBpbnN0cnVjdGlvbnMgcGFzdCB0aGUgcmV0dXJuIHBvaW50LgorI2lmIENQVShBUk02NEUp CisgICAgIm1vdnogICAgICB4MjcsICMiIFNUUklOR0laRV9WQUxVRV9PRihKSVRfUFJPQkVfUENf UFRSX1RBRykgIlxuIgorICAgICJwYWNpYiAgICAgeDMwLCB4MjciICJcbiIKKyNlbmRpZgorICAg ICJzdHIgICAgICAgeDMwLCBbc3AsICMiIFNUUklOR0laRV9WQUxVRV9PRihTQVZFRF9QUk9CRV9S RVRVUk5fUENfT0ZGU0VUKSAiXSIgIlxuIiAvLyBTYXZlIGEgZHVwbGljYXRlIGNvcHkgb2YgcmV0 dXJuIHBjIChpbiBscikuCiAgICAgInN0ciAgICAgICB4MzAsIFtzcCwgIyIgU1RSSU5HSVpFX1ZB TFVFX09GKFBST0JFX0NQVV9QQ19PRkZTRVQpICJdIiAiXG4iCiAKICAgICAic3RwICAgICAgIHgw LCB4MSwgW3NwLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoUFJPQkVfQ1BVX05aQ1ZfT0ZGU0VUKSAi XSIgIlxuIiAvLyBTdG9yZSBuemN2IGFuZCBmcHNyIChwcmVsb2FkZWQgaW50byB4MCBhbmQgeDEg YWJvdmUpLgpAQCAtNDk2LDcgKzUwMSw2IEBAIGFzbSAoCiAgICAgImxkciAgICAgICB4MzAsIFtz cCwgIyIgU1RSSU5HSVpFX1ZBTFVFX09GKFBST0JFX0NQVV9TUF9PRkZTRVQpICJdIiAiXG4iIC8v IHByZWxvYWQgdGhlIHRhcmdldCBzcC4KICAgICAibGRyICAgICAgIHgyNywgW3NwLCAjIiBTVFJJ TkdJWkVfVkFMVUVfT0YoU0FWRURfUFJPQkVfUkVUVVJOX1BDX09GRlNFVCkgIl0iICJcbiIKICAg ICAibGRyICAgICAgIHgyOCwgW3NwLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoUFJPQkVfQ1BVX1BD X09GRlNFVCkgIl0iICJcbiIKLSAgICAiYWRkICAgICAgIHgyNywgeDI3LCAjIiBTVFJJTkdJWkVf VkFMVUVfT0YoMiAqIEdQUkVHX1NJWkUpICJcbiIKICAgICAiY21wICAgICAgIHgyNywgeDI4IiAi XG4iCiAgICAgImJuZSAgICAgIiBMT0NBTF9MQUJFTF9TVFJJTkcoY3RpTWFzbVByb2JlVHJhbXBv bGluZUVuZCkgIlxuIgogCkBAIC01MDksNiArNTEzLDE5IEBAIGFzbSAoCiAgICAgInN0ciAgICAg ICB4MjcsIFt4MzAsICMiIFNUUklOR0laRV9WQUxVRV9PRihMUl9SRVNUT1JBVElPTl9MUl9PRkZT RVQpICJdIiAiXG4iCiAgICAgIC8vIDMuIEZvcmNlIHRoZSByZXR1cm4gcmFtcCB0byByZXR1cm4g dG8gdGhlIHByb2JlIHJldHVybiBzaXRlLgogICAgICJsZHIgICAgICAgeDI3LCBbc3AsICMiIFNU UklOR0laRV9WQUxVRV9PRihTQVZFRF9QUk9CRV9SRVRVUk5fUENfT0ZGU0VUKSAiXSIgIlxuIgor I2lmIENQVShBUk02NEUpCisgICAgIm1vdnogICAgICB4MjgsICMiIFNUUklOR0laRV9WQUxVRV9P RihKSVRfUFJPQkVfUENfUFRSX1RBRykgIlxuIgorICAgICJhdXRpYiAgICAgeDI3LCB4MjgiICJc biIKKyAgICAibHNyICAgICAgIHgyOCwgeDI3LCAjOCIgIlxuIgorICAgICJhbmQgICAgICAgeDI4 LCB4MjgsICMweGZmMDAwMDAwMDAwMDAwIiAiXG4iCisgICAgIm9yciAgICAgICB4MjgsIHgyOCwg eDI3IiAiXG4iCisgICAgImxkcmIgICAgICB3MjgsIFt4MjhdIiAiXG4iCisjZW5kaWYKKyAgICAi c3ViICAgICAgIHgyNywgeDI3LCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoMiAqIEdQUkVHX1NJWkUp ICJcbiIgLy8gVGhlIHJldHVuIHBvaW50IFBDIGlzIGF0IDIgaW5zdHJ1Y3Rpb25zIGJlZm9yZSB0 aGUgZW5kIG9mIHRoZSBwcm9iZS4KKyNpZiBDUFUoQVJNNjRFKQorICAgICJtb3Z6ICAgICAgeDI4 LCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoSklUX1BST0JFX1BDX1BUUl9UQUcpICJcbiIKKyAgICAi cGFjaWIgICAgIHgyNywgeDI4IiAiXG4iCisjZW5kaWYKICAgICAic3RyICAgICAgIHgyNywgW3Nw LCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoUFJPQkVfQ1BVX1BDX09GRlNFVCkgIl0iICJcbiIKIAog ICAgIExPQ0FMX0xBQkVMX1NUUklORyhjdGlNYXNtUHJvYmVUcmFtcG9saW5lRW5kKSAiOiIgIlxu IgpAQCAtNTIwLDggKzUzNywxOCBAQCBhc20gKAogICAgICJzdHAgICAgICAgeDI3LCB4MjgsIFt4 MzAsICMiIFNUUklOR0laRV9WQUxVRV9PRihPVVRfTlpDVl9PRkZTRVQpICJdIiAiXG4iCiAgICAg ImxkcCAgICAgICB4MjcsIHgyOCwgW3NwLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoUFJPQkVfQ1BV X1gyN19PRkZTRVQpICJdIiAiXG4iCiAgICAgInN0cCAgICAgICB4MjcsIHgyOCwgW3gzMCwgIyIg U1RSSU5HSVpFX1ZBTFVFX09GKE9VVF9YMjdfT0ZGU0VUKSAiXSIgIlxuIgotICAgICJsZHIgICAg ICAgeDI3LCBbc3AsICMiIFNUUklOR0laRV9WQUxVRV9PRihQUk9CRV9DUFVfRlBfT0ZGU0VUKSAi XSIgIlxuIgogICAgICJsZHIgICAgICAgeDI4LCBbc3AsICMiIFNUUklOR0laRV9WQUxVRV9PRihQ Uk9CRV9DUFVfUENfT0ZGU0VUKSAiXSIgIlxuIiAvLyBTZXQgdXAgdGhlIG91dGdvaW5nIHJlY29y ZCBzbyB0aGF0IHdlJ2xsIGp1bXAgdG8gdGhlIG5ldyBQQy4KKyNpZiBDUFUoQVJNNjRFKQorICAg ICJtb3Z6ICAgICAgeDI3LCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoSklUX1BST0JFX1BDX1BUUl9U QUcpICJcbiIKKyAgICAiYXV0aWIgICAgIHgyOCwgeDI3IiAiXG4iCisgICAgImxzciAgICAgICB4 MjcsIHgyOCwgIzgiICJcbiIKKyAgICAiYW5kICAgICAgIHgyNywgeDI3LCAjMHhmZjAwMDAwMDAw MDAwMCIgIlxuIgorICAgICJvcnIgICAgICAgeDI3LCB4MjcsIHgyOCIgIlxuIgorICAgICJsZHJi ICAgICAgdzI3LCBbeDI3XSIgIlxuIgorICAgICJhZGQgICAgICAgeDI3LCB4MzAsICM0OCIgIlxu IiAvLyBDb21wdXRlIHNwIGF0IHJldHVybiBwb2ludC4KKyAgICAicGFjaWIgICAgIHgyOCwgeDI3 IiAiXG4iCisjZW5kaWYKKyAgICAibGRyICAgICAgIHgyNywgW3NwLCAjIiBTVFJJTkdJWkVfVkFM VUVfT0YoUFJPQkVfQ1BVX0ZQX09GRlNFVCkgIl0iICJcbiIKICAgICAic3RwICAgICAgIHgyNywg eDI4LCBbeDMwLCAjIiBTVFJJTkdJWkVfVkFMVUVfT0YoT1VUX0ZQX09GRlNFVCkgIl0iICJcbiIK ICAgICAibW92ICAgICAgIHNwLCB4MzAiICJcbiIKIApAQCAtNTMxLDcgKzU1OCwxMSBAQCBhc20g KAogICAgICJtc3IgICAgICAgZnBzciwgeDI4IiAiXG4iCiAgICAgImxkcCAgICAgICB4MjcsIHgy OCwgW3NwXSwgIyIgU1RSSU5HSVpFX1ZBTFVFX09GKDIgKiBHUFJFR19TSVpFKSAiXG4iCiAgICAg ImxkcCAgICAgICB4MjksIHgzMCwgW3NwXSwgIyIgU1RSSU5HSVpFX1ZBTFVFX09GKDIgKiBHUFJF R19TSVpFKSAiXG4iCisjaWYgQ1BVKEFSTTY0RSkKKyAgICAicmV0YWIiICJcbiIKKyNlbHNlCiAg ICAgInJldCIgIlxuIgorI2VuZGlmCiApOwogI2VuZGlmIC8vIENPTVBJTEVSKEdDQ19DT01QQVRJ QkxFKQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL3Rlc3RtYXNtLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL3Rlc3RtYXNt LmNwcAkocmV2aXNpb24gMjcwOTY0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci90ZXN0bWFzbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMjMsNyArMjEyMyw3IEBAIHZvaWQg dGVzdFByb2JlTW9kaWZpZXNQcm9ncmFtQ291bnRlcigpCiAgICAgICAgIC8vIFdyaXRlIGV4cGVj dGVkIHZhbHVlcyBpbnRvIHRoZSByZWdpc3RlcnMuCiAgICAgICAgIGppdC5wcm9iZShbJl0gKFBy b2JlOjpDb250ZXh0JiBjb250ZXh0KSB7CiAgICAgICAgICAgICBwcm9iZUNhbGxDb3VudCsrOwot ICAgICAgICAgICAgY29udGV4dC5jcHUucGMoKSA9IHVudGFnQ29kZVB0cjxKU0VudHJ5UHRyVGFn Pihjb250aW51YXRpb24uY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCkpOworICAgICAgICAgICAg Y29udGV4dC5jcHUucGMoKSA9IHJldGFnQ29kZVB0cjxKU0VudHJ5UHRyVGFnLCBKSVRQcm9iZVBD UHRyVGFnPihjb250aW51YXRpb24uY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCkpOwogICAgICAg ICB9KTsKIAogICAgICAgICBqaXQuYnJlYWtwb2ludCgpOyAvLyBXZSBzaG91bGQgbmV2ZXIgZ2V0 IGhlcmUuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NQdHJUYWcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NQdHJUYWcuaAko cmV2aXNpb24gMjcwOTY0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDUHRy VGFnLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDE4LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDE4LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01Nyw2ICs1Nyw3IEBAIHVzaW5nIFB0clRhZyA9IFdU Rjo6UHRyVGFnOwogICAgIHYoSG9zdEZ1bmN0aW9uUHRyVGFnLCBQdHJUYWdDYWxsZWVUeXBlOjpO YXRpdmUsIFB0clRhZ0NhbGxlclR5cGU6Ok5hdGl2ZSkgXAogICAgIHYoSklUUHJvYmVQdHJUYWcs IFB0clRhZ0NhbGxlZVR5cGU6Ok5hdGl2ZSwgUHRyVGFnQ2FsbGVyVHlwZTo6TmF0aXZlKSBcCiAg ICAgdihKSVRQcm9iZUV4ZWN1dG9yUHRyVGFnLCBQdHJUYWdDYWxsZWVUeXBlOjpOYXRpdmUsIFB0 clRhZ0NhbGxlclR5cGU6Ok5hdGl2ZSkgXAorICAgIHYoSklUUHJvYmVQQ1B0clRhZywgUHRyVGFn Q2FsbGVlVHlwZTo6TmF0aXZlLCBQdHJUYWdDYWxsZXJUeXBlOjpOYXRpdmUpIFwKICAgICB2KEpJ VFByb2JlU3RhY2tJbml0aWFsaXphdGlvbkZ1bmN0aW9uUHRyVGFnLCBQdHJUYWdDYWxsZWVUeXBl OjpOYXRpdmUsIFB0clRhZ0NhbGxlclR5cGU6Ok5hdGl2ZSkgXAogICAgIC8qIENhbGxlZTpKSVQg Q2FsbGVyOk5hdGl2ZSAqLyBcCiAgICAgdihOYXRpdmVUb0pJVEdhdGVQdHJUYWcsIFB0clRhZ0Nh bGxlZVR5cGU6OkpJVCwgUHRyVGFnQ2FsbGVyVHlwZTo6TmF0aXZlKSBcCg==