139892 2014-12-22 18:05:58 -0800 Use ctiPatchCallByReturnAddress() in JITOperations.cpp 2014-12-22 18:48:12 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue oldest_to_newest 1057516 0 mark.lam 2014-12-22 18:05:58 -0800 The code in JITOperations.cpp is sometimes calling RepatchBuffer::relinkCallerToFunction() directly, and sometimes using a helper function, ctiPatchCallByReturnAddress(). This patch changes it to use the helper function consistently. 1057517 1 243656 mark.lam 2014-12-22 18:10:42 -0800 Created attachment 243656 the patch. The perf numbers shows that perf is a neutral with this patch. 1057519 2 243656 msaboff 2014-12-22 18:13:28 -0800 Comment on attachment 243656 the patch. r=me 1057522 3 243656 commit-queue 2014-12-22 18:48:10 -0800 Comment on attachment 243656 the patch. Clearing flags on attachment: 243656 Committed r177675: <http://trac.webkit.org/changeset/177675> 1057523 4 commit-queue 2014-12-22 18:48:12 -0800 All reviewed patches have been landed. Closing bug. 243656 2014-12-22 18:10:42 -0800 2014-12-22 18:48:10 -0800 the patch. bug-139892.patch text/plain 3651 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTc3NjczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDE0LTEyLTIyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgY3RpUGF0Y2hDYWxsQnlSZXR1cm5BZGRyZXNzKCkgaW4gSklUT3BlcmF0aW9ucy5jcHAuCisg ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzk4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNvZGUgaW4gSklUT3BlcmF0aW9ucy5j cHAgc29tZXRpbWVzIGNhbGxzIFJlcGF0Y2hCdWZmZXI6OnJlbGlua0NhbGxlclRvRnVuY3Rpb24o KQorICAgICAgICBkaXJlY3RseSwgYW5kIHNvbWV0aW1lcyB1c2VzIGEgaGVscGVyIGZ1bmN0aW9u LCBjdGlQYXRjaENhbGxCeVJldHVybkFkZHJlc3MoKS4KKyAgICAgICAgVGhpcyBwYXRjaCBjaGFu Z2VzIGl0IHRvIHVzZSB0aGUgaGVscGVyIGZ1bmN0aW9uIGNvbnNpc3RlbnRseS4KKworICAgICAg ICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoKKwogMjAxNC0xMi0yMiAgTWFyayBMYW0gIDxtYXJr LmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHNvbWUgdHlwb3MgaW4gYSBjb21tZW50LgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCShyZXZp c2lvbiAxNzc2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjcsOCArNTI3LDcgQEAgdm9pZCBKSVRfT1BFUkFUSU9O IG9wZXJhdGlvblB1dEJ5VmFsKEV4ZQogICAgICAgICAgICAgaWYgKCsrYnlWYWxJbmZvLnNsb3dQ YXRoQ291bnQgPj0gMTAKICAgICAgICAgICAgICAgICB8fCBvYmplY3QtPnN0cnVjdHVyZSh2bSkt PnR5cGVJbmZvKCkuaW50ZXJjZXB0c0dldE93blByb3BlcnR5U2xvdEJ5SW5kZXhFdmVuV2hlbkxl bmd0aElzTm90WmVybygpKSB7CiAgICAgICAgICAgICAgICAgLy8gRG9uJ3QgZXZlciB0cnkgdG8g b3B0aW1pemUuCi0gICAgICAgICAgICAgICAgUmVwYXRjaEJ1ZmZlciByZXBhdGNoQnVmZmVyKGV4 ZWMtPmNvZGVCbG9jaygpKTsKLSAgICAgICAgICAgICAgICByZXBhdGNoQnVmZmVyLnJlbGlua0Nh bGxlclRvRnVuY3Rpb24oUmV0dXJuQWRkcmVzc1B0cihPVVJfUkVUVVJOX0FERFJFU1MpLCBGdW5j dGlvblB0cihvcGVyYXRpb25QdXRCeVZhbEdlbmVyaWMpKTsKKyAgICAgICAgICAgICAgICBjdGlQ YXRjaENhbGxCeVJldHVybkFkZHJlc3MoZXhlYy0+Y29kZUJsb2NrKCksIFJldHVybkFkZHJlc3NQ dHIoT1VSX1JFVFVSTl9BRERSRVNTKSwgRnVuY3Rpb25QdHIob3BlcmF0aW9uUHV0QnlWYWxHZW5l cmljKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC01NzMsOCArNTcyLDcg QEAgdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRpcmVjdFB1dEJ5VgogICAgICAgICAgICAg aWYgKCsrYnlWYWxJbmZvLnNsb3dQYXRoQ291bnQgPj0gMTAKICAgICAgICAgICAgICAgICB8fCBv YmplY3QtPnN0cnVjdHVyZSh2bSktPnR5cGVJbmZvKCkuaW50ZXJjZXB0c0dldE93blByb3BlcnR5 U2xvdEJ5SW5kZXhFdmVuV2hlbkxlbmd0aElzTm90WmVybygpKSB7CiAgICAgICAgICAgICAgICAg Ly8gRG9uJ3QgZXZlciB0cnkgdG8gb3B0aW1pemUuCi0gICAgICAgICAgICAgICAgUmVwYXRjaEJ1 ZmZlciByZXBhdGNoQnVmZmVyKGNhbGxGcmFtZS0+Y29kZUJsb2NrKCkpOwotICAgICAgICAgICAg ICAgIHJlcGF0Y2hCdWZmZXIucmVsaW5rQ2FsbGVyVG9GdW5jdGlvbihSZXR1cm5BZGRyZXNzUHRy KE9VUl9SRVRVUk5fQUREUkVTUyksIEZ1bmN0aW9uUHRyKG9wZXJhdGlvbkRpcmVjdFB1dEJ5VmFs R2VuZXJpYykpOworICAgICAgICAgICAgICAgIGN0aVBhdGNoQ2FsbEJ5UmV0dXJuQWRkcmVzcyhj YWxsRnJhbWUtPmNvZGVCbG9jaygpLCBSZXR1cm5BZGRyZXNzUHRyKE9VUl9SRVRVUk5fQUREUkVT UyksIEZ1bmN0aW9uUHRyKG9wZXJhdGlvbkRpcmVjdFB1dEJ5VmFsR2VuZXJpYykpOwogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMTUxMiw4ICsxNTEwLDcgQEAgRW5jb2RlZEpT VmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25HZQogICAgICAgICAgICAgaWYgKCsrYnlWYWxJ bmZvLnNsb3dQYXRoQ291bnQgPj0gMTAKICAgICAgICAgICAgICAgICB8fCBvYmplY3QtPnN0cnVj dHVyZSh2bSktPnR5cGVJbmZvKCkuaW50ZXJjZXB0c0dldE93blByb3BlcnR5U2xvdEJ5SW5kZXhF dmVuV2hlbkxlbmd0aElzTm90WmVybygpKSB7CiAgICAgICAgICAgICAgICAgLy8gRG9uJ3QgZXZl ciB0cnkgdG8gb3B0aW1pemUuCi0gICAgICAgICAgICAgICAgUmVwYXRjaEJ1ZmZlciByZXBhdGNo QnVmZmVyKGV4ZWMtPmNvZGVCbG9jaygpKTsKLSAgICAgICAgICAgICAgICByZXBhdGNoQnVmZmVy LnJlbGlua0NhbGxlclRvRnVuY3Rpb24oUmV0dXJuQWRkcmVzc1B0cihPVVJfUkVUVVJOX0FERFJF U1MpLCBGdW5jdGlvblB0cihvcGVyYXRpb25HZXRCeVZhbEdlbmVyaWMpKTsKKyAgICAgICAgICAg ICAgICBjdGlQYXRjaENhbGxCeVJldHVybkFkZHJlc3MoZXhlYy0+Y29kZUJsb2NrKCksIFJldHVy bkFkZHJlc3NQdHIoT1VSX1JFVFVSTl9BRERSRVNTKSwgRnVuY3Rpb25QdHIob3BlcmF0aW9uR2V0 QnlWYWxHZW5lcmljKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0xNTU4 LDggKzE1NTUsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkhhCiAg ICAgICAgIGlmICgrK2J5VmFsSW5mby5zbG93UGF0aENvdW50ID49IDEwCiAgICAgICAgICAgICB8 fCBvYmplY3QtPnN0cnVjdHVyZSh2bSktPnR5cGVJbmZvKCkuaW50ZXJjZXB0c0dldE93blByb3Bl cnR5U2xvdEJ5SW5kZXhFdmVuV2hlbkxlbmd0aElzTm90WmVybygpKSB7CiAgICAgICAgICAgICAv LyBEb24ndCBldmVyIHRyeSB0byBvcHRpbWl6ZS4KLSAgICAgICAgICAgIFJlcGF0Y2hCdWZmZXIg cmVwYXRjaEJ1ZmZlcihleGVjLT5jb2RlQmxvY2soKSk7Ci0gICAgICAgICAgICByZXBhdGNoQnVm ZmVyLnJlbGlua0NhbGxlclRvRnVuY3Rpb24oUmV0dXJuQWRkcmVzc1B0cihPVVJfUkVUVVJOX0FE RFJFU1MpLCBGdW5jdGlvblB0cihvcGVyYXRpb25IYXNJbmRleGVkUHJvcGVydHlHZW5lcmljKSk7 CisgICAgICAgICAgICBjdGlQYXRjaENhbGxCeVJldHVybkFkZHJlc3MoZXhlYy0+Y29kZUJsb2Nr KCksIFJldHVybkFkZHJlc3NQdHIoT1VSX1JFVFVSTl9BRERSRVNTKSwgRnVuY3Rpb25QdHIob3Bl cmF0aW9uSGFzSW5kZXhlZFByb3BlcnR5R2VuZXJpYykpOyAKICAgICAgICAgfQogICAgIH0KICAg ICAK