118329 2013-07-02 15:32:37 -0700 fourthTier: add option to disable OSR entry in loops 2013-07-02 15:55:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112840 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 905601 0 fpizlo 2013-07-02 15:32:37 -0700 Currently if you're using the FTL then OSR entry in loops tries to work, and then fails, and then pretends that it had OSR exited, and the heuristics just go downhill from there. We should have an option to disable OSR entry in loops both for the benefit of the FTL and because it could be interesting for other testing in the future: like you want to see if OSR entry in loops is the cause of a bug, or something. 905602 1 205948 fpizlo 2013-07-02 15:34:34 -0700 Created attachment 205948 the patch 905615 2 205948 mhahnenberg 2013-07-02 15:52:56 -0700 Comment on attachment 205948 the patch r=me 905617 3 fpizlo 2013-07-02 15:55:33 -0700 Landed in http://trac.webkit.org/changeset/152326 205948 2013-07-02 15:34:34 -0700 2013-07-02 15:52:56 -0700 the patch blah.patch text/plain 6923 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMzI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDEzLTA3LTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Zm91cnRoVGllcjogYWRkIG9wdGlvbiB0byBkaXNhYmxlIE9TUiBlbnRyeSBpbiBsb29wcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MzI5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGlz IGFkZHMgdGhhdCBvcHRpb24sIGFuZCBhbHNvIG1ha2VzIHRoZSBPU1IgZXhpdCByZW9wdGltaXph dGlvbiB0cmlnZ2VyIHJlbHkgbGVzcyBvbgorICAgICAgICBPU1IgZW50cnkgZmFpbGluZy4gTm93 IGV2ZW4gaWYgd2UgbmV2ZXIgYXR0ZW1wdCBPU1IgZW50cnkgYnV0IG91ciBleGVjdXRpb24gY291 bnRlciBnZXRzCisgICAgICAgIGhpZ2ggYWZ0ZXIgYSBzbWFsbCBudW1iZXIgb2YgT1NSIGV4aXRz LCB3ZSB3aWxsIHJlY29tcGlsZS4KKworICAgICAgICAqIGRmZy9ERkdPU1JFeGl0Q29tcGlsZXJD b21tb24uY3BwOgorICAgICAgICAoSlNDOjpERkc6OmhhbmRsZUV4aXRDb3VudHMpOgorICAgICAg ICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6 CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9sb29wX2hpbnQpOgorICAgICAgICAoSlNDOjpK SVQ6OmVtaXRTbG93X29wX2xvb3BfaGludCk6CisgICAgICAgICogcnVudGltZS9PcHRpb25zLmg6 CisgICAgICAgIChKU0MpOgorCiAyMDEzLTA3LTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgZm91cnRoVGllcjogc2luY2UgdGhlIEZUTCBkaXNhc3NlbWJseSBo YWNrcyBjYW5ub3QgZGlzdGluZ3Vpc2ggYmV0d2VlbiBjb2RlIGFuZCBkYXRhLCB0aGUgTExWTSBk aXNhc3NlbWJsZXIgc3ltYm9sIHRhYmxlIGNhbGxiYWNrIHNob3VsZCBiZSBhYmxlIHRvIGRlYWwg Z3JhY2VmdWxseSB3aXRoIGFyYml0cmFyeSBnYXJiYWdlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlckNvbW1vbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXJDb21tb24uY3BwCShyZXZp c2lvbiAxNTIzMTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21w aWxlckNvbW1vbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDkgKzQ0LDE3IEBAIHZvaWQgaGFu ZGxlRXhpdENvdW50cyhDQ2FsbEhlbHBlcnMmIGppdCwKICAgICBqaXQubG9hZDMyKEFzc2VtYmx5 SGVscGVyczo6QWRkcmVzcyhHUFJJbmZvOjpyZWdUMCwgQ29kZUJsb2NrOjpvZmZzZXRPZk9TUkV4 aXRDb3VudGVyKCkpLCBHUFJJbmZvOjpyZWdUMik7CiAgICAgaml0LmFkZDMyKEFzc2VtYmx5SGVs cGVyczo6VHJ1c3RlZEltbTMyKDEpLCBHUFJJbmZvOjpyZWdUMik7CiAgICAgaml0LnN0b3JlMzIo R1BSSW5mbzo6cmVnVDIsIEFzc2VtYmx5SGVscGVyczo6QWRkcmVzcyhHUFJJbmZvOjpyZWdUMCwg Q29kZUJsb2NrOjpvZmZzZXRPZk9TUkV4aXRDb3VudGVyKCkpKTsKKyAgICAKICAgICBqaXQubW92 ZShBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoaml0LmJhc2VsaW5lQ29kZUJsb2NrKCkp LCBHUFJJbmZvOjpyZWdUMCk7CisgICAgQXNzZW1ibHlIZWxwZXJzOjpKdW1wIHJlb3B0aW1pemVO b3cgPSBqaXQuYnJhbmNoMzIoCisgICAgICAgIEFzc2VtYmx5SGVscGVyczo6R3JlYXRlclRoYW5P ckVxdWFsLAorICAgICAgICBBc3NlbWJseUhlbHBlcnM6OkFkZHJlc3MoR1BSSW5mbzo6cmVnVDAs IENvZGVCbG9jazo6b2Zmc2V0T2ZKSVRFeGVjdXRlQ291bnRlcigpKSwKKyAgICAgICAgQXNzZW1i bHlIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMCkpOworICAgICAgICAKICAgICB0b29GZXdGYWlscyA9 IGppdC5icmFuY2gzMihBc3NlbWJseUhlbHBlcnM6OkJlbG93T3JFcXVhbCwgR1BSSW5mbzo6cmVn VDIsIEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbTMyKGppdC5jb2RlQmxvY2soKS0+ZXhpdENv dW50VGhyZXNob2xkRm9yUmVvcHRpbWl6YXRpb24oKSkpOwogICAgIAorICAgIHJlb3B0aW1pemVO b3cubGluaygmaml0KTsKKyAgICAKICAgICAvLyBSZW9wdGltaXplIGFzIHNvb24gYXMgcG9zc2li bGUuCiAjaWYgIU5VTUJFUl9PRl9BUkdVTUVOVF9SRUdJU1RFUlMKICAgICBqaXQucG9rZShHUFJJ bmZvOjpyZWdUMCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlv bnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5jcHAJKHJldmlzaW9uIDE1MjMxNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NDAsMTMgKzE3NDAsMzIgQEAg ZXh0ZXJuICJDIiB2b2lkIERGR19PUEVSQVRJT04gdHJpZ2dlclJlbwogCiAgICAgLy8gSWYgSSBh bSBteSBvd24gcmVwbGFjZW1lbnQsIHRoZW4gcmVvcHRpbWl6YXRpb24gaGFzIGFscmVhZHkgYmVl biB0cmlnZ2VyZWQuCiAgICAgLy8gVGhpcyBjYW4gaGFwcGVuIGluIHJlY3Vyc2l2ZSBmdW5jdGlv bnMuCi0gICAgaWYgKGNvZGVCbG9jay0+cmVwbGFjZW1lbnQoKSA9PSBjb2RlQmxvY2spCisgICAg aWYgKGNvZGVCbG9jay0+cmVwbGFjZW1lbnQoKSA9PSBjb2RlQmxvY2spIHsKKyAgICAgICAgaWYg KE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkKKyAgICAgICAgICAgIGRhdGFMb2coKmNvZGVCbG9jaywg IjogTm90IHJlb3B0aW1pemluZyBiZWNhdXNlIHdlJ3ZlIGFscmVhZHkgYmVlbiBqZXR0aXNvbmVk LlxuIik7CiAgICAgICAgIHJldHVybjsKLQorICAgIH0KKyAgICAKICAgICAvLyBPdGhlcndpc2Us IHRoZSByZXBsYWNlbWVudCBtdXN0IGJlIG9wdGltaXplZCBjb2RlLiBVc2UgdGhpcyBhcyBhbiBv cHBvcnR1bml0eQogICAgIC8vIHRvIGNoZWNrIG91ciBsb2dpYy4KICAgICBBU1NFUlQoY29kZUJs b2NrLT5oYXNPcHRpbWl6ZWRSZXBsYWNlbWVudCgpKTsKLSAgICBBU1NFUlQoSklUQ29kZTo6aXNP cHRpbWl6aW5nSklUKGNvZGVCbG9jay0+cmVwbGFjZW1lbnQoKS0+aml0VHlwZSgpKSk7CisgICAg Q29kZUJsb2NrKiBvcHRpbWl6ZWRDb2RlQmxvY2sgPSBjb2RlQmxvY2stPnJlcGxhY2VtZW50KCk7 CisgICAgQVNTRVJUKEpJVENvZGU6OmlzT3B0aW1pemluZ0pJVChvcHRpbWl6ZWRDb2RlQmxvY2st PmppdFR5cGUoKSkpOworCisgICAgLy8gSW4gb3JkZXIgdG8gdHJpZ2dlciByZW9wdGltaXphdGlv biwgb25lIG9mIHR3byB0aGluZ3MgbXVzdCBoYXZlIGhhcHBlbmVkOgorICAgIC8vIDEpIFdlIGV4 aXRlZCBtb3JlIHRoYW4gc29tZSBudW1iZXIgb2YgdGltZXMuCisgICAgLy8gMikgV2UgZXhpdGVk IGFuZCBnb3Qgc3R1Y2sgaW4gYSBsb29wLCBhbmQgbm93IHdlJ3JlIGV4aXRpbmcgYWdhaW4uCisg ICAgYm9vbCBkaWRFeGl0QUJ1bmNoID0gb3B0aW1pemVkQ29kZUJsb2NrLT5zaG91bGRSZW9wdGlt aXplTm93KCk7CisgICAgYm9vbCBkaWRHZXRTdHVja0luTG9vcCA9CisgICAgICAgIGNvZGVCbG9j ay0+Y2hlY2tJZk9wdGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQoKQorICAgICAgICAmJiBvcHRp bWl6ZWRDb2RlQmxvY2stPnNob3VsZFJlb3B0aW1pemVGcm9tTG9vcE5vdygpOworICAgIAorICAg IGlmICghZGlkRXhpdEFCdW5jaCAmJiAhZGlkR2V0U3R1Y2tJbkxvb3ApIHsKKyAgICAgICAgaWYg KE9wdGlvbnM6OnZlcmJvc2VPU1IoKSkKKyAgICAgICAgICAgIGRhdGFMb2coKmNvZGVCbG9jaywg IjogTm90IHJlb3B0aW1pemluZyAiLCAqb3B0aW1pemVkQ29kZUJsb2NrLCAiIGJlY2F1c2UgaXQg ZWl0aGVyIGRpZG4ndCBleGl0IGVub3VnaCBvciBkaWRuJ3QgbG9vcCBlbm91Z2ggYWZ0ZXIgZXhp dC5cbiIpOworICAgICAgICBjb2RlQmxvY2stPm9wdGltaXplQWZ0ZXJMb25nV2FybVVwKCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBjb2RlQmxvY2stPnJlb3B0aW1pemUoKTsKIH0K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkocmV2aXNpb24g MTUyMzE3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTE1NCw5ICsxMTU0LDIyIEBAIHZvaWQgSklUOjplbWl0U2xvd19vcF9n ZXRfYXJndW1lbnRfYnlfdmEKIHZvaWQgSklUOjplbWl0X29wX2xvb3BfaGludChJbnN0cnVjdGlv biopCiB7CiAgICAgLy8gRW1pdCB0aGUgSklUIG9wdGltaXphdGlvbiBjaGVjazogCi0gICAgaWYg KGNhbkJlT3B0aW1pemVkKCkpCi0gICAgICAgIGFkZFNsb3dDYXNlKGJyYW5jaEFkZDMyKFBvc2l0 aXZlT3JaZXJvLCBUcnVzdGVkSW1tMzIoT3B0aW9uczo6ZXhlY3V0aW9uQ291bnRlckluY3JlbWVu dEZvckxvb3AoKSksCi0gICAgICAgICAgICBBYnNvbHV0ZUFkZHJlc3MobV9jb2RlQmxvY2stPmFk ZHJlc3NPZkpJVEV4ZWN1dGVDb3VudGVyKCkpKSk7CisgICAgaWYgKGNhbkJlT3B0aW1pemVkKCkp IHsKKyAgICAgICAgaWYgKE9wdGlvbnM6OmVuYWJsZU9TUkVudHJ5SW5Mb29wcygpKSB7CisgICAg ICAgICAgICBhZGRTbG93Q2FzZShicmFuY2hBZGQzMihQb3NpdGl2ZU9yWmVybywgVHJ1c3RlZElt bTMyKE9wdGlvbnM6OmV4ZWN1dGlvbkNvdW50ZXJJbmNyZW1lbnRGb3JMb29wKCkpLAorICAgICAg ICAgICAgICAgIEFic29sdXRlQWRkcmVzcyhtX2NvZGVCbG9jay0+YWRkcmVzc09mSklURXhlY3V0 ZUNvdW50ZXIoKSkpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIEFkZCB3aXRo IHNhdHVyYXRpb24uCisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIobV9jb2RlQmxvY2st PmFkZHJlc3NPZkpJVEV4ZWN1dGVDb3VudGVyKCkpLCByZWdUMyk7CisgICAgICAgICAgICBsb2Fk MzIocmVnVDMsIHJlZ1QyKTsKKyAgICAgICAgICAgIEp1bXAgZG9udEFkZCA9IGJyYW5jaDMyKAor ICAgICAgICAgICAgICAgIEdyZWF0ZXJUaGFuLCByZWdUMiwKKyAgICAgICAgICAgICAgICBUcnVz dGVkSW1tMzIoc3RkOjpudW1lcmljX2xpbWl0czxpbnQzMl90Pjo6bWF4KCkgLSBPcHRpb25zOjpl eGVjdXRpb25Db3VudGVySW5jcmVtZW50Rm9yTG9vcCgpKSk7CisgICAgICAgICAgICBhZGQzMihU cnVzdGVkSW1tMzIoT3B0aW9uczo6ZXhlY3V0aW9uQ291bnRlckluY3JlbWVudEZvckxvb3AoKSks IHJlZ1QyKTsKKyAgICAgICAgICAgIHN0b3JlMzIocmVnVDIsIHJlZ1QzKTsKKyAgICAgICAgICAg IGRvbnRBZGQubGluayh0aGlzKTsKKyAgICAgICAgfQorICAgIH0KIAogICAgIC8vIEVtaXQgdGhl IHdhdGNoZG9nIHRpbWVyIGNoZWNrOgogICAgIGlmIChtX3ZtLT53YXRjaGRvZy5pc0VuYWJsZWQo KSkKQEAgLTExNjcsMTMgKzExODAsMTMgQEAgdm9pZCBKSVQ6OmVtaXRTbG93X29wX2xvb3BfaGlu dChJbnN0cnVjdAogewogI2lmIEVOQUJMRShERkdfSklUKQogICAgIC8vIEVtaXQgdGhlIHNsb3cg cGF0aCBmb3IgdGhlIEpJVCBvcHRpbWl6YXRpb24gY2hlY2s6Ci0gICAgaWYgKGNhbkJlT3B0aW1p emVkKCkpIHsKKyAgICBpZiAoY2FuQmVPcHRpbWl6ZWQoKSAmJiBPcHRpb25zOjplbmFibGVPU1JF bnRyeUluTG9vcHMoKSkgewogICAgICAgICBsaW5rU2xvd0Nhc2UoaXRlcik7Ci0KKyAgICAgICAg CiAgICAgICAgIEpJVFN0dWJDYWxsIHN0dWJDYWxsKHRoaXMsIGN0aV9vcHRpbWl6ZSk7CiAgICAg ICAgIHN0dWJDYWxsLmFkZEFyZ3VtZW50KFRydXN0ZWRJbW0zMihtX2J5dGVjb2RlT2Zmc2V0KSk7 CiAgICAgICAgIHN0dWJDYWxsLmNhbGwoKTsKLQorICAgICAgICAKICAgICAgICAgZW1pdEp1bXBT bG93VG9Ib3QoanVtcCgpLCBPUENPREVfTEVOR1RIKG9wX2xvb3BfaGludCkpOwogICAgIH0KICNl bmRpZgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAkocmV2aXNp b24gMTUyMzE3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCSh3 b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4Niw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHYoYm9v bCwgdmVyYm9zZUNvbXBpbGF0aW9uUXVldWUsIGZhbHNlKSBcCiAgICAgdihib29sLCByZXBvcnRD b21waWxlVGltZXMsIGZhbHNlKSBcCiAgICAgXAorICAgIHYoYm9vbCwgZW5hYmxlT1NSRW50cnlJ bkxvb3BzLCB0cnVlKSBcCisgICAgXAogICAgIHYoYm9vbCwgdXNlRXhwZXJpbWVudGFsRlRMLCBm YWxzZSkgXAogICAgIHYoYm9vbCwgdXNlRlRMVEJBQSwgdHJ1ZSkgXAogICAgIHYoYm9vbCwgZW5h YmxlTExWTUZhc3RJU2VsLCBmYWxzZSkgXAo=