13382 2007-04-18 00:03:39 -0700 [js-collector-tweaks] Remove JS oversize allocator 2007-04-22 21:02:30 -0700 1 1 1 Unclassified WebKit JavaScriptCore 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 13381 13383 13389 1 mjs mjs oldest_to_newest 14378 0 mjs 2007-04-18 00:03:39 -0700 With the Window object using the oversize allocator, it can be removed entirely. This depends on the patch in 13381 14374 1 14063 mjs 2007-04-18 00:05:38 -0700 Created attachment 14063 02-js-gc-forbid-oversize.patch.txt 14258 2 14063 darin 2007-04-18 11:02:23 -0700 Comment on attachment 14063 02-js-gc-forbid-oversize.patch.txt Looks fine. I would have suggested using a simpler approach for CellSize, using sizeof(void*) as the parmaeter rather than the two booleans, as in the IntTypes template in HashFunctions.h. 14201 3 ggaren 2007-04-18 21:11:19 -0700 Just wondering -- how did you verify that max object size? Can we make that verification happen at compile time? 13232 4 mjs 2007-04-22 21:02:30 -0700 I took Darin's preferred approach to the size selection. Re Geoff's comment, I could not figure out a good way to do the check at compile time. 14063 2007-04-18 00:05:38 -0700 2007-04-18 11:02:23 -0700 02-js-gc-forbid-oversize.patch.txt 02-js-gc-forbid-oversize.patch.txt text/plain 7467 mjs SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTMxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDctMDQtMTcgIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIC0gcmVtb3ZlIHRoZSBjb25jZXB0IG9mIG92ZXJz aXplIG9iamVjdHMsIG5vdyB0aGF0IHRoZXJlIGFyZW4ndCBhbnkgKGZvciBub3cKKyAgICAgICAg b25seSBlbmZvcmNlZCB3aXRoIGFuIGFzc2VydCkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg YSAuNjYlIHNwZWVkdXAgb24gSlMgaUJlbmNoIGZvciAzMi1iaXQgcGxhdGZvcm1zLCBwcm9iYWJs eSBtdWNoIG1vcmUKKyAgICAgICAgZm9yIDY0LWJpdCBzaW5jZSBpdCBmaW5hbGx5IGdpdmVzIGEg cmVhc29uYWJsZSBjZWxsIHNpemUsIGJ1dCBJIGRpZCBub3QgdGVzdCB0aGF0LgorICAgICAgICAK KyAgICAgICAgKiBranMvY29sbGVjdG9yLmNwcDoKKyAgICAgICAgKEtKUzo6KTogVXNlIGRpZmZl cmVudCBjZWxsIHNpemUgZm9yIDMyLWJpdCBhbmQgNjQtYml0LCBub3cgdGhhdCB0aGVyZSBpcyBu bworICAgICAgICBvdmVyc2l6ZSBhbGxvY2F0aW9uLgorICAgICAgICAoS0pTOjpDb2xsZWN0b3I6 OmFsbG9jYXRlKTogUmVtb3ZlIG92ZXJzaXplIGFsbG9jYXRvci4KKyAgICAgICAgKEtKUzo6Q29s bGVjdG9yOjptYXJrU3RhY2tPYmplY3RzQ29uc2VydmF0aXZlbHkpOiBEb24ndCBjaGVjayBvdmVy c2l6ZSBvYmplY3RzLgorICAgICAgICAoS0pTOjpDb2xsZWN0b3I6Om1hcmtNYWluVGhyZWFkT25s eU9iamVjdHMpOiBEaXR0by4KKyAgICAgICAgKEtKUzo6Q29sbGVjdG9yOjpjb2xsZWN0KTogRGl0 dG8uCisKIDIwMDctMDQtMTIgIERlbmViIE1la2V0YSAgPGRtZWtldGFAYWRvYmUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogSmF2YVNjcmlwdENvcmUva2pz L2NvbGxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUva2pzL2NvbGxlY3Rv ci5jcHAJKHJldmlzaW9uIDIwOTMxKQorKysgSmF2YVNjcmlwdENvcmUva2pzL2NvbGxlY3Rvci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDggKzU4LDE0IEBAIHVzaW5nIHN0ZDo6bWF4OwogCiBu YW1lc3BhY2UgS0pTIHsKIAorCisKIC8vIHR1bmFibGUgcGFyYW1ldGVycwotY29uc3Qgc2l6ZV90 IE1JTklNVU1fQ0VMTF9TSVpFID0gNDg7CisKK3RlbXBsYXRlPGJvb2wgaXMzMkJpdCwgYm9vbCBp czY0Qml0PiBzdHJ1Y3QgQ2VsbFNpemU7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBDZWxsU2l6ZTx0cnVl LCBmYWxzZT4geyBzdGF0aWMgY29uc3Qgc2l6ZV90IG1fdmFsdWUgPSA0ODsgfTsgLy8gMzItYml0 Cit0ZW1wbGF0ZTw+IHN0cnVjdCBDZWxsU2l6ZTxmYWxzZSwgdHJ1ZT4geyBzdGF0aWMgY29uc3Qg c2l6ZV90IG1fdmFsdWUgPSA4MDsgfTsgLy8gNjQtYml0CisKIGNvbnN0IHNpemVfdCBCTE9DS19T SVpFID0gKDggKiA0MDk2KTsKIGNvbnN0IHNpemVfdCBTUEFSRV9FTVBUWV9CTE9DS1MgPSAyOwog Y29uc3Qgc2l6ZV90IE1JTl9BUlJBWV9TSVpFID0gMTQ7CkBAIC02OCwxMCArNzQsMTAgQEAgY29u c3Qgc2l6ZV90IExPV19XQVRFUl9GQUNUT1IgPSA0OwogY29uc3Qgc2l6ZV90IEFMTE9DQVRJT05T X1BFUl9DT0xMRUNUSU9OID0gMTAwMDsKIAogLy8gZGVyaXZlZCBjb25zdGFudHMKLWNvbnN0IHNp emVfdCBDRUxMX0FSUkFZX0xFTkdUSCA9IChNSU5JTVVNX0NFTExfU0laRSAvIHNpemVvZihkb3Vi bGUpKSArIChNSU5JTVVNX0NFTExfU0laRSAlIHNpemVvZihkb3VibGUpICE9IDAgPyBzaXplb2Yo ZG91YmxlKSA6IDApOworY29uc3Qgc2l6ZV90IE1JTklNVU1fQ0VMTF9TSVpFID0gQ2VsbFNpemU8 c2l6ZW9mKHZvaWQqKSA9PSBzaXplb2YodWludDMyX3QpLCBzaXplb2Yodm9pZCopID09IHNpemVv Zih1aW50NjRfdCk+OjptX3ZhbHVlOworY29uc3Qgc2l6ZV90IENFTExfQVJSQVlfTEVOR1RIID0g KE1JTklNVU1fQ0VMTF9TSVpFIC8gc2l6ZW9mKGRvdWJsZSkpICsgKE1JTklNVU1fQ0VMTF9TSVpF ICUgc2l6ZW9mKGRvdWJsZSkgIT0gMCA/IDEgOiAwKTsKIGNvbnN0IHNpemVfdCBDRUxMX1NJWkUg PSBDRUxMX0FSUkFZX0xFTkdUSCAqIHNpemVvZihkb3VibGUpOwotY29uc3Qgc2l6ZV90IENFTExT X1BFUl9CTE9DSyA9ICgoQkxPQ0tfU0laRSAqIDggLSBzaXplb2YodWludDMyX3QpICogOCAtIHNp emVvZih2b2lkICopICogOCkgLyAoQ0VMTF9TSVpFICogOCkpOwotCitjb25zdCBzaXplX3QgQ0VM TFNfUEVSX0JMT0NLID0gKChCTE9DS19TSVpFICogOCAtIHNpemVvZih1aW50MzJfdCkgKiA4IC0g c2l6ZW9mKHZvaWQqKSAqIDgpIC8gKENFTExfU0laRSAqIDgpKTsKIAogCiBzdHJ1Y3QgQ29sbGVj dG9yQ2VsbCB7CkBAIC05NywxNSArMTAzLDExIEBAIHN0cnVjdCBDb2xsZWN0b3JIZWFwIHsKICAg c2l6ZV90IHVzZWRCbG9ja3M7CiAgIHNpemVfdCBmaXJzdEJsb2NrV2l0aFBvc3NpYmxlU3BhY2U7 CiAgIAotICBDb2xsZWN0b3JDZWxsICoqb3ZlcnNpemVDZWxsczsKLSAgc2l6ZV90IG51bU92ZXJz aXplQ2VsbHM7Ci0gIHNpemVfdCB1c2VkT3ZlcnNpemVDZWxsczsKLQogICBzaXplX3QgbnVtTGl2 ZU9iamVjdHM7CiAgIHNpemVfdCBudW1MaXZlT2JqZWN0c0F0TGFzdENvbGxlY3Q7CiB9OwogCi1z dGF0aWMgQ29sbGVjdG9ySGVhcCBoZWFwID0ge05VTEwsIDAsIDAsIDAsIE5VTEwsIDAsIDAsIDAs IDB9Oworc3RhdGljIENvbGxlY3RvckhlYXAgaGVhcCA9IHtOVUxMLCAwLCAwLCAwLCAwLCAwfTsK IAogc2l6ZV90IENvbGxlY3Rvcjo6bWFpblRocmVhZE9ubHlPYmplY3RDb3VudCA9IDA7CiBib29s IENvbGxlY3Rvcjo6bWVtb3J5RnVsbCA9IGZhbHNlOwpAQCAtMTM2LDYgKzEzOCw3IEBAIHZvaWQq IENvbGxlY3Rvcjo6YWxsb2NhdGUoc2l6ZV90IHMpCiB7CiAgIEFTU0VSVChKU0xvY2s6OmxvY2tD b3VudCgpID4gMCk7CiAgIEFTU0VSVChKU0xvY2s6OmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdMb2Nr KCkpOworICBBU1NFUlQocyA8PSBDRUxMX1NJWkUpOwogCiAgIC8vIGNvbGxlY3QgaWYgbmVlZGVk CiAgIHNpemVfdCBudW1MaXZlT2JqZWN0cyA9IGhlYXAubnVtTGl2ZU9iamVjdHM7CkBAIC0xNTEs MjUgKzE1NCw2IEBAIHZvaWQqIENvbGxlY3Rvcjo6YWxsb2NhdGUoc2l6ZV90IHMpCiAgIEdDTG9j ayBsb2NrOwogI2VuZGlmCiAgIAotICBpZiAocyA+IENFTExfU0laRSkgewotICAgIC8vIG92ZXJz aXplIGFsbG9jYXRvcgotICAgIHNpemVfdCB1c2VkT3ZlcnNpemVDZWxscyA9IGhlYXAudXNlZE92 ZXJzaXplQ2VsbHM7Ci0gICAgc2l6ZV90IG51bU92ZXJzaXplQ2VsbHMgPSBoZWFwLm51bU92ZXJz aXplQ2VsbHM7Ci0KLSAgICBpZiAodXNlZE92ZXJzaXplQ2VsbHMgPT0gbnVtT3ZlcnNpemVDZWxs cykgewotICAgICAgbnVtT3ZlcnNpemVDZWxscyA9IG1heChNSU5fQVJSQVlfU0laRSwgbnVtT3Zl cnNpemVDZWxscyAqIEdST1dUSF9GQUNUT1IpOwotICAgICAgaGVhcC5udW1PdmVyc2l6ZUNlbGxz ID0gbnVtT3ZlcnNpemVDZWxsczsKLSAgICAgIGhlYXAub3ZlcnNpemVDZWxscyA9IHN0YXRpY19j YXN0PENvbGxlY3RvckNlbGwgKio+KGZhc3RSZWFsbG9jKGhlYXAub3ZlcnNpemVDZWxscywgbnVt T3ZlcnNpemVDZWxscyAqIHNpemVvZihDb2xsZWN0b3JDZWxsICopKSk7Ci0gICAgfQotICAgIAot ICAgIHZvaWQgKm5ld0NlbGwgPSBmYXN0TWFsbG9jKHMpOwotICAgIGhlYXAub3ZlcnNpemVDZWxs c1t1c2VkT3ZlcnNpemVDZWxsc10gPSBzdGF0aWNfY2FzdDxDb2xsZWN0b3JDZWxsICo+KG5ld0Nl bGwpOwotICAgIGhlYXAudXNlZE92ZXJzaXplQ2VsbHMgPSB1c2VkT3ZlcnNpemVDZWxscyArIDE7 Ci0gICAgaGVhcC5udW1MaXZlT2JqZWN0cyA9IG51bUxpdmVPYmplY3RzICsgMTsKLQotICAgIHJl dHVybiBuZXdDZWxsOwotICB9Ci0gIAogICAvLyBzbGFiIGFsbG9jYXRvcgogICAKICAgc2l6ZV90 IHVzZWRCbG9ja3MgPSBoZWFwLnVzZWRCbG9ja3M7CkBAIC0zODQsOCArMzY4LDYgQEAgdm9pZCBD b2xsZWN0b3I6Om1hcmtTdGFja09iamVjdHNDb25zZXJ2YQogICAKICAgc2l6ZV90IHVzZWRCbG9j a3MgPSBoZWFwLnVzZWRCbG9ja3M7CiAgIENvbGxlY3RvckJsb2NrICoqYmxvY2tzID0gaGVhcC5i bG9ja3M7Ci0gIHNpemVfdCB1c2VkT3ZlcnNpemVDZWxscyA9IGhlYXAudXNlZE92ZXJzaXplQ2Vs bHM7Ci0gIENvbGxlY3RvckNlbGwgKipvdmVyc2l6ZUNlbGxzID0gaGVhcC5vdmVyc2l6ZUNlbGxz OwogCiAgIGNvbnN0IHNpemVfdCBsYXN0Q2VsbE9mZnNldCA9IHNpemVvZihDb2xsZWN0b3JDZWxs KSAqIChDRUxMU19QRVJfQkxPQ0sgLSAxKTsKIApAQCAtMzk0LDE5ICszNzYsMTQgQEAgdm9pZCBD b2xsZWN0b3I6Om1hcmtTdGFja09iamVjdHNDb25zZXJ2YQogICAgIGlmIChJU19DRUxMX0FMSUdO RUQoeCkgJiYgeCkgewogICAgICAgZm9yIChzaXplX3QgYmxvY2sgPSAwOyBibG9jayA8IHVzZWRC bG9ja3M7IGJsb2NrKyspIHsKICAgICAgICAgc2l6ZV90IG9mZnNldCA9IHggLSByZWludGVycHJl dF9jYXN0PGNoYXIgKj4oYmxvY2tzW2Jsb2NrXSk7Ci0gICAgICAgIGlmIChvZmZzZXQgPD0gbGFz dENlbGxPZmZzZXQgJiYgb2Zmc2V0ICUgc2l6ZW9mKENvbGxlY3RvckNlbGwpID09IDApCi0gICAg ICAgICAgZ290byBnb3RHb29kUG9pbnRlcjsKLSAgICAgIH0KLSAgICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpICE9IHVzZWRPdmVyc2l6ZUNlbGxzOyBpKyspCi0gICAgICAgIGlmICh4ID09IHJlaW50 ZXJwcmV0X2Nhc3Q8Y2hhciAqPihvdmVyc2l6ZUNlbGxzW2ldKSkKLSAgICAgICAgICBnb3RvIGdv dEdvb2RQb2ludGVyOwotICAgICAgY29udGludWU7Ci0KLWdvdEdvb2RQb2ludGVyOgotICAgICAg aWYgKCgoQ29sbGVjdG9yQ2VsbCAqKXgpLT51LmZyZWVDZWxsLnplcm9JZkZyZWUgIT0gMCkgewot ICAgICAgICBKU0NlbGwgKmltcCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNDZWxsICo+KHgpOwotICAg ICAgICBpZiAoIWltcC0+bWFya2VkKCkpCi0gICAgICAgICAgaW1wLT5tYXJrKCk7CisgICAgICAg IGlmIChvZmZzZXQgPD0gbGFzdENlbGxPZmZzZXQgJiYgb2Zmc2V0ICUgc2l6ZW9mKENvbGxlY3Rv ckNlbGwpID09IDApIHsKKyAgICAgICAgICBpZiAoKChDb2xsZWN0b3JDZWxsICopeCktPnUuZnJl ZUNlbGwuemVyb0lmRnJlZSAhPSAwKSB7CisgICAgICAgICAgICBKU0NlbGwgKmltcCA9IHJlaW50 ZXJwcmV0X2Nhc3Q8SlNDZWxsICo+KHgpOworICAgICAgICAgICAgaWYgKCFpbXAtPm1hcmtlZCgp KQorICAgICAgICAgICAgICBpbXAtPm1hcmsoKTsKKyAgICAgICAgICB9CisgICAgICAgICAgYnJl YWs7CisgICAgICAgIH0KICAgICAgIH0KICAgICB9CiAgIH0KQEAgLTY5OSwxOCArNjc2LDYgQEAg dm9pZCBDb2xsZWN0b3I6Om1hcmtNYWluVGhyZWFkT25seU9iamVjdAogICAgICAgICAgICAgfQog ICAgICAgICB9CiAgICAgfQotCi0gICAgZm9yIChzaXplX3QgY2VsbCA9IDA7IGNlbGwgPCBoZWFw LnVzZWRPdmVyc2l6ZUNlbGxzOyBjZWxsKyspIHsKLSAgICAgICAgQVNTRVJUKGNvdW50IDwgbWFp blRocmVhZE9ubHlPYmplY3RDb3VudCk7Ci0KLSAgICAgICAgSlNDZWxsKiBpbXAgPSByZWludGVy cHJldF9jYXN0PEpTQ2VsbCo+KGhlYXAub3ZlcnNpemVDZWxsc1tjZWxsXSk7Ci0gICAgICAgIGlm IChpbXAtPm1fY29sbGVjdE9uTWFpblRocmVhZE9ubHkpIHsKLSAgICAgICAgICAgIGlmICghaW1w LT5tYXJrZWQoKSkKLSAgICAgICAgICAgICAgICBpbXAtPm1hcmsoKTsKLSAgICAgICAgICAgIGlm ICgrK2NvdW50ID09IG1haW5UaHJlYWRPbmx5T2JqZWN0Q291bnQpCi0gICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9Ci0gICAgfQogfQogCiBib29sIENvbGxlY3Rvcjo6Y29sbGVjdCgp CkBAIC04NDgsMzcgKzgxMyw2IEBAIGJvb2wgQ29sbGVjdG9yOjpjb2xsZWN0KCkKICAgaWYgKGhl YXAubnVtTGl2ZU9iamVjdHMgIT0gbnVtTGl2ZU9iamVjdHMpCiAgICAgaGVhcC5maXJzdEJsb2Nr V2l0aFBvc3NpYmxlU3BhY2UgPSAwOwogICAKLSAgc2l6ZV90IGNlbGwgPSAwOwotICB3aGlsZSAo Y2VsbCA8IGhlYXAudXNlZE92ZXJzaXplQ2VsbHMpIHsKLSAgICBKU0NlbGwgKmltcCA9IChKU0Nl bGwgKiloZWFwLm92ZXJzaXplQ2VsbHNbY2VsbF07Ci0gICAgCi0gICAgaWYgKGltcC0+bV9tYXJr ZWQpIHsKLSAgICAgIGltcC0+bV9tYXJrZWQgPSBmYWxzZTsKLSAgICAgIGNlbGwrKzsKLSAgICB9 IGVsc2UgewotICAgICAgQVNTRVJUKGN1cnJlbnRUaHJlYWRJc01haW5UaHJlYWQgfHwgIWltcC0+ bV9jb2xsZWN0T25NYWluVGhyZWFkT25seSk7Ci0gICAgICBpZiAoaW1wLT5tX2NvbGxlY3RPbk1h aW5UaHJlYWRPbmx5KQotICAgICAgICAtLW1haW5UaHJlYWRPbmx5T2JqZWN0Q291bnQ7Ci0gICAg ICBpbXAtPn5KU0NlbGwoKTsKLSNpZiBERUJVR19DT0xMRUNUT1IKLSAgICAgIGhlYXAub3ZlcnNp emVDZWxsc1tjZWxsXS0+dS5mcmVlQ2VsbC56ZXJvSWZGcmVlID0gMDsKLSNlbHNlCi0gICAgICBm YXN0RnJlZShpbXApOwotI2VuZGlmCi0KLSAgICAgIC8vIHN3YXAgd2l0aCB0aGUgbGFzdCBvdmVy c2l6ZSBjZWxsIHNvIHdlIGNvbXBhY3QgYXMgd2UgZ28KLSAgICAgIGhlYXAub3ZlcnNpemVDZWxs c1tjZWxsXSA9IGhlYXAub3ZlcnNpemVDZWxsc1toZWFwLnVzZWRPdmVyc2l6ZUNlbGxzIC0gMV07 Ci0KLSAgICAgIGhlYXAudXNlZE92ZXJzaXplQ2VsbHMtLTsKLSAgICAgIG51bUxpdmVPYmplY3Rz LS07Ci0KLSAgICAgIGlmIChoZWFwLm51bU92ZXJzaXplQ2VsbHMgPiBNSU5fQVJSQVlfU0laRSAm JiBoZWFwLnVzZWRPdmVyc2l6ZUNlbGxzIDwgaGVhcC5udW1PdmVyc2l6ZUNlbGxzIC8gTE9XX1dB VEVSX0ZBQ1RPUikgewotICAgICAgICBoZWFwLm51bU92ZXJzaXplQ2VsbHMgPSBoZWFwLm51bU92 ZXJzaXplQ2VsbHMgLyBHUk9XVEhfRkFDVE9SOyAKLSAgICAgICAgaGVhcC5vdmVyc2l6ZUNlbGxz ID0gKENvbGxlY3RvckNlbGwgKiopZmFzdFJlYWxsb2MoaGVhcC5vdmVyc2l6ZUNlbGxzLCBoZWFw Lm51bU92ZXJzaXplQ2VsbHMgKiBzaXplb2YoQ29sbGVjdG9yQ2VsbCAqKSk7Ci0gICAgICB9Ci0g ICAgfQotICB9Ci0gIAogICBib29sIGRlbGV0ZWQgPSBoZWFwLm51bUxpdmVPYmplY3RzICE9IG51 bUxpdmVPYmplY3RzOwogCiAgIGhlYXAubnVtTGl2ZU9iamVjdHMgPSBudW1MaXZlT2JqZWN0czsK