103974 2012-12-03 23:14:45 -0800 DFG should inline code blocks that use scoped variable access 2012-12-04 12:26:30 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 782250 0 fpizlo 2012-12-03 23:14:45 -0800 Doing this is a bit superfluous for now since we don't inline closure calls yet except if the JSFunction* is always the same. But it's an important first step to inlining closure calls. 782256 1 177423 fpizlo 2012-12-03 23:22:52 -0800 Created attachment 177423 the patch 782800 2 fpizlo 2012-12-04 12:26:30 -0800 Landed in http://trac.webkit.org/changeset/136546 177423 2012-12-03 23:22:52 -0800 2012-12-04 10:47:29 -0800 the patch inlinescope.patch text/plain 7783 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTM2NDc1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDEyLTEyLTAzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIHNob3VsZCBpbmxpbmUgY29kZSBibG9ja3MgdGhhdCB1c2Ugc2NvcGVkIHZhcmlhYmxlIGFj Y2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAz OTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBtb3N0bHkganVzdCB0dXJucyBvbiBzb21ldGhpbmcgd2UgY291bGQgaGF2ZSBkb25lIGFsbCBh bG9uZywgYnV0IGFsc28gYWRkcyBhIGZldyBrZXkKKyAgICAgICAgbmVjZXNzaXRpZXMgdG8gbWFr ZSB0aGlzIHJpZ2h0OgorICAgICAgICAKKyAgICAgICAgMSkgQ29uc3RhbnQgZm9sZGluZyBvZiBT a2lwU2NvcGUsIHNpbmNlIGlmIHdlIGlubGluZSB3aXRoIGEga25vd24gSlNGdW5jdGlvbiogdGhl biB0aGUKKyAgICAgICAgICAgc2NvcGUgaXMgY29uc3RhbnQuCisgICAgICAgIAorICAgICAgICAy KSBJbnRlcmZlcmVuY2UgYW5hbHlzaXMgZm9yIEdldExvY2FsPC0+UHV0U2NvcGVkVmFyIGFuZCBT ZXRMb2NhbDwtPkdldFNjb3BlZFZhci4KKyAgICAgICAgCisgICAgICAgIFRoaXMgaXMgbm90IG1l YW50IHRvIGJlIGEgc3BlZWQtdXAgb24gbWFqb3IgYmVuY2htYXJrcyBzaW5jZSB3ZSBkb24ndCB5 ZXQgaW5saW5lIG1vc3QKKyAgICAgICAgY2xvc3VyZSBjYWxscyBmb3IgZW50aXJlbHkgdW5yZWxh dGVkIHJlYXNvbnMuIEJ1dCBvbiB0b3kgcHJvZ3JhbXMgaXQgY2FuIGJlID4yeCBmYXN0ZXIuCisK KyAgICAgICAgKiBkZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 QWJzdHJhY3RTdGF0ZTo6ZXhlY3V0ZSk6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2Vy LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6Z2V0U2NvcGUpOgorICAg ICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpwYXJzZVJlc29sdmVPcGVyYXRpb25zKToK KyAgICAgICAgKiBkZmcvREZHQ1NFUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNTRVBo YXNlOjpzY29wZWRWYXJMb2FkRWxpbWluYXRpb24pOgorICAgICAgICAoSlNDOjpERkc6OkNTRVBo YXNlOjpzY29wZWRWYXJTdG9yZUVsaW1pbmF0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpDU0VQ aGFzZTo6Z2V0TG9jYWxMb2FkRWxpbWluYXRpb24pOgorICAgICAgICAoSlNDOjpERkc6OkNTRVBo YXNlOjpzZXRMb2NhbFN0b3JlRWxpbWluYXRpb24pOgorICAgICAgICAqIGRmZy9ERkdDYXBhYmls aXRpZXMuaDoKKyAgICAgICAgKEpTQzo6REZHOjpjYW5JbmxpbmVSZXNvbHZlT3BlcmF0aW9ucyk6 CisKIDIwMTItMTItMDMgIFBldGVyIFJ5YmluICA8cHJ5YmluQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIEFTU0VSVElPTiBGQUlMRUQ6IGZvdW5kUHJvcGVydGll c0NvdW50ID09IG9iamVjdC0+c2l6ZSgpIG1vcmUgdXNlZnVsCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAJKHJldmlzaW9uIDEzNjQ3MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEzODUsMTEgKzEzODUsMjEgQEAgYm9vbCBBYnN0cmFjdFN0YXRlOjpleGVj dXRlKHVuc2lnbmVkIGluZAogICAgICAgICAgICAgCiAgICAgY2FzZSBHZXRNeVNjb3BlOgogICAg IGNhc2UgU2tpcFRvcFNjb3BlOgotICAgIGNhc2UgU2tpcFNjb3BlOgogICAgICAgICBub2RlLnNl dENhbkV4aXQoZmFsc2UpOwogICAgICAgICBmb3JOb2RlKG5vZGVJbmRleCkuc2V0KFNwZWNDZWxs T3RoZXIpOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgU2tpcFNjb3BlOiB7CisgICAgICAg IG5vZGUuc2V0Q2FuRXhpdChmYWxzZSk7CisgICAgICAgIEpTVmFsdWUgY2hpbGQgPSBmb3JOb2Rl KG5vZGUuY2hpbGQxKCkpLnZhbHVlKCk7CisgICAgICAgIGlmIChjaGlsZCAmJiB0cnlTZXRDb25z dGFudChub2RlSW5kZXgsIEpTVmFsdWUoanNDYXN0PEpTU2NvcGUqPihjaGlsZC5hc0NlbGwoKSkt Pm5leHQoKSkpKSB7CisgICAgICAgICAgICBtX2ZvdW5kQ29uc3RhbnRzID0gdHJ1ZTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGZvck5vZGUobm9kZUluZGV4KS5zZXQo U3BlY0NlbGxPdGhlcik7CisgICAgICAgIGJyZWFrOworICAgIH0KKwogICAgIGNhc2UgR2V0U2Nv cGVSZWdpc3RlcnM6CiAgICAgICAgIG5vZGUuc2V0Q2FuRXhpdChmYWxzZSk7CiAgICAgICAgIGZv ck5vZGUobm9kZS5jaGlsZDEoKSkuZmlsdGVyKFNwZWNDZWxsKTsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxMzY0 NzMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTg4Niw5ICsxODg2LDE2IEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6 OnByZXBhcmVUb1BhcnNlQmxvY2sKIAogTm9kZUluZGV4IEJ5dGVDb2RlUGFyc2VyOjpnZXRTY29w ZShib29sIHNraXBUb3AsIHVuc2lnbmVkIHNraXBDb3VudCkKIHsKLSAgICBOb2RlSW5kZXggbG9j YWxCYXNlID0gYWRkVG9HcmFwaChHZXRNeVNjb3BlKTsKLSAgICBpZiAoc2tpcFRvcCkKKyAgICBO b2RlSW5kZXggbG9jYWxCYXNlOworICAgIGlmIChtX2lubGluZVN0YWNrVG9wLT5tX2lubGluZUNh bGxGcmFtZSkgeworICAgICAgICBBU1NFUlQobV9pbmxpbmVTdGFja1RvcC0+bV9pbmxpbmVDYWxs RnJhbWUtPmNhbGxlZSk7CisgICAgICAgIGxvY2FsQmFzZSA9IGNlbGxDb25zdGFudChtX2lubGlu ZVN0YWNrVG9wLT5tX2lubGluZUNhbGxGcmFtZS0+Y2FsbGVlLT5zY29wZSgpKTsKKyAgICB9IGVs c2UKKyAgICAgICAgbG9jYWxCYXNlID0gYWRkVG9HcmFwaChHZXRNeVNjb3BlKTsKKyAgICBpZiAo c2tpcFRvcCkgeworICAgICAgICBBU1NFUlQoIW1faW5saW5lU3RhY2tUb3AtPm1faW5saW5lQ2Fs bEZyYW1lKTsKICAgICAgICAgbG9jYWxCYXNlID0gYWRkVG9HcmFwaChTa2lwVG9wU2NvcGUsIGxv Y2FsQmFzZSk7CisgICAgfQogICAgIGZvciAodW5zaWduZWQgbiA9IHNraXBDb3VudDsgbi0tOykK ICAgICAgICAgbG9jYWxCYXNlID0gYWRkVG9HcmFwaChTa2lwU2NvcGUsIGxvY2FsQmFzZSk7CiAg ICAgcmV0dXJuIGxvY2FsQmFzZTsKQEAgLTE5NTQsNyArMTk2MSw2IEBAIGJvb2wgQnl0ZUNvZGVQ YXJzZXI6OnBhcnNlUmVzb2x2ZU9wZXJhdGkKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAg IGNhc2UgUmVzb2x2ZU9wZXJhdGlvbjo6U2tpcFNjb3BlczoKLSAgICAgICAgICAgIEFTU0VSVCgh bV9pbmxpbmVTdGFja1RvcC0+bV9pbmxpbmVDYWxsRnJhbWUpOwogICAgICAgICAgICAgc2tpcENv dW50ICs9IHBjLT5tX3Njb3Blc1RvU2tpcDsKICAgICAgICAgICAgIHNraXBwZWRTY29wZXMgPSB0 cnVlOwogICAgICAgICAgICAgKytwYzsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQ1NFUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQ1NFUGhhc2UuY3BwCShyZXZpc2lvbiAxMzY0NzMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0NTRVBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDYgKzIzNiwxMyBA QCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gbm9kZS5jaGlsZDMoKS5pbmRl eCgpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorICAgICAgICAgICAg Y2FzZSBTZXRMb2NhbDogeworICAgICAgICAgICAgICAgIFZhcmlhYmxlQWNjZXNzRGF0YSogdmFy aWFibGVBY2Nlc3NEYXRhID0gbm9kZS52YXJpYWJsZUFjY2Vzc0RhdGEoKTsKKyAgICAgICAgICAg ICAgICBpZiAodmFyaWFibGVBY2Nlc3NEYXRhLT5pc0NhcHR1cmVkKCkKKyAgICAgICAgICAgICAg ICAgICAgJiYgdmFyaWFibGVBY2Nlc3NEYXRhLT5sb2NhbCgpID09IHN0YXRpY19jYXN0PFZpcnR1 YWxSZWdpc3Rlcj4odmFyTnVtYmVyKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE5vTm9k ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRl ZmF1bHQ6CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CkBAIC0zMTgsNiAr MzI1LDE0IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBOb05vZGU7CiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgCisg ICAgICAgICAgICBjYXNlIEdldExvY2FsOiB7CisgICAgICAgICAgICAgICAgVmFyaWFibGVBY2Nl c3NEYXRhKiB2YXJpYWJsZUFjY2Vzc0RhdGEgPSBub2RlLnZhcmlhYmxlQWNjZXNzRGF0YSgpOwor ICAgICAgICAgICAgICAgIGlmICh2YXJpYWJsZUFjY2Vzc0RhdGEtPmlzQ2FwdHVyZWQoKQorICAg ICAgICAgICAgICAgICAgICAmJiB2YXJpYWJsZUFjY2Vzc0RhdGEtPmxvY2FsKCkgPT0gc3RhdGlj X2Nhc3Q8VmlydHVhbFJlZ2lzdGVyPih2YXJOdW1iZXIpKQorICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gTm9Ob2RlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtODMwLDYgKzg0 NSwxMSBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVh azsKICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgIGNhc2UgUHV0U2NvcGVkVmFyOgorICAg ICAgICAgICAgICAgIGlmIChzdGF0aWNfY2FzdDxWaXJ0dWFsUmVnaXN0ZXI+KG5vZGUudmFyTnVt YmVyKCkpID09IGxvY2FsKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gTm9Ob2RlOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgZGVmYXVs dDoKICAgICAgICAgICAgICAgICBpZiAoY2FyZUFib3V0Q2xvYmJlcmluZyAmJiBtX2dyYXBoLmNs b2JiZXJzV29ybGQoaW5kZXgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gTm9Ob2RlOwpA QCAtODgyLDkgKzkwMiwxMyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIHJldHVybiByZXN1 bHQ7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICBjYXNlIEdl dFNjb3BlZFZhcjoKKyAgICAgICAgICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8VmlydHVhbFJlZ2lz dGVyPihub2RlLnZhck51bWJlcigpKSA9PSBsb2NhbCkKKyAgICAgICAgICAgICAgICAgICAgcmVz dWx0Lm1heUJlQWNjZXNzZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgIAogICAgICAgICAgICAgY2FzZSBHZXRNeVNjb3BlOgogICAgICAgICAgICAgY2Fz ZSBTa2lwVG9wU2NvcGU6Ci0gICAgICAgICAgICBjYXNlIEdldFNjb3BlUmVnaXN0ZXJzOgogICAg ICAgICAgICAgICAgIGlmIChtX2dyYXBoLnVuY2hlY2tlZEFjdGl2YXRpb25SZWdpc3RlckZvcihu b2RlLmNvZGVPcmlnaW4pID09IGxvY2FsKQogICAgICAgICAgICAgICAgICAgICByZXN1bHQubWF5 QmVBY2Nlc3NlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0NhcGFiaWxpdGllcy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2FwYWJpbGl0aWVzLmgJKHJldmlzaW9uIDEzNjQ3MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2FwYWJpbGl0aWVzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTgyLDYgKzgyLDEwIEBAIGlubGluZSBib29sIGNhbklubGluZVJlc29sdmVPcGVy YXRpb25zKE8KICAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpHZXRBbmRSZXR1cm5HbG9i YWxQcm9wZXJ0eToKICAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpHZXRBbmRSZXR1cm5H bG9iYWxWYXI6CiAgICAgICAgIGNhc2UgUmVzb2x2ZU9wZXJhdGlvbjo6R2V0QW5kUmV0dXJuR2xv YmFsVmFyV2F0Y2hhYmxlOgorICAgICAgICBjYXNlIFJlc29sdmVPcGVyYXRpb246OlNraXBTY29w ZXM6CisgICAgICAgIGNhc2UgUmVzb2x2ZU9wZXJhdGlvbjo6U2V0QmFzZVRvU2NvcGU6CisgICAg ICAgIGNhc2UgUmVzb2x2ZU9wZXJhdGlvbjo6UmV0dXJuU2NvcGVBc0Jhc2U6CisgICAgICAgIGNh c2UgUmVzb2x2ZU9wZXJhdGlvbjo6R2V0QW5kUmV0dXJuU2NvcGVkVmFyOgogICAgICAgICAgICAg Y29udGludWU7CiAKICAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpGYWlsOgpAQCAtOTQs MTIgKzk4LDggQEAgaW5saW5lIGJvb2wgY2FuSW5saW5lUmVzb2x2ZU9wZXJhdGlvbnMoTwogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBjYXNlIFJlc29sdmVPcGVyYXRp b246OlNraXBUb3BTY29wZU5vZGU6Ci0gICAgICAgIGNhc2UgUmVzb2x2ZU9wZXJhdGlvbjo6U2tp cFNjb3BlczoKLSAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpTZXRCYXNlVG9TY29wZToK LSAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpSZXR1cm5TY29wZUFzQmFzZToKLSAgICAg ICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpHZXRBbmRSZXR1cm5TY29wZWRWYXI6Ci0gICAgICAg ICAgICAvLyBUaGVzZSBvcGNvZGVzIHdvdWxkIGJlIGVhc3kgdG8gc3VwcG9ydCB3aXRoIGlubGlu aW5nLCBidXQgd2UgY3VycmVudGx5IGRvbid0IGRvIGl0LgotICAgICAgICAgICAgLy8gVGhlIGlz c3VlIGlzIHRoYXQgdGhlIHNjb3BlIGNoYWluIHdpbGwgbm90IGJlIHNldCBjb3JyZWN0bHkuCisg ICAgICAgICAgICAvLyBXZSBkb24ndCBpbmxpbmUgY29kZSBibG9ja3MgdGhhdCBjcmVhdGUgYWN0 aXZhdGlvbnMuIENyZWF0aW9uIG9mCisgICAgICAgICAgICAvLyBhY3RpdmF0aW9ucyBpcyB0aGUg b25seSB0aGluZyB0aGF0IGxlYWRzIHRvIFNraXBUb3BTY29wZU5vZGUuCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICAgICAgY2FzZSBSZXNvbHZlT3BlcmF0aW9uOjpDaGVja0ZvckR5 bmFtaWNFbnRyaWVzQmVmb3JlR2xvYmFsU2NvcGU6Cg==