86059 2012-05-09 23:06:12 -0700 DFG should allow inlining in case of certain arity mismatches 2012-05-23 00:55:07 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo webkit-unassigned oldest_to_newest 620266 0 fpizlo 2012-05-09 23:06:12 -0700 Currently we disallow inlining in case of arity mismatch. This made sense when we were passing arguments in the wrong order, since arity mismatch calls required some call frame ninja work, and it seemed like adding this to the inliner would be sufficiently complex that avoiding it would reduce the bug tail. But now that we're passing arguments in the right order, inlining calls that pass too many arguments is trivial. There simply isn't anything standing in the way of us doing this. The value recoveries in the inline call frame already do the right things (they track the arguments passed, not the parameters expected). The argument flushing does the right things (it places the arguments where they should be and makes sure that they are really stored to the stack). The rest of the inlining machinery already computes the stack offset correctly. So while it's still the case that arity mismatches where too few arguments are passed are hard to inline, the ones that involve too many args are trivial and we should just inline those. 620269 1 141089 fpizlo 2012-05-09 23:07:58 -0700 Created attachment 141089 the patch 620286 2 141089 ggaren 2012-05-09 23:38:43 -0700 Comment on attachment 141089 the patch r=me 620347 3 fpizlo 2012-05-10 00:52:52 -0700 Landed in http://trac.webkit.org/changeset/116620 631354 4 fpizlo 2012-05-23 00:54:57 -0700 Landed in http://trac.webkit.org/changeset/118144 631356 5 fpizlo 2012-05-23 00:55:07 -0700 Excuse me, merged in http://trac.webkit.org/changeset/118144 141089 2012-05-09 23:07:58 -0700 2012-05-09 23:38:43 -0700 the patch inline_arity_mismatch_patch_1.diff text/plain 2662 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE2NjA5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDEyLTA1LTA5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIHNob3VsZCBhbGxvdyBpbmxpbmluZyBpbiBjYXNlIG9mIGNlcnRhaW4gYXJpdHkgbWlzbWF0 Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYw NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRm Zy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJz ZXI6OmhhbmRsZUlubGluaW5nKToKKwogMjAxMi0wNS0wOCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9A YXBwbGUuY29tPgogCiAgICAgICAgIERGRyB2YXJpYWJsZSBjYXB0dXJlIGFuYWx5c2lzIHNob3Vs ZCB3b3JrIGV2ZW4gaWYgdGhlIHZhcmlhYmxlcyBhcm9zZSB0aHJvdWdoIGlubGluaW5nCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAko cmV2aXNpb24gMTE2NjA5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMTYsOSArMTExNiwxMCBAQCBib29sIEJ5 dGVDb2RlUGFyc2VyOjpoYW5kbGVJbmxpbmluZyhib29sCiAgICAgCiAgICAgRnVuY3Rpb25FeGVj dXRhYmxlKiBleGVjdXRhYmxlID0gZXhwZWN0ZWRGdW5jdGlvbi0+anNFeGVjdXRhYmxlKCk7CiAg ICAgCi0gICAgLy8gRG9lcyB0aGUgbnVtYmVyIG9mIGFyZ3VtZW50cyB3ZSdyZSBwYXNzaW5nIG1h dGNoIHRoZSBhcml0eSBvZiB0aGUgdGFyZ2V0PyBXZSBjb3VsZAotICAgIC8vIGlubGluZSBhcml0 eSBjaGVjayBmYWlsdXJlcywgYnV0IGZvciBzaW1wbGljaXR5IHdlIGN1cnJlbnRseSBkb24ndC4K LSAgICBpZiAoc3RhdGljX2Nhc3Q8aW50PihleGVjdXRhYmxlLT5wYXJhbWV0ZXJDb3VudCgpKSAr IDEgIT0gYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMpCisgICAgLy8gRG9lcyB0aGUgbnVtYmVy IG9mIGFyZ3VtZW50cyB3ZSdyZSBwYXNzaW5nIG1hdGNoIHRoZSBhcml0eSBvZiB0aGUgdGFyZ2V0 PyBXZSBjdXJyZW50bHkKKyAgICAvLyBpbmxpbmUgb25seSBpZiB0aGUgbnVtYmVyIG9mIGFyZ3Vt ZW50cyBwYXNzZWQgaXMgZ3JlYXRlciB0aGFuIG9yIGVxdWFsIHRvIHRoZSBudW1iZXIKKyAgICAv LyBhcmd1bWVudHMgZXhwZWN0ZWQuCisgICAgaWYgKHN0YXRpY19jYXN0PGludD4oZXhlY3V0YWJs ZS0+cGFyYW1ldGVyQ291bnQoKSkgKyAxID4gYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICAvLyBIYXZlIHdlIGV4Y2VlZGVkIGlubGlu ZSBzdGFjayBkZXB0aCwgb3IgYXJlIHdlIHRyeWluZyB0byBpbmxpbmUgYSByZWN1cnNpdmUgY2Fs bD8KQEAgLTExODMsOCArMTE4NCwxMSBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbmxp bmluZyhib29sCiAgICAgSW5saW5lU3RhY2tFbnRyeSBpbmxpbmVTdGFja0VudHJ5KHRoaXMsIGNv ZGVCbG9jaywgcHJvZmlsZWRCbG9jaywgbV9ncmFwaC5tX2Jsb2Nrcy5zaXplKCkgLSAxLCAoVmly dHVhbFJlZ2lzdGVyKW1faW5saW5lU3RhY2tUb3AtPnJlbWFwT3BlcmFuZChjYWxsVGFyZ2V0KSwg ZXhwZWN0ZWRGdW5jdGlvbiwgKFZpcnR1YWxSZWdpc3RlciltX2lubGluZVN0YWNrVG9wLT5yZW1h cE9wZXJhbmQodXNlc1Jlc3VsdCA/IHJlc3VsdE9wZXJhbmQgOiBJbnZhbGlkVmlydHVhbFJlZ2lz dGVyKSwgKFZpcnR1YWxSZWdpc3RlcilpbmxpbmVDYWxsRnJhbWVTdGFydCwga2luZCk7CiAgICAg CiAgICAgLy8gTGluayB1cCB0aGUgYXJndW1lbnQgdmFyaWFibGUgYWNjZXNzIGRhdGFzIHRvIHRo ZWlyIGFyZ3VtZW50IHBvc2l0aW9ucy4KLSAgICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ3VtZW50 Q291bnRJbmNsdWRpbmdUaGlzOyArK2kpCisgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcmd1bWVu dENvdW50SW5jbHVkaW5nVGhpczsgKytpKSB7CisgICAgICAgIGlmIChzdGF0aWNfY2FzdDxzaXpl X3Q+KGkpID49IGlubGluZVN0YWNrRW50cnkubV9hcmd1bWVudFBvc2l0aW9ucy5zaXplKCkpCisg ICAgICAgICAgICBicmVhazsKICAgICAgICAgaW5saW5lU3RhY2tFbnRyeS5tX2FyZ3VtZW50UG9z aXRpb25zW2ldLT5hZGRWYXJpYWJsZShhcmd1bWVudHNbaSAtIDFdKTsKKyAgICB9CiAgICAgCiAg ICAgLy8gVGhpcyBpcyB3aGVyZSB0aGUgYWN0dWFsIGlubGluaW5nIHJlYWxseSBoYXBwZW5zLgog ICAgIHVuc2lnbmVkIG9sZEluZGV4ID0gbV9jdXJyZW50SW5kZXg7Cg==