126188 2013-12-23 16:15:07 -0800 CStack: Fix JSStack::grow(), shrink(), growSlowCase(), and setStackLimit(). 2014-01-13 17:58:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125849 1 mark.lam mark.lam fpizlo ggaren mhahnenberg msaboff oliver oldest_to_newest 962630 0 mark.lam 2013-12-23 16:15:07 -0800 These functions were inappropriately mixing "end" and "top" pointer idioms. Specifically: 1. growSlowCase() was comparing a newEnd pointer against m_commitTop, and using this to compute the size that the stack needs to grow. 2. shrink() was wrongly computing excess capacity by subtracting baseOfStack() (which is at high memory) from m_commitTop (which points to lower memory). Also, baseOfStack() is an "end" pointer while m_commitTop is a "top" pointer. This is a mismatch. To fix this and simplify the code a bit, I changed all of these functions to take a newTopOfStack pointer instead of a newEnd pointer, and adjusted their callers where needed to pass the appropropriate pointer values. 962631 1 219939 mark.lam 2013-12-23 16:17:48 -0800 Created attachment 219939 the patch. 962634 2 mark.lam 2013-12-23 16:22:21 -0800 Landed in r161036 on the jsCStack branch: <http://trac.webkit.org/r161036>. 967582 3 219939 ggaren 2014-01-13 17:43:20 -0800 Comment on attachment 219939 the patch. r=me 967590 4 mark.lam 2014-01-13 17:58:32 -0800 Thanks. Review status updated in r161934 on the jsCStack branch: <http://trac.webkit.org/r161934>. 219939 2013-12-23 16:17:48 -0800 2014-01-13 17:43:20 -0800 the patch. bug-126188.patch text/plain 5861 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMDMxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDEzLTEyLTIzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBD U3RhY2s6IEZpeCBKU1N0YWNrOjpncm93KCksIHNocmluaygpLCBncm93U2xvd0Nhc2UoKSwgYW5k IHNldFN0YWNrTGltaXQoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNjE4OC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGVzZSBmdW5jdGlvbnMgd2VyZSBpbmFwcHJvcHJpYXRlbHkgbWl4aW5nICJl bmQiIGFuZCAidG9wIiBwb2ludGVyIGlkaW9tcy4KKyAgICAgICAgU3BlY2lmaWNhbGx5OgorICAg ICAgICAxLiBncm93U2xvd0Nhc2UoKSB3YXMgY29tcGFyaW5nIGEgbmV3RW5kIHBvaW50ZXIgYWdh aW5zdCBtX2NvbW1pdFRvcCwgYW5kCisgICAgICAgICAgIHVzaW5nIHRoaXMgdG8gY29tcHV0ZSB0 aGUgc2l6ZSB0aGF0IHRoZSBzdGFjayBuZWVkcyB0byBncm93LgorICAgICAgICAyLiBzaHJpbmso KSB3YXMgd3JvbmdseSBjb21wdXRpbmcgZXhjZXNzIGNhcGFjaXR5IGJ5IHN1YnRyYWN0aW5nCisg ICAgICAgICAgIGJhc2VPZlN0YWNrKCkgKHdoaWNoIGlzIGF0IGhpZ2ggbWVtb3J5KSBmcm9tIG1f Y29tbWl0VG9wICh3aGljaCBwb2ludHMKKyAgICAgICAgICAgdG8gbG93ZXIgbWVtb3J5KS4gQWxz bywgYmFzZU9mU3RhY2soKSBpcyBhbiAiZW5kIiBwb2ludGVyIHdoaWxlCisgICAgICAgICAgIG1f Y29tbWl0VG9wIGlzIGEgInRvcCIgcG9pbnRlci4gVGhpcyBpcyBhIG1pc21hdGNoLgorCisgICAg ICAgIFRvIGZpeCB0aGlzIGFuZCBzaW1wbGlmeSB0aGUgY29kZSBhIGJpdCwgSSBjaGFuZ2VkIGFs bCBvZiB0aGVzZSBmdW5jdGlvbnMKKyAgICAgICAgdG8gdGFrZSBhIG5ld1RvcE9mU3RhY2sgcG9p bnRlciBpbnN0ZWFkIG9mIGEgbmV3RW5kIHBvaW50ZXIsIGFuZCBhZGp1c3RlZAorICAgICAgICB0 aGVpciBjYWxsZXJzIHdoZXJlIG5lZWRlZCB0byBwYXNzIHRoZSBhcHByb3Byb3ByaWF0ZSBwb2lu dGVyIHZhbHVlcy4KKworICAgICAgICAqIGludGVycHJldGVyL0pTU3RhY2suY3BwOgorICAgICAg ICAoSlNDOjpKU1N0YWNrOjpncm93U2xvd0Nhc2UpOgorICAgICAgICAqIGludGVycHJldGVyL0pT U3RhY2suaDoKKyAgICAgICAgKiBpbnRlcnByZXRlci9KU1N0YWNrSW5saW5lcy5oOgorICAgICAg ICAoSlNDOjpKU1N0YWNrOjpwb3BGcmFtZSk6CisgICAgICAgIChKU0M6OkpTU3RhY2s6OnNocmlu ayk6CisgICAgICAgIChKU0M6OkpTU3RhY2s6Omdyb3cpOgorICAgICAgICAoSlNDOjpKU1N0YWNr OjpzZXRTdGFja0xpbWl0KToKKwogMjAxMy0xMi0yMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgQ1N0YWNrOiBDb3NtZXRpYzogcmVuYW1lIEpTU3RhY2s6Om1fY29t bWl0RW5kIHRvIG1fY29tbWl0VG9wLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVy cHJldGVyL0pTU3RhY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnRlcnByZXRlci9KU1N0YWNrLmNwcAkocmV2aXNpb24gMTYxMDMwKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2ludGVycHJldGVyL0pTU3RhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Nywx OSArNzcsMTkgQEAgSlNTdGFjazo6fkpTU3RhY2soKQogICAgIG1fcmVzZXJ2YXRpb24uZGVhbGxv Y2F0ZSgpOwogfQogCi1ib29sIEpTU3RhY2s6Omdyb3dTbG93Q2FzZShSZWdpc3RlciogbmV3RW5k KQorYm9vbCBKU1N0YWNrOjpncm93U2xvd0Nhc2UoUmVnaXN0ZXIqIG5ld1RvcE9mU3RhY2spCiB7 CiAgICAgLy8gSWYgd2UgaGF2ZSBhbHJlYWR5IGNvbW1pdHRlZCBlbm91Z2ggbWVtb3J5IHRvIHNh dGlzZnkgdGhpcyByZXF1ZXN0LAogICAgIC8vIGp1c3QgdXBkYXRlIHRoZSBlbmQgcG9pbnRlciBh bmQgcmV0dXJuLgotICAgIGlmIChuZXdFbmQgPj0gbV9jb21taXRUb3ApIHsKLSAgICAgICAgc2V0 U3RhY2tMaW1pdChuZXdFbmQpOworICAgIGlmIChuZXdUb3BPZlN0YWNrID49IG1fY29tbWl0VG9w KSB7CisgICAgICAgIHNldFN0YWNrTGltaXQobmV3VG9wT2ZTdGFjayk7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIAogICAgIC8vIENvbXB1dGUgdGhlIGNodW5rIHNpemUgb2YgYWRkaXRp b25hbCBtZW1vcnkgdG8gY29tbWl0LCBhbmQgc2VlIGlmIHdlCiAgICAgLy8gaGF2ZSBpdCBpcyBz dGlsbCB3aXRoaW4gb3VyIGJ1ZGdldC4gSWYgbm90LCB3ZSdsbCBmYWlsIHRvIGdyb3cgYW5kCiAg ICAgLy8gcmV0dXJuIGZhbHNlLgotICAgIGxvbmcgZGVsdGEgPSByb3VuZFVwQWxsb2NhdGlvblNp emUocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4obV9jb21taXRUb3ApIC0gcmVpbnRlcnByZXRfY2Fz dDxjaGFyKj4obmV3RW5kKSwgY29tbWl0U2l6ZSk7CisgICAgbG9uZyBkZWx0YSA9IHJvdW5kVXBB bGxvY2F0aW9uU2l6ZShyZWludGVycHJldF9jYXN0PGNoYXIqPihtX2NvbW1pdFRvcCkgLSByZWlu dGVycHJldF9jYXN0PGNoYXIqPihuZXdUb3BPZlN0YWNrKSwgY29tbWl0U2l6ZSk7CiAgICAgaWYg KHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fY29tbWl0VG9wKSAtIGRlbHRhIDw9IHJlaW50ZXJw cmV0X2Nhc3Q8Y2hhcio+KG1fdXNlYWJsZVRvcCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApA QCAtOTgsNyArOTgsNyBAQCBib29sIEpTU3RhY2s6Omdyb3dTbG93Q2FzZShSZWdpc3RlciogbmV3 CiAgICAgbV9yZXNlcnZhdGlvbi5jb21taXQocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4obV9jb21t aXRUb3ApIC0gZGVsdGEsIGRlbHRhKTsKICAgICBhZGRUb0NvbW1pdHRlZEJ5dGVDb3VudChkZWx0 YSk7CiAgICAgbV9jb21taXRUb3AgPSByZWludGVycHJldF9jYXN0X3B0cjxSZWdpc3Rlcio+KHJl aW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fY29tbWl0VG9wKSAtIGRlbHRhKTsKLSAgICBzZXRTdGFj a0xpbWl0KG5ld0VuZCk7CisgICAgc2V0U3RhY2tMaW1pdChuZXdUb3BPZlN0YWNrKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVy L0pTU3RhY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvSlNTdGFjay5oCShyZXZpc2lvbiAxNjEwMzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aW50ZXJwcmV0ZXIvSlNTdGFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjAsMTMgKzE2MCwxMyBA QCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9pZCBpbnN0YWxsVHJhcHNBZnRlckZyYW1lKENh bGxGcmFtZSopIHsgfQogI2VuZGlmCiAKLSAgICAgICAgYm9vbCBncm93KFJlZ2lzdGVyKiB0b3BP ZlN0YWNrKTsKLSAgICAgICAgYm9vbCBncm93U2xvd0Nhc2UoUmVnaXN0ZXIqKTsKLSAgICAgICAg dm9pZCBzaHJpbmsoUmVnaXN0ZXIqKTsKKyAgICAgICAgYm9vbCBncm93KFJlZ2lzdGVyKiBuZXdU b3BPZlN0YWNrKTsKKyAgICAgICAgYm9vbCBncm93U2xvd0Nhc2UoUmVnaXN0ZXIqIG5ld1RvcE9m U3RhY2spOworICAgICAgICB2b2lkIHNocmluayhSZWdpc3RlciogbmV3VG9wT2ZTdGFjayk7CiAg ICAgICAgIHZvaWQgcmVsZWFzZUV4Y2Vzc0NhcGFjaXR5KCk7CiAgICAgICAgIHZvaWQgYWRkVG9D b21taXR0ZWRCeXRlQ291bnQobG9uZyk7CiAKLSAgICAgICAgdm9pZCBzZXRTdGFja0xpbWl0KFJl Z2lzdGVyKiBuZXdFbmQpOworICAgICAgICB2b2lkIHNldFN0YWNrTGltaXQoUmVnaXN0ZXIqIG5l d1RvcE9mU3RhY2spOwogI2VuZGlmIC8vIEVOQUJMRShMTElOVF9DX0xPT1ApCiAKICAgICAgICAg dm9pZCBlbmFibGVFcnJvclN0YWNrUmVzZXJ2ZSgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2ludGVycHJldGVyL0pTU3RhY2tJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0pTU3RhY2tJbmxpbmVzLmgJKHJldmlzaW9uIDE2MTAz MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9KU1N0YWNrSW5saW5lcy5o CSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsMzMgKzE2NiwzNSBAQCBpbmxpbmUgdm9pZCBKU1N0YWNr Ojpwb3BGcmFtZShDYWxsRnJhbWUqCiAgICAgLy8gdGhpcyBjYXNlLCB3ZSdyZSBzaHJpbmtpbmcg YWxsIHRoZSB3YXkgdG8gdGhlIGJlZ2lubmluZyBzaW5jZSB0aGVyZQogICAgIC8vIGFyZSBubyBt b3JlIGZyYW1lcyBvbiB0aGUgc3RhY2suCiAgICAgaWYgKCFjYWxsZXJGcmFtZSkKLSAgICAgICAg c2hyaW5rKGJhc2VPZlN0YWNrKCkpOworICAgICAgICBzaHJpbmsoaGlnaEFkZHJlc3MoKSk7CiAK ICAgICBpbnN0YWxsVHJhcHNBZnRlckZyYW1lKGNhbGxlckZyYW1lKTsKIH0KIAotaW5saW5lIHZv aWQgSlNTdGFjazo6c2hyaW5rKFJlZ2lzdGVyKiBuZXdFbmQpCitpbmxpbmUgdm9pZCBKU1N0YWNr OjpzaHJpbmsoUmVnaXN0ZXIqIG5ld1RvcE9mU3RhY2spCiB7CisgICAgUmVnaXN0ZXIqIG5ld0Vu ZCA9IG5ld1RvcE9mU3RhY2sgLSAxOwogICAgIGlmIChuZXdFbmQgPj0gbV9lbmQpCiAgICAgICAg IHJldHVybjsKLSAgICBzZXRTdGFja0xpbWl0KG5ld0VuZCk7Ci0gICAgaWYgKG1fZW5kID09IGJh c2VPZlN0YWNrKCkgJiYgKG1fY29tbWl0VG9wIC0gYmFzZU9mU3RhY2soKSkgPj0gbWF4RXhjZXNz Q2FwYWNpdHkpCisgICAgc2V0U3RhY2tMaW1pdChuZXdUb3BPZlN0YWNrKTsKKyAgICBpZiAobV9l bmQgPT0gYmFzZU9mU3RhY2soKSAmJiAoaGlnaEFkZHJlc3MoKSAtIG1fY29tbWl0VG9wKSA+PSBt YXhFeGNlc3NDYXBhY2l0eSkKICAgICAgICAgcmVsZWFzZUV4Y2Vzc0NhcGFjaXR5KCk7CiB9CiAK LWlubGluZSBib29sIEpTU3RhY2s6Omdyb3coUmVnaXN0ZXIqIHRvcE9mU3RhY2spCitpbmxpbmUg Ym9vbCBKU1N0YWNrOjpncm93KFJlZ2lzdGVyKiBuZXdUb3BPZlN0YWNrKQogewotICAgIFJlZ2lz dGVyKiBuZXdFbmQgPSB0b3BPZlN0YWNrIC0gMTsKKyAgICBSZWdpc3RlciogbmV3RW5kID0gbmV3 VG9wT2ZTdGFjayAtIDE7CiAgICAgaWYgKG5ld0VuZCA+PSBtX2VuZCkKICAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgcmV0dXJuIGdyb3dTbG93Q2FzZShuZXdFbmQpOworICAgIHJldHVybiBncm93 U2xvd0Nhc2UobmV3VG9wT2ZTdGFjayk7CiB9CiAKLWlubGluZSB2b2lkIEpTU3RhY2s6OnNldFN0 YWNrTGltaXQoUmVnaXN0ZXIqIG5ld0VuZCkKK2lubGluZSB2b2lkIEpTU3RhY2s6OnNldFN0YWNr TGltaXQoUmVnaXN0ZXIqIG5ld1RvcE9mU3RhY2spCiB7CisgICAgUmVnaXN0ZXIqIG5ld0VuZCA9 IG5ld1RvcE9mU3RhY2sgLSAxOwogICAgIG1fZW5kID0gbmV3RW5kOwogI2lmIEVOQUJMRShMTElO VF9DX0xPT1ApCi0gICAgbV92bS5zZXRKU1N0YWNrTGltaXQobmV3RW5kICsgMSk7CisgICAgbV92 bS5zZXRKU1N0YWNrTGltaXQobmV3VG9wT2ZTdGFjayk7CiAjZW5kaWYKIH0KIAo=