126334 2013-12-30 23:09:37 -0800 CStack: Introduce tracking of the top VMEntryScope. 2014-01-02 15:19:44 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126320 1 mark.lam mark.lam fpizlo ggaren mhahnenberg msaboff oliver oldest_to_newest 963481 0 mark.lam 2013-12-30 23:09:37 -0800 When we start measuring the stack usage of each VMEntryScope, we'll need to know which VMEntryScope is the top (most recent) one, not just the first one. Also, for correctness, when we set a new jsStackLimit, we should set it on the top VMEntryScope, and not on the first (oldest) one. That is because the 2 scopes may be on 2 different thread stacks, and the most present stack limits only apply to the most recent scope. That said, presently, VMEntryScope::updateStackLimits() does not rely on any scope specific data. So, the old code calling updateStackLimits() on the oldest VMEntryScope hasn't manifested any issues yet. This is a step towards https://bugs.webkit.org/show_bug.cgi?id=126320. 963482 1 220151 mark.lam 2013-12-30 23:16:37 -0800 Created attachment 220151 the patch. 963484 2 mark.lam 2013-12-30 23:19:39 -0800 Landed in r161174 on the jsCStack: <http://trac.webkit.org/r161174>. 963872 3 220151 ggaren 2014-01-02 14:04:27 -0800 Comment on attachment 220151 the patch. r=me on this patch, but I think the overall approach should change, in this way: - VM should store the stack limits, as it does today - VMEntryScope should set/reset the VM's stack limits, based on the current thread's stack limit (and the JSStack size limit if using the CLoop) - ErrorHandlingMode should be renamed to ErrorHandlingScope, and it should set/reset the VM's stack limits just like VMEntryScope does, but with a more lenient limit That means: - Entering an error handling scope shouldn't require a callback to VMEntryScope - Entering an error handling scope shouldn't require a callback to JSStack - JSStack should have an error handling mode - JSStack::enable/disableErrorSTackReserve should not exist - topEntryScope and prevTopEntryScope should not exist 963917 4 mark.lam 2014-01-02 15:19:44 -0800 Thanks for the revieww. Status updated in r161232: <http://trac.webkit.org/r161232>. Will address additional feedback in a separate bug. topEntryScope and prevTopEntryScope are also needed for https://bugs.webkit.org/show_bug.cgi?id=126320 to compute the current JS stack usage. So, I can't remove them. 220151 2013-12-30 23:16:37 -0800 2014-01-02 14:04:27 -0800 the patch. bug-126334.patch text/plain 4979 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMTczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDEzLTEyLTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBD U3RhY2s6IEludHJvZHVjZSB0cmFja2luZyBvZiB0aGUgdG9wIFZNRW50cnlTY29wZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjMzNC4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHdlIHN0YXJ0 IG1lYXN1cmluZyB0aGUgc3RhY2sgdXNhZ2Ugb2YgZWFjaCBWTUVudHJ5U2NvcGUsIHdlJ2xsIG5l ZWQKKyAgICAgICAgdG8ga25vdyB3aGljaCBWTUVudHJ5U2NvcGUgaXMgdGhlIHRvcCAobW9zdCBy ZWNlbnQpIG9uZSwgbm90IGp1c3QgdGhlCisgICAgICAgIGZpcnN0IG9uZS4KKworICAgICAgICBB bHNvLCBmb3IgY29ycmVjdG5lc3MsIGluIEpTU3RhY2s6OnVwZGF0ZVN0YWNrTGltaXQoKSwgd2hl biB3ZSBzZXQgYSBuZXcKKyAgICAgICAganNTdGFja0xpbWl0LCB3ZSBzaG91bGQgc2V0IGl0IG9u IHRoZSB0b3AgVk1FbnRyeVNjb3BlLCBhbmQgbm90IG9uIHRoZQorICAgICAgICBmaXJzdCAob2xk ZXN0KSBvbmUuIFRoaXMgaXMgYmVjYXVzZSB0aGUgMiBzY29wZXMgbWF5IGJlIG9uIDIgZGlmZmVy ZW50CisgICAgICAgIHRocmVhZCBzdGFja3MsIGFuZCB0aGUgbW9zdCBwcmVzZW50IHN0YWNrIGxp bWl0cyBvbmx5IGFwcGx5IHRvIHRoZSBtb3N0CisgICAgICAgIHJlY2VudCBzY29wZS4gVGhhdCBz YWlkLCBwcmVzZW50bHksIFZNRW50cnlTY29wZTo6dXBkYXRlU3RhY2tMaW1pdHMoKQorICAgICAg ICBkb2VzIG5vdCByZWx5IG9uIGFueSBzY29wZSBzcGVjaWZpYyBkYXRhIHlldC4gU28sIGNhbGxp bmcgdXBkYXRlU3RhY2tMaW1pdHMoKQorICAgICAgICBvbiB0aGUgb2xkZXN0IFZNRW50cnlTY29w ZSBoYXNuJ3QgbWFuaWZlc3RlZCBhbnkgaXNzdWVzIHlldC4gUmVnYXJkbGVzcywKKyAgICAgICAg dGhpcyBpcyBub3cgZml4ZWQuCisKKyAgICAgICAgKiBpbnRlcnByZXRlci9KU1N0YWNrLmNwcDoK KyAgICAgICAgKEpTQzo6SlNTdGFjazo6dXBkYXRlU3RhY2tMaW1pdCk6CisgICAgICAgICogcnVu dGltZS9WTS5jcHA6CisgICAgICAgIChKU0M6OlZNOjpWTSk6CisgICAgICAgICogcnVudGltZS9W TS5oOgorICAgICAgICAqIHJ1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcDoKKyAgICAgICAgKEpTQzo6 Vk1FbnRyeVNjb3BlOjpWTUVudHJ5U2NvcGUpOgorICAgICAgICAoSlNDOjpWTUVudHJ5U2NvcGU6 On5WTUVudHJ5U2NvcGUpOgorICAgICAgICAqIHJ1bnRpbWUvVk1FbnRyeVNjb3BlLmg6CisKIDIw MTMtMTItMzAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENTdGFj azogUmVmYWN0b3IgdG8gc3BsaXQgdGhlIHRyYWNraW5nIG9mIHRoZSBqc1N0YWNrTGltaXQgZnJv bSB0aGUgbmF0aXZlIHN0YWNrTGltaXQuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50 ZXJwcmV0ZXIvSlNTdGFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0pTU3RhY2suY3BwCShyZXZpc2lvbiAxNjExNzIpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSlNTdGFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIw NCw4ICsyMDQsOCBAQCB2b2lkIEpTU3RhY2s6OnVwZGF0ZVN0YWNrTGltaXQoKQogICAgIGVsc2UK ICAgICAgICAgZGlzYWJsZUVycm9yU3RhY2tSZXNlcnZlKCk7CiAjZW5kaWYKLSAgICBpZiAobV92 bS5maXJzdEVudHJ5U2NvcGUpCi0gICAgICAgIG1fdm0uZmlyc3RFbnRyeVNjb3BlLT51cGRhdGVT dGFja0xpbWl0cygpOworICAgIGlmIChtX3ZtLnRvcEVudHJ5U2NvcGUpCisgICAgICAgIG1fdm0u dG9wRW50cnlTY29wZS0+dXBkYXRlU3RhY2tMaW1pdHMoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug SlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCShyZXZpc2lvbiAxNjEx NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE5OSw2ICsxOTksNyBAQCBWTTo6Vk0oVk1UeXBlIHZtVHlwZSwgSGVhcFR5cGUgaGVh cFR5cGUpCiAgICAgLCBqc0ZpbmFsT2JqZWN0Q2xhc3NJbmZvKEpTRmluYWxPYmplY3Q6OmluZm8o KSkKICAgICAsIHNpemVPZkxhc3RTY3JhdGNoQnVmZmVyKDApCiAgICAgLCBmaXJzdEVudHJ5U2Nv cGUoMCkKKyAgICAsIHRvcEVudHJ5U2NvcGUoMCkKICAgICAsIG1fZW5hYmxlZFByb2ZpbGVyKDAp CiAgICAgLCBtX3JlZ0V4cENhY2hlKG5ldyBSZWdFeHBDYWNoZSh0aGlzKSkKICNpZiBFTkFCTEUo UkVHRVhQX1RSQUNJTkcpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHJldmlz aW9uIDE2MTE3MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHdvcmtp bmcgY29weSkKQEAgLTQyNyw2ICs0MjcsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9p ZCBnYXRoZXJDb25zZXJ2YXRpdmVSb290cyhDb25zZXJ2YXRpdmVSb290cyYpOwogCiAgICAgICAg IFZNRW50cnlTY29wZSogZmlyc3RFbnRyeVNjb3BlOworICAgICAgICBWTUVudHJ5U2NvcGUqIHRv cEVudHJ5U2NvcGU7CiAKICAgICAgICAgSGFzaFNldDxKU09iamVjdCo+IHN0cmluZ1JlY3Vyc2lv bkNoZWNrVmlzaXRlZE9iamVjdHM7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1ZNRW50cnlTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcAkocmV2aXNpb24gMTYxMTcyKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzYsNiArMzYsNyBAQCBWTUVudHJ5U2NvcGU6OlZNRW50cnlTY29wZShWTSYgdm0sIEpTR2xvCiAg ICAgLCBtX3N0YWNrKHd0ZlRocmVhZERhdGEoKS5zdGFjaygpKQogICAgICwgbV9nbG9iYWxPYmpl Y3QoZ2xvYmFsT2JqZWN0KQogICAgICwgbV9wcmV2Rmlyc3RFbnRyeVNjb3BlKHZtLmZpcnN0RW50 cnlTY29wZSkKKyAgICAsIG1fcHJldlRvcEVudHJ5U2NvcGUodm0udG9wRW50cnlTY29wZSkKICAg ICAsIG1fcHJldlN0YWNrTGltaXQodm0uc3RhY2tMaW1pdCgpKQogI2lmICFFTkFCTEUoTExJTlRf Q19MT09QKQogICAgICwgbV9wcmV2SlNTdGFja0xpbWl0KHZtLmpzU3RhY2tMaW1pdCgpKQpAQCAt NTMsNyArNTQsOSBAQCBWTUVudHJ5U2NvcGU6OlZNRW50cnlTY29wZShWTSYgdm0sIEpTR2xvCiAg ICAgICAgIC8vIG9ic2VydmUgdGltZSB4b25lIGNoYW5nZXMuCiAgICAgICAgIHZtLnJlc2V0RGF0 ZUNhY2hlKCk7CiAgICAgfQotICAgIC8vIENsZWFyIHRoZSBleGNlcHRpb24gc3RhY2sgYmV0d2Vl biBlbnRyaWVzCisgICAgdm0udG9wRW50cnlTY29wZSA9IHRoaXM7CisKKyAgICAvLyBDbGVhciB0 aGUgY2FwdHVyZWQgZXhjZXB0aW9uIHN0YWNrIGJldHdlZW4gZW50cmllcwogICAgIHZtLmNsZWFy RXhjZXB0aW9uU3RhY2soKTsKIAogICAgIHVwZGF0ZVN0YWNrTGltaXRzKCk7CkBAIC02Myw2ICs2 Niw3IEBAIFZNRW50cnlTY29wZTo6Vk1FbnRyeVNjb3BlKFZNJiB2bSwgSlNHbG8KIFZNRW50cnlT Y29wZTo6flZNRW50cnlTY29wZSgpCiB7CiAgICAgbV92bS5maXJzdEVudHJ5U2NvcGUgPSBtX3By ZXZGaXJzdEVudHJ5U2NvcGU7CisgICAgbV92bS50b3BFbnRyeVNjb3BlID0gbV9wcmV2VG9wRW50 cnlTY29wZTsKICAgICBtX3ZtLnNldFN0YWNrTGltaXQobV9wcmV2U3RhY2tMaW1pdCk7CiAjaWYg IUVOQUJMRShMTElOVF9DX0xPT1ApCiAgICAgbV92bS5zZXRKU1N0YWNrTGltaXQobV9wcmV2SlNT dGFja0xpbWl0KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNRW50cnlT Y29wZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNRW50 cnlTY29wZS5oCShyZXZpc2lvbiAxNjExNzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9WTUVudHJ5U2NvcGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTcsNiArNTcsNyBAQCBwcml2 YXRlOgogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBwb2ludGVycyBtYXkgcG9pbnQgdG8gYSBkaWZm ZXJlbnQgdGhyZWFkJ3Mgc3RhY2suCiAgICAgVk1FbnRyeVNjb3BlKiBtX3ByZXZGaXJzdEVudHJ5 U2NvcGU7CisgICAgVk1FbnRyeVNjb3BlKiBtX3ByZXZUb3BFbnRyeVNjb3BlOwogICAgIHZvaWQq IG1fcHJldlN0YWNrTGltaXQ7CiAjaWYgIUVOQUJMRShMTElOVF9DX0xPT1ApCiAgICAgdm9pZCog bV9wcmV2SlNTdGFja0xpbWl0Owo=