151972 2015-12-07 16:28:54 -0800 we should emit op_watchdog after op_enter 2015-12-18 15:44:35 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1147101 0 saam 2015-12-07 16:28:54 -0800 This will take care of loops that implemented using tail calls. 1147420 1 266926 saam 2015-12-08 12:22:25 -0800 Created attachment 266926 patch 1147421 2 commit-queue 2015-12-08 12:23:37 -0800 Attachment 266926 did not pass style-queue: ERROR: Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:182: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:183: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:184: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1147430 3 266926 mark.lam 2015-12-08 12:36:25 -0800 Comment on attachment 266926 patch View in context: https://bugs.webkit.org/attachment.cgi?id=266926&action=review r=me > Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:200 > + printf("PASS: %s script timed out as expected saamy.\n", tierOptions.tier); typo: I think you didn't mean to have " saamy" in this line. I also suggest adding a bit more details to this line to distinguish test from the one before e.g. "PASS: %s script with infinite tail calls timed out as expected.\n" > Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:203 > + printf("FAIL: %s script did not time out as expected.\n", tierOptions.tier); I suggest "FAIL: %s script with infinite tail calls did not time out as expected.\n". > Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp:205 > + printf("FAIL: %s script timeout callback was not called.\n", tierOptions.tier); I suggest "FAIL: %s script with infinite tail calls' timeout callback was not called.\n". 1147434 4 mark.lam 2015-12-08 12:37:55 -0800 *** Bug 147998 has been marked as a duplicate of this bug. *** 1147447 5 ggaren 2015-12-08 13:20:59 -0800 Maybe it would be better to emit at op_tail_call instead. That way you don’t pay the cost for simple function calls. 1147832 6 saam 2015-12-09 10:23:20 -0800 We've decided to do it at op_enter just to make life easier for the sampling profiler. 1147842 7 saam 2015-12-09 10:36:05 -0800 landed in: http://trac.webkit.org/changeset/193842 1150412 8 saam 2015-12-18 15:44:35 -0800 forgot to mark this as fixed. 266926 2015-12-08 12:22:25 -0800 2015-12-08 12:36:25 -0800 patch b-backup.diff text/plain 5938 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNzY1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTEyLTA4ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IHdlIHNob3VsZCBlbWl0IG9wX3dhdGNoZG9nIGFmdGVyIG9wX2VudGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE5NzIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFsc28gc29sdmVzIHRoZSBp c3N1ZSBvZiB3YXRjaGRvZyBub3QgYmVpbmcKKyAgICAgICAgb2JzZXJ2ZWQgd2hlbiB3ZSBsb29w IHB1cmVseSB0aHJvdWdoIHRhaWwgY2FsbHMuCisKKyAgICAgICAgKiBBUEkvdGVzdHMvRXhlY3V0 aW9uVGltZUxpbWl0VGVzdC5jcHA6CisgICAgICAgICh0ZXN0RXhlY3V0aW9uVGltZUxpbWl0KToK KyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAo SlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IpOgorICAgICAgICAoSlND OjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdFByb2ZpbGVkT3Bjb2RlKToKKyAgICAgICAgKEpTQzo6 Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRFbnRlcik6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2Vu ZXJhdG9yOjplbWl0TG9vcEhpbnQpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5oOgorCiAyMDE1LTEyLTA4ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtp dC5vcmc+CiAKICAgICAgICAgRml4IHRoZSAhRU5BQkxFKERGR19KSVQpIGJ1aWxkIGFmdGVyIHIx OTM2NDkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvdGVzdHMvRXhlY3V0aW9uVGlt ZUxpbWl0VGVzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90 ZXN0cy9FeGVjdXRpb25UaW1lTGltaXRUZXN0LmNwcAkocmV2aXNpb24gMTkzNzU4KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy9FeGVjdXRpb25UaW1lTGltaXRUZXN0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTcxLDYgKzE3MSw0OSBAQCBpbnQgdGVzdEV4ZWN1dGlvblRpbWVM aW1pdCgpCiAgICAgICAgICAgICB0ZXN0UmVzZXRBZnRlclRpbWVvdXQoZmFpbGVkKTsKICAgICAg ICAgfQogCisgICAgICAgIC8qIFRlc3Qgc2NyaXB0IHRpbWVvdXQgd2l0aCB0YWlsIGNhbGxzOiAq LworICAgICAgICB0aW1lTGltaXQgPSAoMTAwICsgdGllckFkanVzdG1lbnRNaWxsaXMpIC8gMTAw MC4wOworICAgICAgICBKU0NvbnRleHRHcm91cFNldEV4ZWN1dGlvblRpbWVMaW1pdChjb250ZXh0 R3JvdXAsIHRpbWVMaW1pdCwgc2hvdWxkVGVybWluYXRlQ2FsbGJhY2ssIDApOworICAgICAgICB7 CisgICAgICAgICAgICB1bnNpZ25lZCB0aW1lQWZ0ZXJXYXRjaGRvZ1Nob3VsZEhhdmVGaXJlZCA9 IDMwMCArIHRpZXJBZGp1c3RtZW50TWlsbGlzOworCisgICAgICAgICAgICBTdHJpbmdCdWlsZGVy IHNjcmlwdEJ1aWxkZXI7CisgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZCgidmFyIHN0 YXJ0VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7IgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgImZ1bmN0aW9uIHJlY3Vyc2UoaSkgeyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiJ3VzZSBzdHJpY3QnOyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiaWYgKGkgJSAxMDAwID09PSAwKSB7IgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJpZiAoY3VycmVudENQVVRpbWUoKSAtIHN0YXJ0VGltZSA+Iik7Cisg ICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZE51bWJlcih0aW1lQWZ0ZXJXYXRjaGRvZ1No b3VsZEhhdmVGaXJlZCAvIDEwMDAuMCk7CisgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVu ZCgiICAgICAgICkgeyByZXR1cm47IH0iKTsKKyAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBw ZW5kKCIgICAgfSIpOworICAgICAgICAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoIiAgICByZXR1 cm4gcmVjdXJzZShpICsgMSk7IH0iKTsKKyAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5k KCJyZWN1cnNlKDApOyIpOworCisgICAgICAgICAgICBKU1N0cmluZ1JlZiBzY3JpcHQgPSBKU1N0 cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhzY3JpcHRCdWlsZGVyLnRvU3RyaW5nKCkudXRmOCgp LmRhdGEoKSk7CisgICAgICAgICAgICBleGNlcHRpb24gPSBudWxscHRyOworICAgICAgICAgICAg c2hvdWxkVGVybWluYXRlQ2FsbGJhY2tXYXNDYWxsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGF1 dG8gc3RhcnRUaW1lID0gY3VycmVudENQVVRpbWUoKTsKKyAgICAgICAgICAgIEpTRXZhbHVhdGVT Y3JpcHQoY29udGV4dCwgc2NyaXB0LCBudWxscHRyLCBudWxscHRyLCAxLCAmZXhjZXB0aW9uKTsK KyAgICAgICAgICAgIGF1dG8gZW5kVGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CisKKyAgICAgICAg ICAgIGlmICgoKGVuZFRpbWUgLSBzdGFydFRpbWUpIDwgbWlsbGlzZWNvbmRzKHRpbWVBZnRlcldh dGNoZG9nU2hvdWxkSGF2ZUZpcmVkKSkgJiYgc2hvdWxkVGVybWluYXRlQ2FsbGJhY2tXYXNDYWxs ZWQpCisgICAgICAgICAgICAgICAgcHJpbnRmKCJQQVNTOiAlcyBzY3JpcHQgdGltZWQgb3V0IGFz IGV4cGVjdGVkIHNhYW15LlxuIiwgdGllck9wdGlvbnMudGllcik7CisgICAgICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgICAgICBpZiAoKGVuZFRpbWUgLSBzdGFydFRpbWUpID49IG1pbGxpc2Vj b25kcyh0aW1lQWZ0ZXJXYXRjaGRvZ1Nob3VsZEhhdmVGaXJlZCkpCisgICAgICAgICAgICAgICAg ICAgIHByaW50ZigiRkFJTDogJXMgc2NyaXB0IGRpZCBub3QgdGltZSBvdXQgYXMgZXhwZWN0ZWQu XG4iLCB0aWVyT3B0aW9ucy50aWVyKTsKKyAgICAgICAgICAgICAgICBpZiAoIXNob3VsZFRlcm1p bmF0ZUNhbGxiYWNrV2FzQ2FsbGVkKQorICAgICAgICAgICAgICAgICAgICBwcmludGYoIkZBSUw6 ICVzIHNjcmlwdCB0aW1lb3V0IGNhbGxiYWNrIHdhcyBub3QgY2FsbGVkLlxuIiwgdGllck9wdGlv bnMudGllcik7CisgICAgICAgICAgICAgICAgZmFpbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKCFleGNlcHRpb24pIHsKKyAgICAgICAgICAg ICAgICBwcmludGYoIkZBSUw6ICVzIFRlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24gd2FzIG5v dCB0aHJvd24uXG4iLCB0aWVyT3B0aW9ucy50aWVyKTsKKyAgICAgICAgICAgICAgICBmYWlsZWQg PSB0cnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB0ZXN0UmVzZXRBZnRlclRpbWVv dXQoZmFpbGVkKTsKKyAgICAgICAgfQorCiAgICAgICAgIC8qIFRlc3QgdGhlIHNjcmlwdCB0aW1l b3V0J3MgVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbiBzaG91bGQgTk9UIGJlIGNhdGNoYWJs ZTogKi8KICAgICAgICAgdGltZUxpbWl0ID0gKDEwMCArIHRpZXJBZGp1c3RtZW50TWlsbGlzKSAv IDEwMDAuMDsKICAgICAgICAgSlNDb250ZXh0R3JvdXBTZXRFeGVjdXRpb25UaW1lTGltaXQoY29u dGV4dEdyb3VwLCB0aW1lTGltaXQsIHNob3VsZFRlcm1pbmF0ZUNhbGxiYWNrLCAwKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNv ZGVHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAxOTM3NTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTY3LDcgKzE2Nyw3IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYK IAogICAgIG1fY29kZUJsb2NrLT5zZXROdW1QYXJhbWV0ZXJzKDEpOyAvLyBBbGxvY2F0ZSBzcGFj ZSBmb3IgInRoaXMiCiAKLSAgICBlbWl0T3Bjb2RlKG9wX2VudGVyKTsKKyAgICBlbWl0RW50ZXIo KTsKIAogICAgIGFsbG9jYXRlQW5kRW1pdFNjb3BlKCk7CiAKQEAgLTI3NSw3ICsyNzUsNyBAQCBC eXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IoVk0mCiAgICAgICAgIHJldHVybiBj YXB0dXJlcyh1aWQpID8gVmFyS2luZDo6U2NvcGUgOiBWYXJLaW5kOjpTdGFjazsKICAgICB9Owog Ci0gICAgZW1pdE9wY29kZShvcF9lbnRlcik7CisgICAgZW1pdEVudGVyKCk7CiAKICAgICBhbGxv Y2F0ZUFuZEVtaXRTY29wZSgpOwogICAgIApAQCAtNTgyLDcgKzU4Miw3IEBAIEJ5dGVjb2RlR2Vu ZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYKIAogICAgIG1fY29kZUJsb2NrLT5zZXROdW1Q YXJhbWV0ZXJzKDEpOwogCi0gICAgZW1pdE9wY29kZShvcF9lbnRlcik7CisgICAgZW1pdEVudGVy KCk7CiAKICAgICBhbGxvY2F0ZUFuZEVtaXRTY29wZSgpOwogCkBAIC02NTUsNyArNjU1LDcgQEAg Qnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJgogICAgICAgICByZXR1cm4g Y2FwdHVyZXModWlkKSA/IFZhcktpbmQ6OlNjb3BlIDogVmFyS2luZDo6U3RhY2s7CiAgICAgfTsK IAotICAgIGVtaXRPcGNvZGUob3BfZW50ZXIpOworICAgIGVtaXRFbnRlcigpOwogCiAgICAgYWxs b2NhdGVBbmRFbWl0U2NvcGUoKTsKIApAQCAtMTAwOCw2ICsxMDA4LDEyIEBAIFVubGlua2VkVmFs dWVQcm9maWxlIEJ5dGVjb2RlR2VuZXJhdG9yOjoKICAgICByZXR1cm4gcmVzdWx0OwogfQogCit2 b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RW50ZXIoKQoreworICAgIGVtaXRPcGNvZGUob3Bf ZW50ZXIpOworICAgIGVtaXRXYXRjaGRvZygpOworfQorCiB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9y OjplbWl0TG9vcEhpbnQoKQogewogICAgIGVtaXRPcGNvZGUob3BfbG9vcF9oaW50KTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmgJKHJldmlzaW9uIDE5Mzc1OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNTg1LDYg KzU4NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBQYXNzUmVmUHRyPExhYmVsPiBlbWl0 SnVtcElmTm90RnVuY3Rpb25BcHBseShSZWdpc3RlcklEKiBjb25kLCBMYWJlbCogdGFyZ2V0KTsK ICAgICAgICAgdm9pZCBlbWl0UG9wU2NvcGVzKFJlZ2lzdGVySUQqIHNyY0RzdCwgaW50IHRhcmdl dFNjb3BlRGVwdGgpOwogCisgICAgICAgIHZvaWQgZW1pdEVudGVyKCk7CiAgICAgICAgIHZvaWQg ZW1pdFdhdGNoZG9nKCk7CiAKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdEhhc0luZGV4ZWRQcm9w ZXJ0eShSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQqIGJhc2UsIFJlZ2lzdGVySUQqIHByb3Bl cnR5TmFtZSk7Cg==