125645 2013-12-12 11:26:03 -0800 CStack Branch: Change the disabling of DFG OSR entry to be based on an option 2013-12-12 11:34:26 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff oldest_to_newest 959262 0 msaboff 2013-12-12 11:26:03 -0800 There is currently some #if 0 ... #endif to disable OSR entry from baseline to DFG. These turned off sections don't fully disable OSR entry and they are inconvenient. We should use an option to control OSR entry. 959266 1 219101 msaboff 2013-12-12 11:33:55 -0800 Created attachment 219101 Patch for landing 959267 2 msaboff 2013-12-12 11:34:26 -0800 Committed r160499: <http://trac.webkit.org/changeset/160499> 219101 2013-12-12 11:33:55 -0800 2013-12-12 11:33:55 -0800 Patch for landing 125645.patch text/plain 5355 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwNDk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBA CisyMDEzLTEyLTEyICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENTdGFjayBCcmFuY2g6IENoYW5nZSB0aGUgZGlzYWJsaW5nIG9mIERGRyBPU1IgZW50cnkg dG8gYmUgYmFzZWQgb24gYW4gb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjU2NDUKKworICAgICAgICBSdWJiZXIgc3RhbXBlZCBieSBGaWxp cCBQaXpsby4KKworICAgICAgICBBZGRlZCBhIG5ldyBlbmFibGVPU1JFbnRyeVRvREZHIG9wdGlv biBhbmQgc2V0IHRoZSBkZWZhdWx0IHZhbHVlIHRvIGZhbHNlLgorICAgICAgICBJZiB0aGUgb3B0 aW9uIGlzIGZhbHNlLCBwcmVwYXJlT1NSRW50cnkoKSB3aWxsIHJldHVybiAwIHdoaWNoIGRpc2Fi bGVzIE9TUgorICAgICAgICBlbnRyeSwgYXMgdGhlIHJldHVybiB2YWx1ZSBpcyB0aGUgYWRkcmVz cyB0byBqdW1wIHRvIG9yIDAgaWYgd2UgY2FuJ3QgT1NSIGVudGVyLgorICAgICAgICBSZXN0b3Jl ZCB0aGUgY29kZSBpbiBlbWl0RW50ZXJPcHRpbWl6YXRpb25DaGVjaygpIGFuZCBlbWl0U2xvd19v cF9sb29wX2hpbnQoKQorICAgICAgICB0aGF0IGNoZWNrcyB0aGUgZXhpdCB2YWx1ZSBmcm9tIG9w ZXJhdGlvbk9wdGltaXplKCkuCisKKyAgICAgICAgUGVyIGEgZGlzY3Vzc2lvbiB3aXRoIEZpbGlw LCByZW1vdmVkIHRoZSBlbmFibGVPU1JFbnRyeUluTG9vcHMgb3B0aW9uIGFuZAorICAgICAgICBh c3NvY2lhdGVkIHVzZS4gIEFsbCBPU1IgZW50cnkgdG8gdGhlIERGRyBpcyBub3cgY29udHJvbGxl ZCB3aXRoIHRoZSBuZXcgb3B0aW9uLgorCisgICAgICAgICogZGZnL0RGR09TUkVudHJ5LmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpwcmVwYXJlT1NSRW50cnkpOgorICAgICAgICAqIGppdC9KSVQu Y3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRFbnRlck9wdGltaXphdGlvbkNoZWNrKToKKyAg ICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9s b29wX2hpbnQpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRTbG93X29wX2xvb3BfaGludCk6Cisg ICAgICAgICogcnVudGltZS9PcHRpb25zLmg6CisKIDIwMTMtMTItMTIgIE1hcmsgTGFtICA8bWFy ay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSByZXR1cm5Gcm9tSmF2YVNjcmlwdCB0 byBoYW5kbGVVbmNhdWdodEV4Y2VwdGlvbi4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHT1NSRW50cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHT1NSRW50cnkuY3BwCShyZXZpc2lvbiAxNjA0OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR09TUkVudHJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsMTAg QEAgdm9pZCogcHJlcGFyZU9TUkVudHJ5KEV4ZWNTdGF0ZSogZXhlYywgQwogICAgIEFTU0VSVChj b2RlQmxvY2stPmFsdGVybmF0aXZlKCkpOwogICAgIEFTU0VSVChjb2RlQmxvY2stPmFsdGVybmF0 aXZlKCktPmppdFR5cGUoKSA9PSBKSVRDb2RlOjpCYXNlbGluZUpJVCk7CiAgICAgQVNTRVJUKCFj b2RlQmxvY2stPmppdENvZGVNYXAoKSk7Ci0gICAgCisKKyAgICBpZiAoIU9wdGlvbnM6OmVuYWJs ZU9TUkVudHJ5VG9ERkcoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKICAgICBpZiAoT3B0aW9uczo6 dmVyYm9zZU9TUigpKSB7CiAgICAgICAgIGRhdGFMb2coCiAgICAgICAgICAgICAiREZHIE9TUiBp biAiLCAqY29kZUJsb2NrLT5hbHRlcm5hdGl2ZSgpLCAiIC0+ICIsICpjb2RlQmxvY2ssCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCShyZXZpc2lvbiAxNjA0OTgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk5LDExICs5OSw5 IEBAIHZvaWQgSklUOjplbWl0RW50ZXJPcHRpbWl6YXRpb25DaGVjaygpCiAgICAgc2tpcE9wdGlt aXplLmFwcGVuZChicmFuY2hBZGQzMihTaWduZWQsIFRydXN0ZWRJbW0zMihPcHRpb25zOjpleGVj dXRpb25Db3VudGVySW5jcmVtZW50Rm9yRW50cnkoKSksIEFic29sdXRlQWRkcmVzcyhtX2NvZGVC bG9jay0+YWRkcmVzc09mSklURXhlY3V0ZUNvdW50ZXIoKSkpKTsKICAgICBBU1NFUlQoIW1fYnl0 ZWNvZGVPZmZzZXQpOwogICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uT3B0aW1pemUsIG1fYnl0 ZWNvZGVPZmZzZXQpOwotI2lmIDAgLy8gRklYTUU6IENTdGFjayAtIG5lZWQgdG8gZml4IE9TUiBl bnRyeQogICAgIHNraXBPcHRpbWl6ZS5hcHBlbmQoYnJhbmNoVGVzdFB0cihaZXJvLCByZXR1cm5W YWx1ZUdQUikpOwogICAgIGp1bXAocmV0dXJuVmFsdWVHUFIpOwogICAgIHNraXBPcHRpbWl6ZS5s aW5rKHRoaXMpOwotI2VuZGlmCiB9CiAjZW5kaWYKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRPcGNvZGVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVE9wY29kZXMuY3BwCShyZXZpc2lvbiAxNjA0OTgpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDkzLDIwICsx MDkzLDggQEAgdm9pZCBKSVQ6OmVtaXRfb3BfbG9vcF9oaW50KEluc3RydWN0aW9uKgogewogICAg IC8vIEVtaXQgdGhlIEpJVCBvcHRpbWl6YXRpb24gY2hlY2s6IAogICAgIGlmIChjYW5CZU9wdGlt aXplZCgpKSB7Ci0gICAgICAgIGlmIChPcHRpb25zOjplbmFibGVPU1JFbnRyeUluTG9vcHMoKSkg ewotICAgICAgICAgICAgYWRkU2xvd0Nhc2UoYnJhbmNoQWRkMzIoUG9zaXRpdmVPclplcm8sIFRy dXN0ZWRJbW0zMihPcHRpb25zOjpleGVjdXRpb25Db3VudGVySW5jcmVtZW50Rm9yTG9vcCgpKSwK LSAgICAgICAgICAgICAgICBBYnNvbHV0ZUFkZHJlc3MobV9jb2RlQmxvY2stPmFkZHJlc3NPZkpJ VEV4ZWN1dGVDb3VudGVyKCkpKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBB ZGQgd2l0aCBzYXR1cmF0aW9uLgotICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKG1fY29k ZUJsb2NrLT5hZGRyZXNzT2ZKSVRFeGVjdXRlQ291bnRlcigpKSwgcmVnVDMpOwotICAgICAgICAg ICAgbG9hZDMyKHJlZ1QzLCByZWdUMik7Ci0gICAgICAgICAgICBKdW1wIGRvbnRBZGQgPSBicmFu Y2gzMigKLSAgICAgICAgICAgICAgICBHcmVhdGVyVGhhbiwgcmVnVDIsCi0gICAgICAgICAgICAg ICAgVHJ1c3RlZEltbTMyKHN0ZDo6bnVtZXJpY19saW1pdHM8aW50MzJfdD46Om1heCgpIC0gT3B0 aW9uczo6ZXhlY3V0aW9uQ291bnRlckluY3JlbWVudEZvckxvb3AoKSkpOwotICAgICAgICAgICAg YWRkMzIoVHJ1c3RlZEltbTMyKE9wdGlvbnM6OmV4ZWN1dGlvbkNvdW50ZXJJbmNyZW1lbnRGb3JM b29wKCkpLCByZWdUMik7Ci0gICAgICAgICAgICBzdG9yZTMyKHJlZ1QyLCByZWdUMyk7Ci0gICAg ICAgICAgICBkb250QWRkLmxpbmsodGhpcyk7Ci0gICAgICAgIH0KKyAgICAgICAgYWRkU2xvd0Nh c2UoYnJhbmNoQWRkMzIoUG9zaXRpdmVPclplcm8sIFRydXN0ZWRJbW0zMihPcHRpb25zOjpleGVj dXRpb25Db3VudGVySW5jcmVtZW50Rm9yTG9vcCgpKSwKKyAgICAgICAgICAgIEFic29sdXRlQWRk cmVzcyhtX2NvZGVCbG9jay0+YWRkcmVzc09mSklURXhlY3V0ZUNvdW50ZXIoKSkpKTsKICAgICB9 CiAKICAgICAvLyBFbWl0IHRoZSB3YXRjaGRvZyB0aW1lciBjaGVjazoKQEAgLTExMTgsMTUgKzEx MDYsMTMgQEAgdm9pZCBKSVQ6OmVtaXRTbG93X29wX2xvb3BfaGludChJbnN0cnVjdAogewogI2lm IEVOQUJMRShERkdfSklUKQogICAgIC8vIEVtaXQgdGhlIHNsb3cgcGF0aCBmb3IgdGhlIEpJVCBv cHRpbWl6YXRpb24gY2hlY2s6Ci0gICAgaWYgKGNhbkJlT3B0aW1pemVkKCkgJiYgT3B0aW9uczo6 ZW5hYmxlT1NSRW50cnlJbkxvb3BzKCkpIHsKKyAgICBpZiAoY2FuQmVPcHRpbWl6ZWQoKSkgewog ICAgICAgICBsaW5rU2xvd0Nhc2UoaXRlcik7CiAgICAgICAgIAogICAgICAgICBjYWxsT3BlcmF0 aW9uKG9wZXJhdGlvbk9wdGltaXplLCBtX2J5dGVjb2RlT2Zmc2V0KTsKLSNpZiAwIC8vIEZJWE1F OiBDU3RhY2sgLSBuZWVkIHRvIGZpeCBPU1IgZW50cnkKICAgICAgICAgSnVtcCBub09wdGltaXpl ZEVudHJ5ID0gYnJhbmNoVGVzdFB0cihaZXJvLCByZXR1cm5WYWx1ZUdQUik7CiAgICAgICAgIGp1 bXAocmV0dXJuVmFsdWVHUFIpOwogICAgICAgICBub09wdGltaXplZEVudHJ5LmxpbmsodGhpcyk7 Ci0jZW5kaWYKIAogICAgICAgICBlbWl0SnVtcFNsb3dUb0hvdChqdW1wKCksIE9QQ09ERV9MRU5H VEgob3BfbG9vcF9oaW50KSk7CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvT3B0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL09wdGlvbnMuaAkocmV2aXNpb24gMTYwNDk4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvT3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIwLDcgQEAgdHlw ZWRlZiBPcHRpb25SYW5nZSBvcHRpb25SYW5nZTsKICAgICB2KGJvb2wsIHJlcG9ydENvbXBpbGVU aW1lcywgZmFsc2UpIFwKICAgICB2KGJvb2wsIHZlcmJvc2VDRkEsIGZhbHNlKSBcCiAgICAgXAot ICAgIHYoYm9vbCwgZW5hYmxlT1NSRW50cnlJbkxvb3BzLCB0cnVlKSBcCisgICAgdihib29sLCBl bmFibGVPU1JFbnRyeVRvREZHLCBmYWxzZSkgXAogICAgIFwKICAgICB2KGJvb2wsIHVzZUV4cGVy aW1lbnRhbEZUTCwgZmFsc2UpIFwKICAgICB2KGJvb2wsIHVzZUZUTFRCQUEsIHRydWUpIFwK