128560 2014-02-10 16:20:17 -0800 Fail FTL compilation if the required stack is too big 2014-02-10 16:42:38 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 125650 1 msaboff msaboff oldest_to_newest 979123 0 msaboff 2014-02-10 16:20:17 -0800 If the FTL compiles a function with a stack larger than a certain limit (128K has been suggest), fail the compile. It probably makes sense to make the limit configurable. 979133 1 223765 msaboff 2014-02-10 16:24:59 -0800 Created attachment 223765 Patch 979136 2 223765 ggaren 2014-02-10 16:31:28 -0800 Comment on attachment 223765 Patch r=me 979138 3 223765 fpizlo 2014-02-10 16:31:50 -0800 Comment on attachment 223765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223765&action=review > Source/JavaScriptCore/ftl/FTLStackMaps.h:104 > + unsigned getStackSize() const; I would call this stackSize() and not getStackSize(). We don't usually prepend getters with "get". The reason why "getRecordMap()" has a "get" in it is that it actually has to do significant work to return the record map. Probably, that should be called "computeRecordMap()". But your "getStackSize" is not computing anything, and it's a getter, so lets just call it "stackSize()". 979139 4 223765 fpizlo 2014-02-10 16:32:10 -0800 Comment on attachment 223765 Patch r=me but change the name of getStackSize 979140 5 msaboff 2014-02-10 16:32:56 -0800 (In reply to comment #3) > (From update of attachment 223765 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223765&action=review > > > Source/JavaScriptCore/ftl/FTLStackMaps.h:104 > > + unsigned getStackSize() const; > > I would call this stackSize() and not getStackSize(). We don't usually prepend getters with "get". The reason why "getRecordMap()" has a "get" in it is that it actually has to do significant work to return the record map. Probably, that should be called "computeRecordMap()". But your "getStackSize" is not computing anything, and it's a getter, so lets just call it "stackSize()". Agreed. I'll change it. 979143 6 msaboff 2014-02-10 16:42:38 -0800 Committed r163838: <http://trac.webkit.org/changeset/163838> 223765 2014-02-10 16:24:59 -0800 2014-02-10 16:32:10 -0800 Patch 128560.patch text/plain 6394 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzODM3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE0LTAyLTEwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIEZhaWwgRlRMIGNvbXBpbGF0aW9uIGlmIHRoZSByZXF1aXJlZCBzdGFjayBpcyB0b28gYmln CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1NjAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBT dGFja1NpemUgc3RydWN0IHRvIEZUTFN0YWNrTWFwcyBhbmQgcG9wdWxhdGVkIGl0LiAgQWRkZWQg YW5kIHVwZGF0ZWQKKyAgICAgICAgcmVsYXRlZCBkdW1wIGZ1bmN0aW9ucy4gIFVzZSB0aGUgc3Rh Y2sgc2l6ZSBmb3VuZCBhdCB0aGUgZW5kIG9mIHRoZSBjb21waWxhdGlvbgorICAgICAgICB0byBj b21wYXJlIGFnYWluc3QgdGhlIHZhbHVlIG9mIGEgbmV3IG9wdGlvbiwgbGx2bU1heFN0YWNrU2l6 ZS4gIFdlIGZhaWwgdGhlCisgICAgICAgIGNvbXBpbGUgaWYgdGhlIGZ1bmN0aW9uJ3Mgc3RhY2sg c2l6ZSBpcyBncmVhdGVyIHRoYW4gbGx2bU1heFN0YWNrU2l6ZS4KKworICAgICAgICAqIGRmZy9E RkdQbGFuLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpQbGFuOjpjb21waWxlSW5UaHJlYWRJbXBs KToKKyAgICAgICAgKiBmdGwvRlRMU3RhY2tNYXBzLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpT dGFja01hcHM6OlN0YWNrU2l6ZTo6cGFyc2UpOgorICAgICAgICAoSlNDOjpGVEw6OlN0YWNrTWFw czo6U3RhY2tTaXplOjpkdW1wKToKKyAgICAgICAgKEpTQzo6RlRMOjpTdGFja01hcHM6OnBhcnNl KToKKyAgICAgICAgKEpTQzo6RlRMOjpTdGFja01hcHM6OmR1bXApOgorICAgICAgICAoSlNDOjpG VEw6OlN0YWNrTWFwczo6ZHVtcE11bHRpbGluZSk6CisgICAgICAgIChKU0M6OkZUTDo6U3RhY2tN YXBzOjpnZXRTdGFja1NpemUpOgorICAgICAgICAqIGZ0bC9GVExTdGFja01hcHMuaDoKKyAgICAg ICAgKiBydW50aW1lL09wdGlvbnMuaDoKKwogMjAxNC0wMi0xMCAgTWFyayBMYW0gIDxtYXJrLmxh bUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hhbmdlIEpTTG9jazo6ZHJvcEFsbExvY2tzKCkgYW5k IGZyaWVuZHMgdG8gdXNlIGxvY2soKSBhbmQgdW5sb2NrKCkuCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1BsYW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHUGxhbi5jcHAJKHJldmlzaW9uIDE2MzgwNykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzOSw3ICszMzksMTIg QEAgUGxhbjo6Q29tcGlsYXRpb25QYXRoIFBsYW46OmNvbXBpbGVJblRocgogICAgICAgICAgICAg RlRMOjpmYWlsKHN0YXRlKTsKICAgICAgICAgICAgIHJldHVybiBGVExQYXRoOwogICAgICAgICB9 Ci0gICAgICAgIAorCisgICAgICAgIGlmIChzdGF0ZS5qaXRDb2RlLT5zdGFja21hcHMuZ2V0U3Rh Y2tTaXplKCkgPiBPcHRpb25zOjpsbHZtTWF4U3RhY2tTaXplKCkpIHsKKyAgICAgICAgICAgIEZU TDo6ZmFpbChzdGF0ZSk7CisgICAgICAgICAgICByZXR1cm4gRlRMUGF0aDsKKyAgICAgICAgfQor CiAgICAgICAgIEZUTDo6bGluayhzdGF0ZSk7CiAgICAgICAgIHJldHVybiBGVExQYXRoOwogI2Vs c2UKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFN0YWNrTWFwcy5jcHAJKHJl dmlzaW9uIDE2MzgwNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsNiArNTMsMTcgQEAgdm9pZCBTdGFja01hcHM6OkNv bnN0YW50OjpkdW1wKFByaW50U3RyZQogICAgIG91dC5wcmludGYoIjB4JTAxNmxseCIsIGludGVn ZXIpOwogfQogCit2b2lkIFN0YWNrTWFwczo6U3RhY2tTaXplOjpwYXJzZShEYXRhVmlldyogdmll dywgdW5zaWduZWQmIG9mZnNldCkKK3sKKyAgICBmdW5jdGlvbk9mZnNldCA9IHZpZXctPnJlYWQ8 dWludDMyX3Q+KG9mZnNldCwgdHJ1ZSk7CisgICAgc2l6ZSA9IHZpZXctPnJlYWQ8dWludDMyX3Q+ KG9mZnNldCwgdHJ1ZSk7Cit9CisKK3ZvaWQgU3RhY2tNYXBzOjpTdGFja1NpemU6OmR1bXAoUHJp bnRTdHJlYW0mIG91dCkgY29uc3QKK3sKKyAgICBvdXQucHJpbnQoIihvZmY6IiwgZnVuY3Rpb25P ZmZzZXQsICIsIHNpemU6Iiwgc2l6ZSwgIikiKTsKK30KKwogdm9pZCBTdGFja01hcHM6OkxvY2F0 aW9uOjpwYXJzZShEYXRhVmlldyogdmlldywgdW5zaWduZWQmIG9mZnNldCkKIHsKICAgICBraW5k ID0gc3RhdGljX2Nhc3Q8S2luZD4odmlldy0+cmVhZDx1aW50OF90PihvZmZzZXQsIHRydWUpKTsK QEAgLTExNiwxNSArMTI3LDkgQEAgYm9vbCBTdGFja01hcHM6OnBhcnNlKERhdGFWaWV3KiB2aWV3 KQogICAgIHZpZXctPnJlYWQ8dWludDMyX3Q+KG9mZnNldCwgdHJ1ZSk7IC8vIFJlc2VydmVkICho ZWFkZXIpCiAgICAgCiAgICAgdWludDMyX3QgbnVtRnVuY3Rpb25zID0gdmlldy0+cmVhZDx1aW50 MzJfdD4ob2Zmc2V0LCB0cnVlKTsKKyAgICBBU1NFUlQobnVtRnVuY3Rpb25zID09IDEpOyAvLyBU aGVyZSBzaG91bGQgb25seSBiZSBvbmUgc3RhY2sgc2l6ZSByZWNvcmQKICAgICB3aGlsZSAobnVt RnVuY3Rpb25zLS0pIHsKLSAgICAgICAgLy8gRklYTUU6IEFjdHVhbGx5IHVzZSB0aGlzIGRhdGEu Ci0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU2 NTAKLSAgICAgICAgdWludDMyX3QgZnVuY3Rpb25PZmZzZXQgPSB2aWV3LT5yZWFkPHVpbnQzMl90 PihvZmZzZXQsIHRydWUpOwotICAgICAgICB1aW50MzJfdCBzdGFja1NpemUgPSB2aWV3LT5yZWFk PHVpbnQzMl90PihvZmZzZXQsIHRydWUpOwotICAgICAgICBpZiAoIXN0YWNrU2l6ZSB8fCBzdGFj a1NpemUgPiAoMSA8PCAyMCkpIHsKLSAgICAgICAgICAgIGRhdGFMb2coIkJhZCBzdGFjayBzaXpl ICIsIHN0YWNrU2l6ZSwgIiBmb3IgZnVuY3Rpb24gb2Zmc2V0IiwgZnVuY3Rpb25PZmZzZXQsICJc biIpOwotICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAg fQorICAgICAgICBzdGFja1NpemVzLmFwcGVuZChyZWFkT2JqZWN0PFN0YWNrU2l6ZT4odmlldywg b2Zmc2V0KSk7CiAgICAgfQogICAgIAogICAgIHVpbnQzMl90IG51bUNvbnN0YW50cyA9IHZpZXct PnJlYWQ8dWludDMyX3Q+KG9mZnNldCwgdHJ1ZSk7CkBAIC0xNDQsMTEgKzE0OSwxNCBAQCBib29s IFN0YWNrTWFwczo6cGFyc2UoRGF0YVZpZXcqIHZpZXcpCiAKIHZvaWQgU3RhY2tNYXBzOjpkdW1w KFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CiB7Ci0gICAgb3V0LnByaW50KCJDb25zdGFudHM6WyIs IGxpc3REdW1wKGNvbnN0YW50cyksICJdLCBSZWNvcmRzOlsiLCBsaXN0RHVtcChyZWNvcmRzKSwg Il0iKTsKKyAgICBvdXQucHJpbnQoIlN0YWNrU2l6ZXNbIiwgbGlzdER1bXAoc3RhY2tTaXplcyks ICJdLCBDb25zdGFudHM6WyIsIGxpc3REdW1wKGNvbnN0YW50cyksICJdLCBSZWNvcmRzOlsiLCBs aXN0RHVtcChyZWNvcmRzKSwgIl0iKTsKIH0KIAogdm9pZCBTdGFja01hcHM6OmR1bXBNdWx0aWxp bmUoUHJpbnRTdHJlYW0mIG91dCwgY29uc3QgY2hhciogcHJlZml4KSBjb25zdAogeworICAgIG91 dC5wcmludChwcmVmaXgsICJTdGFja1NpemVzOlxuIik7CisgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHN0YWNrU2l6ZXMuc2l6ZSgpOyArK2kpCisgICAgICAgIG91dC5wcmludChwcmVmaXgs ICIgICAgIiwgc3RhY2tTaXplc1tpXSwgIlxuIik7CiAgICAgb3V0LnByaW50KHByZWZpeCwgIkNv bnN0YW50czpcbiIpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjb25zdGFudHMuc2l6 ZSgpOyArK2kpCiAgICAgICAgIG91dC5wcmludChwcmVmaXgsICIgICAgIiwgY29uc3RhbnRzW2ld LCAiXG4iKTsKQEAgLTE2NSw2ICsxNzMsMTMgQEAgU3RhY2tNYXBzOjpSZWNvcmRNYXAgU3RhY2tN YXBzOjpnZXRSZWNvcgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK3Vuc2lnbmVkIFN0YWNrTWFw czo6Z2V0U3RhY2tTaXplKCkgY29uc3QKK3sKKyAgICBSRUxFQVNFX0FTU0VSVChzdGFja1NpemVz LnNpemUoKSA9PSAxKTsKKworICAgIHJldHVybiBzdGFja1NpemVzWzBdLnNpemU7Cit9CisKIH0g fSAvLyBuYW1lc3BhY2UgSlNDOjpGVEwKIAogbmFtZXNwYWNlIFdURiB7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTFN0YWNrTWFwcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBzLmgJKHJldmlzaW9uIDE2MzgwNykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBzLmgJKHdvcmtpbmcgY29weSkKQEAg LTQ3LDcgKzQ3LDE1IEBAIHN0cnVjdCBTdGFja01hcHMgewogICAgICAgICB2b2lkIHBhcnNlKERh dGFWaWV3KiwgdW5zaWduZWQmIG9mZnNldCk7CiAgICAgICAgIHZvaWQgZHVtcChQcmludFN0cmVh bSYgb3V0KSBjb25zdDsKICAgICB9OwotICAgIAorCisgICAgc3RydWN0IFN0YWNrU2l6ZSB7Cisg ICAgICAgIHVpbnQzMl90IGZ1bmN0aW9uT2Zmc2V0OworICAgICAgICB1aW50MzJfdCBzaXplOwor CisgICAgICAgIHZvaWQgcGFyc2UoRGF0YVZpZXcqLCB1bnNpZ25lZCYgb2Zmc2V0KTsKKyAgICAg ICAgdm9pZCBkdW1wKFByaW50U3RyZWFtJikgY29uc3Q7CisgICAgfTsKKwogICAgIHN0cnVjdCBM b2NhdGlvbiB7CiAgICAgICAgIGVudW0gS2luZCA6IGludDhfdCB7CiAgICAgICAgICAgICBVbnBy b2Nlc3NlZCwKQEAgLTgwLDcgKzg4LDggQEAgc3RydWN0IFN0YWNrTWFwcyB7CiAgICAgICAgIGJv b2wgcGFyc2UoRGF0YVZpZXcqLCB1bnNpZ25lZCYgb2Zmc2V0KTsKICAgICAgICAgdm9pZCBkdW1w KFByaW50U3RyZWFtJikgY29uc3Q7CiAgICAgfTsKLSAgICAKKworICAgIFZlY3RvcjxTdGFja1Np emU+IHN0YWNrU2l6ZXM7CiAgICAgVmVjdG9yPENvbnN0YW50PiBjb25zdGFudHM7CiAgICAgVmVj dG9yPFJlY29yZD4gcmVjb3JkczsKICAgICAKQEAgLTkxLDYgKzEwMCw4IEBAIHN0cnVjdCBTdGFj a01hcHMgewogICAgIHR5cGVkZWYgSGFzaE1hcDx1aW50MzJfdCwgVmVjdG9yPFJlY29yZD4sIFdU Rjo6SW50SGFzaDx1aW50MzJfdD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8 dWludDMyX3Q+PiBSZWNvcmRNYXA7CiAgICAgCiAgICAgUmVjb3JkTWFwIGdldFJlY29yZE1hcCgp IGNvbnN0OworCisgICAgdW5zaWduZWQgZ2V0U3RhY2tTaXplKCkgY29uc3Q7CiB9OwogCiB9IH0g Ly8gbmFtZXNwYWNlIEpTQzo6RlRMCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PcHRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T3B0aW9ucy5oCShyZXZpc2lvbiAxNjM4MDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9PcHRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw2ICsxNTAsNyBAQCB0eXBlZGVm IE9wdGlvblJhbmdlIG9wdGlvblJhbmdlOwogICAgIHYodW5zaWduZWQsIGxsdm1CYWNrZW5kT3B0 aW1pemF0aW9uTGV2ZWwsIDIpIFwKICAgICB2KHVuc2lnbmVkLCBsbHZtT3B0aW1pemF0aW9uTGV2 ZWwsIDIpIFwKICAgICB2KHVuc2lnbmVkLCBsbHZtU2l6ZUxldmVsLCAwKSBcCisgICAgdih1bnNp Z25lZCwgbGx2bU1heFN0YWNrU2l6ZSwgMTI4ICogS0IpIFwKICAgICB2KGJvb2wsIGxsdm1EaXNh bGxvd0FWWCwgdHJ1ZSkgXAogICAgIHYoYm9vbCwgZnRsQ3Jhc2hlcywgZmFsc2UpIC8qIGZvb2wt cHJvb2Ygd2F5IG9mIGNoZWNraW5nIHRoYXQgeW91IGVuZGVkIHVwIGluIHRoZSBGVEwuIDstKSAq L1wKICAgICBcCg==