129828 2014-03-06 14:29:07 -0800 Use OwnPtr in StructureIDTable 2014-03-08 21:46:43 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg darin oldest_to_newest 987864 0 mhahnenberg 2014-03-06 14:29:07 -0800 This reduces the amount of boilerplate, plus fixes a memory leak :-( 987865 1 mhahnenberg 2014-03-06 14:29:59 -0800 <rdar://problem/16246441> 987867 2 226040 mhahnenberg 2014-03-06 14:30:42 -0800 Created attachment 226040 Patch 987871 3 226040 ggaren 2014-03-06 14:36:47 -0800 Comment on attachment 226040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226040&action=review r=me > Source/JavaScriptCore/runtime/StructureIDTable.cpp:50 > StructureOrOffset* newTable = new StructureOrOffset[newCapacity]; You should use OwnPtr here. > Source/JavaScriptCore/runtime/StructureIDTable.cpp:59 > + StructureOrOffset* oldTable = m_table.leakPtr(); You should use PassOwnPtr here. Another option is plain old swap. 988183 4 mhahnenberg 2014-03-07 09:07:58 -0800 Committed r165265: <http://trac.webkit.org/changeset/165265> 988184 5 226040 mhahnenberg 2014-03-07 09:08:16 -0800 Comment on attachment 226040 Patch Clearing review flag. 988701 6 darin 2014-03-08 21:46:43 -0800 In new code, please use std::unique_ptr instead of OwnPtr, which we are planning to deprecate and delete. 226040 2014-03-06 14:30:42 -0800 2014-03-07 09:08:15 -0800 Patch bug-129828-20140306143005.patch text/plain 5459 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1MjE2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTAzLTA2ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgVXNlIE93blB0ciBpbiBTdHJ1Y3R1cmVJRFRhYmxlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk4MjgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHJlZHVjZXMgdGhlIGFtb3VudCBv ZiBib2lsZXJwbGF0ZSBhbmQgZml4ZXMgYSBtZW1vcnkgbGVhay4KKworICAgICAgICAqIHJ1bnRp bWUvU3RydWN0dXJlSURUYWJsZS5jcHA6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZUlEVGFibGU6 OlN0cnVjdHVyZUlEVGFibGUpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVJRFRhYmxlOjpyZXNp emUpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVJRFRhYmxlOjpmbHVzaE9sZFRhYmxlcyk6Cisg ICAgICAgIChKU0M6OlN0cnVjdHVyZUlEVGFibGU6OmFsbG9jYXRlSUQpOgorICAgICAgICAoSlND OjpTdHJ1Y3R1cmVJRFRhYmxlOjpkZWFsbG9jYXRlSUQpOgorICAgICAgICAqIHJ1bnRpbWUvU3Ry dWN0dXJlSURUYWJsZS5oOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVJRFRhYmxlOjp0YWJsZSk6 CisgICAgICAgIChKU0M6OlN0cnVjdHVyZUlEVGFibGU6OmdldCk6CisKIDIwMTQtMDMtMDYgIENv bW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHIxNjUxOTYuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TdHJ1Y3R1cmVJRFRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJRFRhYmxlLmNwcAkocmV2aXNpb24gMTY1MjEwKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlSURUYWJsZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI5LDEyICsyOSwxMyBAQAogI2luY2x1ZGUgPGxpbWl0cy5oPgogI2luY2x1 ZGUgPHd0Zi9BdG9taWNzLmg+CiAjaW5jbHVkZSA8d3RmL0RhdGFMb2cuaD4KKyNpbmNsdWRlIDx3 dGYvUGFzc093blB0ci5oPgogCiBuYW1lc3BhY2UgSlNDIHsKIAogU3RydWN0dXJlSURUYWJsZTo6 U3RydWN0dXJlSURUYWJsZSgpCiAgICAgOiBtX2ZpcnN0RnJlZU9mZnNldCgwKQotICAgICwgbV90 YWJsZShuZXcgU3RydWN0dXJlT3JPZmZzZXRbc19pbml0aWFsU2l6ZV0pCisgICAgLCBtX3RhYmxl KGFkb3B0UHRyKG5ldyBTdHJ1Y3R1cmVPck9mZnNldFtzX2luaXRpYWxTaXplXSkpCiAgICAgLCBt X3NpemUoMCkKICAgICAsIG1fY2FwYWNpdHkoc19pbml0aWFsU2l6ZSkKIHsKQEAgLTQzLDI4ICs0 NCwyMyBAQCBTdHJ1Y3R1cmVJRFRhYmxlOjpTdHJ1Y3R1cmVJRFRhYmxlKCkKICAgICBhbGxvY2F0 ZUlEKDApOwogfQogCi1TdHJ1Y3R1cmVJRFRhYmxlOjp+U3RydWN0dXJlSURUYWJsZSgpCi17Ci0g ICAgZGVsZXRlIFtdIG1fdGFibGU7Ci19Ci0KIHZvaWQgU3RydWN0dXJlSURUYWJsZTo6cmVzaXpl KHNpemVfdCBuZXdDYXBhY2l0eSkKIHsKICAgICAvLyBDcmVhdGUgdGhlIG5ldyB0YWJsZS4KICAg ICBTdHJ1Y3R1cmVPck9mZnNldCogbmV3VGFibGUgPSBuZXcgU3RydWN0dXJlT3JPZmZzZXRbbmV3 Q2FwYWNpdHldOwogCiAgICAgLy8gQ29weSB0aGUgY29udGVudHMgb2YgdGhlIG9sZCB0YWJsZSB0 byB0aGUgbmV3IHRhYmxlLgotICAgIG1lbWNweShuZXdUYWJsZSwgbV90YWJsZSwgbV9jYXBhY2l0 eSAqIHNpemVvZihTdHJ1Y3R1cmVPck9mZnNldCkpOworICAgIG1lbWNweShuZXdUYWJsZSwgdGFi bGUoKSwgbV9jYXBhY2l0eSAqIHNpemVvZihTdHJ1Y3R1cmVPck9mZnNldCkpOwogCiAgICAgLy8g U3RvcmUgZmVuY2UgdG8gbWFrZSBzdXJlIHdlJ3ZlIGNvcGllZCBldmVyeXRoaW5nIGJlZm9yZSBk b2luZyB0aGUgc3dhcC4KICAgICBXVEY6OnN0b3JlU3RvcmVGZW5jZSgpOwogCiAgICAgLy8gU3dh cCB0aGUgb2xkIGFuZCBuZXcgdGFibGVzLgotICAgIFN0cnVjdHVyZU9yT2Zmc2V0KiBvbGRUYWJs ZSA9IG1fdGFibGU7Ci0gICAgbV90YWJsZSA9IG5ld1RhYmxlOworICAgIFN0cnVjdHVyZU9yT2Zm c2V0KiBvbGRUYWJsZSA9IG1fdGFibGUubGVha1B0cigpOworICAgIG1fdGFibGUgPSBhZG9wdFB0 cihuZXdUYWJsZSk7CiAKICAgICAvLyBQdXQgdGhlIG9sZCB0YWJsZSAobm93IGxhYmVsZWQgYXMg bmV3KSBpbnRvIHRoZSBsaXN0IG9mIG9sZCB0YWJsZXMuCi0gICAgbV9vbGRUYWJsZXMuYXBwZW5k KG9sZFRhYmxlKTsKKyAgICBtX29sZFRhYmxlcy5hcHBlbmQoYWRvcHRQdHIob2xkVGFibGUpKTsK IAogICAgIC8vIFVwZGF0ZSB0aGUgY2FwYWNpdHkuCiAgICAgbV9jYXBhY2l0eSA9IG5ld0NhcGFj aXR5OwpAQCAtNzIsOCArNjgsNiBAQCB2b2lkIFN0cnVjdHVyZUlEVGFibGU6OnJlc2l6ZShzaXpl X3QgbmV3CiAKIHZvaWQgU3RydWN0dXJlSURUYWJsZTo6Zmx1c2hPbGRUYWJsZXMoKQogewotICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX29sZFRhYmxlcy5zaXplKCk7ICsraSkKLSAgICAg ICAgZGVsZXRlIFtdIG1fb2xkVGFibGVzW2ldOwogICAgIG1fb2xkVGFibGVzLmNsZWFyKCk7CiB9 CiAKQEAgLTk1LDcgKzg5LDcgQEAgU3RydWN0dXJlSUQgU3RydWN0dXJlSURUYWJsZTo6YWxsb2Nh dGVJRAogICAgICAgICB9CiAKICAgICAgICAgU3RydWN0dXJlSUQgcmVzdWx0ID0gbV9zaXplOwot ICAgICAgICBtX3RhYmxlW3Jlc3VsdF0gPSBuZXdFbnRyeTsKKyAgICAgICAgdGFibGUoKVtyZXN1 bHRdID0gbmV3RW50cnk7CiAgICAgICAgIG1fc2l6ZSsrOwogICAgICAgICByZXR1cm4gcmVzdWx0 OwogICAgIH0KQEAgLTEwMyw4ICs5Nyw4IEBAIFN0cnVjdHVyZUlEIFN0cnVjdHVyZUlEVGFibGU6 OmFsbG9jYXRlSUQKICAgICBBU1NFUlQobV9maXJzdEZyZWVPZmZzZXQgIT0gc191bnVzZWRJRCk7 CiAKICAgICBTdHJ1Y3R1cmVJRCByZXN1bHQgPSBtX2ZpcnN0RnJlZU9mZnNldDsKLSAgICBtX2Zp cnN0RnJlZU9mZnNldCA9IG1fdGFibGVbbV9maXJzdEZyZWVPZmZzZXRdLm9mZnNldDsKLSAgICBt X3RhYmxlW3Jlc3VsdF0uc3RydWN0dXJlID0gc3RydWN0dXJlOworICAgIG1fZmlyc3RGcmVlT2Zm c2V0ID0gdGFibGUoKVttX2ZpcnN0RnJlZU9mZnNldF0ub2Zmc2V0OworICAgIHRhYmxlKClbcmVz dWx0XS5zdHJ1Y3R1cmUgPSBzdHJ1Y3R1cmU7CiAgICAgcmV0dXJuIHJlc3VsdDsKICNlbHNlCiAg ICAgcmV0dXJuIHN0cnVjdHVyZTsKQEAgLTExNSw4ICsxMDksOCBAQCB2b2lkIFN0cnVjdHVyZUlE VGFibGU6OmRlYWxsb2NhdGVJRChTdHJ1CiB7CiAjaWYgVVNFKEpTVkFMVUU2NCkKICAgICBBU1NF UlQoc3RydWN0dXJlSUQgIT0gc191bnVzZWRJRCk7Ci0gICAgUkVMRUFTRV9BU1NFUlQobV90YWJs ZVtzdHJ1Y3R1cmVJRF0uc3RydWN0dXJlID09IHN0cnVjdHVyZSk7Ci0gICAgbV90YWJsZVtzdHJ1 Y3R1cmVJRF0ub2Zmc2V0ID0gbV9maXJzdEZyZWVPZmZzZXQ7CisgICAgUkVMRUFTRV9BU1NFUlQo dGFibGUoKVtzdHJ1Y3R1cmVJRF0uc3RydWN0dXJlID09IHN0cnVjdHVyZSk7CisgICAgdGFibGUo KVtzdHJ1Y3R1cmVJRF0ub2Zmc2V0ID0gbV9maXJzdEZyZWVPZmZzZXQ7CiAgICAgbV9maXJzdEZy ZWVPZmZzZXQgPSBzdHJ1Y3R1cmVJRDsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHN0cnVjdHVy ZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJRFRhYmxl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJl SURUYWJsZS5oCShyZXZpc2lvbiAxNjUyMTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TdHJ1Y3R1cmVJRFRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAK ICNkZWZpbmUgU3RydWN0dXJlSURUYWJsZV9oCiAKICNpbmNsdWRlICJVbnVzZWRQb2ludGVyLmgi CisjaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFt ZXNwYWNlIEpTQyB7CkBAIC00Myw3ICs0NCw2IEBAIGNsYXNzIFN0cnVjdHVyZUlEVGFibGUgewog ICAgIGZyaWVuZCBjbGFzcyBMTEludE9mZnNldHNFeHRyYWN0b3I7CiBwdWJsaWM6CiAgICAgU3Ry dWN0dXJlSURUYWJsZSgpOwotICAgIH5TdHJ1Y3R1cmVJRFRhYmxlKCk7CiAKICAgICB2b2lkKiog YmFzZSgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmbV90YWJsZSk7IH0KIApA QCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCByZXNpemUoc2l6 ZV90IG5ld0NhcGFjaXR5KTsKLSAgICAKKwogICAgIHVuaW9uIFN0cnVjdHVyZU9yT2Zmc2V0IHsK ICAgICAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgcHVibGljOgpAQCAtNjMsMTIg KzYzLDE0IEBAIHByaXZhdGU6CiAgICAgICAgIFN0cnVjdHVyZUlEIG9mZnNldDsKICAgICB9Owog CisgICAgU3RydWN0dXJlT3JPZmZzZXQqIHRhYmxlKCkgY29uc3QgeyByZXR1cm4gbV90YWJsZS5n ZXQoKTsgfQorICAgIAogICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgc19pbml0aWFsU2l6ZSA9IDI1 NjsKIAotICAgIFZlY3RvcjxTdHJ1Y3R1cmVPck9mZnNldCo+IG1fb2xkVGFibGVzOworICAgIFZl Y3RvcjxPd25QdHI8U3RydWN0dXJlT3JPZmZzZXQ+PiBtX29sZFRhYmxlczsKIAogICAgIHVpbnQz Ml90IG1fZmlyc3RGcmVlT2Zmc2V0OwotICAgIFN0cnVjdHVyZU9yT2Zmc2V0KiBtX3RhYmxlOwor ICAgIE93blB0cjxTdHJ1Y3R1cmVPck9mZnNldD4gbV90YWJsZTsKIAogICAgIHNpemVfdCBtX3Np emU7CiAgICAgc2l6ZV90IG1fY2FwYWNpdHk7CkBAIC04MSw3ICs4Myw3IEBAIHByaXZhdGU6CiBp bmxpbmUgU3RydWN0dXJlKiBTdHJ1Y3R1cmVJRFRhYmxlOjpnZXQoU3RydWN0dXJlSUQgc3RydWN0 dXJlSUQpCiB7CiAjaWYgVVNFKEpTVkFMVUU2NCkKLSAgICByZXR1cm4gbV90YWJsZVtzdHJ1Y3R1 cmVJRF0uc3RydWN0dXJlOworICAgIHJldHVybiB0YWJsZSgpW3N0cnVjdHVyZUlEXS5zdHJ1Y3R1 cmU7CiAjZWxzZQogICAgIHJldHVybiBzdHJ1Y3R1cmVJRDsKICNlbmRpZgo=