61567 2011-05-26 14:51:11 -0700 Moved Heap-related functions out of JSCell.h and into respective header files 2011-05-26 15:43:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oliver oldest_to_newest 410864 0 ggaren 2011-05-26 14:51:11 -0700 Moved Heap-related functions out of JSCell.h and into respective header files 410926 1 95059 ggaren 2011-05-26 15:35:14 -0700 Created attachment 95059 Patch 410936 2 ggaren 2011-05-26 15:43:11 -0700 Committed r87441: <http://trac.webkit.org/changeset/87441> 95059 2011-05-26 15:35:14 -0700 2011-05-26 15:36:11 -0700 Patch bug-61567-20110526153513.patch text/plain 6389 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODc0MzUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTEtMDUtMjYgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCBIZWFwLXJlbGF0 ZWQgZnVuY3Rpb25zIG91dCBvZiBKU0NlbGwuaCBhbmQgaW50byByZXNwZWN0aXZlIGhlYWRlciBm aWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE1 NjcKKworICAgICAgICAqIGhlYXAvSGVhcC5oOgorICAgICAgICAoSlNDOjpIZWFwOjphbGxvY2F0 ZSk6CisgICAgICAgIChKU0M6OkhlYXA6OmhlYXApOgorICAgICAgICAqIGhlYXAvTWFya2VkQmxv Y2suaDoKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OmFsbG9jYXRlKToKKyAgICAgICAgKiBo ZWFwL01hcmtlZFNwYWNlLmg6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpzaXplQ2xhc3NG b3IpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6YWxsb2NhdGUpOgorICAgICAgICAqIHJ1 bnRpbWUvSlNDZWxsLmg6CisgICAgICAgIChKU0M6OkpTQ2VsbDo6ZGVzdHJ1Y3Rvcik6CisKIDIw MTEtMDUtMjYgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL0hlYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmgJKHJldmlzaW9uIDg3NDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNiArMTkzLDMxIEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICBtX21hcmtlZFNwYWNlLmZvckVhY2goZnVuY3Rvcik7CiAgICAgfQogCisgICAgaW5saW5l IHZvaWQqIEhlYXA6OmFsbG9jYXRlKHNpemVfdCBieXRlcykKKyAgICB7CisgICAgICAgIEFTU0VS VChpc1ZhbGlkQWxsb2NhdGlvbihieXRlcykpOworCisgICAgICAgIG1fb3BlcmF0aW9uSW5Qcm9n cmVzcyA9IEFsbG9jYXRpb247CisgICAgICAgIHZvaWQqIHJlc3VsdCA9IG1fbWFya2VkU3BhY2Uu YWxsb2NhdGUoYnl0ZXMpOworICAgICAgICBtX29wZXJhdGlvbkluUHJvZ3Jlc3MgPSBOb09wZXJh dGlvbjsKKyAgICAgICAgaWYgKHJlc3VsdCkKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CisK KyAgICAgICAgcmV0dXJuIGFsbG9jYXRlU2xvd0Nhc2UoYnl0ZXMpOworICAgIH0KKworICAgIGlu bGluZSBIZWFwKiBIZWFwOjpoZWFwKEpTVmFsdWUgdikKKyAgICB7CisgICAgICAgIGlmICghdi5p c0NlbGwoKSkKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gaGVhcCh2LmFz Q2VsbCgpKTsKKyAgICB9CisKKyAgICBpbmxpbmUgSGVhcCogSGVhcDo6aGVhcChKU0NlbGwqIGMp CisgICAgeworICAgICAgICByZXR1cm4gTWFya2VkU3BhY2U6OmhlYXAoYyk7CisgICAgfQorCiB9 IC8vIG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEhlYXBfaApJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvTWFya2VkQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9NYXJrZWRCbG9jay5oCShyZXZpc2lvbiA4NzQzMykKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYg KzM2LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgdHlwZWRlZiB1aW50cHRyX3QgQml0czsKIAog ICAgIHN0YXRpYyBjb25zdCBzaXplX3QgS0IgPSAxMDI0OworICAgIAorICAgIHZvaWQgZGVzdHJ1 Y3RvcihKU0NlbGwqKTsgLy8gRGVmaW5lZCBpbiBKU0NlbGwuaC4KIAogICAgIGNsYXNzIE1hcmtl ZEJsb2NrIDogcHVibGljIERvdWJseUxpbmtlZExpc3ROb2RlPE1hcmtlZEJsb2NrPiB7CiAgICAg ICAgIGZyaWVuZCBjbGFzcyBXVEY6OkRvdWJseUxpbmtlZExpc3ROb2RlPE1hcmtlZEJsb2NrPjsK QEAgLTE5Nyw2ICsxOTksMjEgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIH0KICAgICB9CiAK KyAgICBpbmxpbmUgdm9pZCogTWFya2VkQmxvY2s6OmFsbG9jYXRlKCkKKyAgICB7CisgICAgICAg IHdoaWxlIChtX25leHRBdG9tIDwgbV9lbmRBdG9tKSB7CisgICAgICAgICAgICBpZiAoIW1fbWFy a3MudGVzdEFuZFNldChtX25leHRBdG9tKSkgeworICAgICAgICAgICAgICAgIEpTQ2VsbCogY2Vs bCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNDZWxsKj4oJmF0b21zKClbbV9uZXh0QXRvbV0pOworICAg ICAgICAgICAgICAgIG1fbmV4dEF0b20gKz0gbV9hdG9tc1BlckNlbGw7CisgICAgICAgICAgICAg ICAgZGVzdHJ1Y3RvcihjZWxsKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gY2VsbDsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIG1fbmV4dEF0b20gKz0gbV9hdG9tc1BlckNlbGw7CisgICAg ICAgIH0KKworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisgICAgCiB9IC8vIG5hbWVzcGFjZSBK U0MKIAogI2VuZGlmIC8vIE1hcmtlZFNwYWNlX2gKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL01hcmtlZFNwYWNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvTWFya2VkU3BhY2UuaAkocmV2aXNpb24gODc0MzMpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9NYXJrZWRTcGFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzIsNiArMTcyLDIw IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBtX2hpZ2hXYXRlck1hcmsgPSBoaWdoV2F0ZXJN YXJrOwogICAgIH0KIAorICAgIGlubGluZSBNYXJrZWRTcGFjZTo6U2l6ZUNsYXNzJiBNYXJrZWRT cGFjZTo6c2l6ZUNsYXNzRm9yKHNpemVfdCBieXRlcykKKyAgICB7CisgICAgICAgIEFTU0VSVChi eXRlcyAmJiBieXRlcyA8IG1heENlbGxTaXplKTsKKyAgICAgICAgaWYgKGJ5dGVzIDwgcHJlY2lz ZUN1dG9mZikKKyAgICAgICAgICAgIHJldHVybiBtX3ByZWNpc2VTaXplQ2xhc3Nlc1soYnl0ZXMg LSAxKSAvIHByZWNpc2VTdGVwXTsKKyAgICAgICAgcmV0dXJuIG1faW1wcmVjaXNlU2l6ZUNsYXNz ZXNbKGJ5dGVzIC0gMSkgLyBpbXByZWNpc2VTdGVwXTsKKyAgICB9CisKKyAgICBpbmxpbmUgdm9p ZCogTWFya2VkU3BhY2U6OmFsbG9jYXRlKHNpemVfdCBieXRlcykKKyAgICB7CisgICAgICAgIFNp emVDbGFzcyYgc2l6ZUNsYXNzID0gc2l6ZUNsYXNzRm9yKGJ5dGVzKTsKKyAgICAgICAgcmV0dXJu IGFsbG9jYXRlRnJvbVNpemVDbGFzcyhzaXplQ2xhc3MpOworICAgIH0KKyAgICAKICAgICBpbmxp bmUgTWFya2VkU3BhY2U6OlNpemVDbGFzczo6U2l6ZUNsYXNzKCkKICAgICAgICAgOiBuZXh0Qmxv Y2soMCkKICAgICAgICAgLCBjZWxsU2l6ZSgwKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNDZWxsLmgJKHJldmlzaW9uIDg3NDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDggQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgIGZyaWVuZCBjbGFzcyBTdHJ1Y3R1cmU7CiAgICAgICAgIGZyaWVu ZCBjbGFzcyBTdHJ1Y3R1cmVDaGFpbjsKICAgICAgICAgZnJpZW5kIGNsYXNzIFJlZ0V4cDsKKyAg ICAgICAgZnJpZW5kIHZvaWQgZGVzdHJ1Y3RvcihKU0NlbGwqKTsKKwogICAgICAgICBlbnVtIENy ZWF0aW5nRWFybHlDZWxsVGFnIHsgQ3JlYXRpbmdFYXJseUNlbGwgfTsKIAogICAgIHByb3RlY3Rl ZDoKQEAgLTM0NSwxOCArMzQ3LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJldHVybiBp c0NlbGwoKSA/IGFzQ2VsbCgpLT50b1RoaXNPYmplY3QoZXhlYykgOiB0b1RoaXNPYmplY3RTbG93 Q2FzZShleGVjKTsKICAgICB9CiAKLSAgICBpbmxpbmUgSGVhcCogSGVhcDo6aGVhcChKU1ZhbHVl IHYpCi0gICAgewotICAgICAgICBpZiAoIXYuaXNDZWxsKCkpCi0gICAgICAgICAgICByZXR1cm4g MDsKLSAgICAgICAgcmV0dXJuIGhlYXAodi5hc0NlbGwoKSk7Ci0gICAgfQotCi0gICAgaW5saW5l IEhlYXAqIEhlYXA6OmhlYXAoSlNDZWxsKiBjKQotICAgIHsKLSAgICAgICAgcmV0dXJuIE1hcmtl ZFNwYWNlOjpoZWFwKGMpOwotICAgIH0KLQogI2lmIEVOQUJMRShKU0NfWk9NQklFUykKICAgICBp bmxpbmUgYm9vbCBKU1ZhbHVlOjppc1pvbWJpZSgpIGNvbnN0CiAgICAgewpAQCAtMzY0LDQ4ICsz NTQsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICB9CiAjZW5kaWYKIAotICAgIGlubGluZSB2b2lk KiBNYXJrZWRCbG9jazo6YWxsb2NhdGUoKQotICAgIHsKLSAgICAgICAgd2hpbGUgKG1fbmV4dEF0 b20gPCBtX2VuZEF0b20pIHsKLSAgICAgICAgICAgIGlmICghbV9tYXJrcy50ZXN0QW5kU2V0KG1f bmV4dEF0b20pKSB7Ci0gICAgICAgICAgICAgICAgSlNDZWxsKiBjZWxsID0gcmVpbnRlcnByZXRf Y2FzdDxKU0NlbGwqPigmYXRvbXMoKVttX25leHRBdG9tXSk7Ci0gICAgICAgICAgICAgICAgbV9u ZXh0QXRvbSArPSBtX2F0b21zUGVyQ2VsbDsKLSAgICAgICAgICAgICAgICBjZWxsLT5+SlNDZWxs KCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGNlbGw7Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICBtX25leHRBdG9tICs9IG1fYXRvbXNQZXJDZWxsOwotICAgICAgICB9Ci0KLSAgICAgICAg cmV0dXJuIDA7Ci0gICAgfQotICAgIAotICAgIGlubGluZSBNYXJrZWRTcGFjZTo6U2l6ZUNsYXNz JiBNYXJrZWRTcGFjZTo6c2l6ZUNsYXNzRm9yKHNpemVfdCBieXRlcykKLSAgICB7Ci0gICAgICAg IEFTU0VSVChieXRlcyAmJiBieXRlcyA8IG1heENlbGxTaXplKTsKLSAgICAgICAgaWYgKGJ5dGVz IDwgcHJlY2lzZUN1dG9mZikKLSAgICAgICAgICAgIHJldHVybiBtX3ByZWNpc2VTaXplQ2xhc3Nl c1soYnl0ZXMgLSAxKSAvIHByZWNpc2VTdGVwXTsKLSAgICAgICAgcmV0dXJuIG1faW1wcmVjaXNl U2l6ZUNsYXNzZXNbKGJ5dGVzIC0gMSkgLyBpbXByZWNpc2VTdGVwXTsKLSAgICB9Ci0KLSAgICBp bmxpbmUgdm9pZCogTWFya2VkU3BhY2U6OmFsbG9jYXRlKHNpemVfdCBieXRlcykKLSAgICB7Ci0g ICAgICAgIFNpemVDbGFzcyYgc2l6ZUNsYXNzID0gc2l6ZUNsYXNzRm9yKGJ5dGVzKTsKLSAgICAg ICAgcmV0dXJuIGFsbG9jYXRlRnJvbVNpemVDbGFzcyhzaXplQ2xhc3MpOwotICAgIH0KLSAgICAK LSAgICBpbmxpbmUgdm9pZCogSGVhcDo6YWxsb2NhdGUoc2l6ZV90IGJ5dGVzKQotICAgIHsKLSAg ICAgICAgQVNTRVJUKGlzVmFsaWRBbGxvY2F0aW9uKGJ5dGVzKSk7Ci0KLSAgICAgICAgbV9vcGVy YXRpb25JblByb2dyZXNzID0gQWxsb2NhdGlvbjsKLSAgICAgICAgdm9pZCogcmVzdWx0ID0gbV9t YXJrZWRTcGFjZS5hbGxvY2F0ZShieXRlcyk7Ci0gICAgICAgIG1fb3BlcmF0aW9uSW5Qcm9ncmVz cyA9IE5vT3BlcmF0aW9uOwotICAgICAgICBpZiAocmVzdWx0KQotICAgICAgICAgICAgcmV0dXJu IHJlc3VsdDsKLQotICAgICAgICByZXR1cm4gYWxsb2NhdGVTbG93Q2FzZShieXRlcyk7Ci0gICAg fQotCiAgICAgaW5saW5lIHZvaWQqIEpTQ2VsbDo6b3BlcmF0b3IgbmV3KHNpemVfdCBzaXplLCBK U0dsb2JhbERhdGEqIGdsb2JhbERhdGEpCiAgICAgewogICAgICAgICByZXR1cm4gZ2xvYmFsRGF0 YS0+aGVhcC5hbGxvY2F0ZShzaXplKTsKQEAgLTQxNSw2ICszNjMsMTEgQEAgbmFtZXNwYWNlIEpT QyB7CiAgICAgewogICAgICAgICByZXR1cm4gZXhlYy0+aGVhcCgpLT5hbGxvY2F0ZShzaXplKTsK ICAgICB9CisgICAgCisgICAgaW5saW5lIHZvaWQgZGVzdHJ1Y3RvcihKU0NlbGwqIGNlbGwpCisg ICAgeworICAgICAgICBjZWxsLT5+SlNDZWxsKCk7CisgICAgfQogCiB9IC8vIG5hbWVzcGFjZSBK U0MKIAo=