135913 2014-08-13 16:18:17 -0700 Fix a memory leak in TypeSet 2014-08-20 13:46:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam commit-queue oldest_to_newest 1028948 0 saam 2014-08-13 16:18:17 -0700 There is currently a memory leak with the member variable: m_structureHistory. Fix it. 1030315 1 236882 saam 2014-08-20 10:57:48 -0700 Created attachment 236882 patch Fixes the memory leak. 1030351 2 236882 commit-queue 2014-08-20 12:28:02 -0700 Comment on attachment 236882 patch Clearing flags on attachment: 236882 Committed r172804: <http://trac.webkit.org/changeset/172804> 1030352 3 commit-queue 2014-08-20 12:28:04 -0700 All reviewed patches have been landed. Closing bug. 1030381 4 236882 ggaren 2014-08-20 13:46:56 -0700 Comment on attachment 236882 patch View in context: https://bugs.webkit.org/attachment.cgi?id=236882&action=review > Source/JavaScriptCore/runtime/TypeSet.cpp:120 > + RefPtr<StructureShape> shape = m_structureHistory.at(i); Can you use bracket access instead of .at() in all this code? 236882 2014-08-20 10:57:48 -0700 2014-08-20 13:46:56 -0700 patch patch.diff text/plain 6404 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyNzk3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTA4LTIwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEZpeCBhIG1lbW9yeSBsZWFrIGluIFR5cGVTZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTkxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgVHlwZVNldCB1bmNvbmRpdGlvbmFsbHkg YWxsb2NhdGVzIG1lbW9yeSBmb3IgaXRzIG1lbWJlcgorICAgICAgICB2YXJpYWJsZSBtX3N0cnVj dHVyZUhpc3RvcnksIGJ1dCBuZXZlciBkZWFsbG9jYXRlcyBpdC4gQ2hhbmdlIHRoaXMgCisgICAg ICAgIGZyb20gYmVpbmcgYSBwb2ludGVyIHRoYXQgaXMgdW5jb25kaXRpb25hbGx5IGFsbG9jYXRl ZCB0byBhIG1lbWJlciAKKyAgICAgICAgdmFyaWFibGUgdGhhdCB3aWxsIGJlIGRlYWxsb2NhdGVk IHdoZW4gVHlwZVNldCBpdHNlbGYgaXMgZGVhbGxvY2F0ZWQuCisKKyAgICAgICAgKiBydW50aW1l L1R5cGVTZXQuY3BwOgorICAgICAgICAoSlNDOjpUeXBlU2V0OjpUeXBlU2V0KToKKyAgICAgICAg KEpTQzo6VHlwZVNldDo6YWRkVHlwZUluZm9ybWF0aW9uKToKKyAgICAgICAgKEpTQzo6VHlwZVNl dDo6c2VlblR5cGVzKToKKyAgICAgICAgKEpTQzo6VHlwZVNldDo6ZGlzcGxheU5hbWUpOgorICAg ICAgICAoSlNDOjpUeXBlU2V0OjphbGxTdHJ1Y3R1cmVSZXByZXNlbnRhdGlvbnMpOgorICAgICAg ICAoSlNDOjpTdHJ1Y3R1cmVTaGFwZTo6bGVhc3RDb21tb25BbmNlc3Rvcik6CisgICAgICAgICog cnVudGltZS9UeXBlU2V0Lmg6CisKIDIwMTQtMDgtMTkgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzI0MDEpOiBmb3ItaW4gb3B0aW1pemF0 aW9uIG5vIGxvbmdlciB3b3JrcyBhdCBhbGwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1R5cGVTZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1R5cGVTZXQuY3BwCShyZXZpc2lvbiAxNzI3OTApCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9UeXBlU2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNiBA QCBuYW1lc3BhY2UgSlNDIHsKIAogVHlwZVNldDo6VHlwZVNldCgpCiAgICAgOiBtX3NlZW5UeXBl cyhUeXBlTm90aGluZykKLSAgICAsIG1fc3RydWN0dXJlSGlzdG9yeShuZXcgVmVjdG9yPFJlZlB0 cjxTdHJ1Y3R1cmVTaGFwZT4+KQogewogfQogCkBAIC03OSw4ICs3OCw4IEBAIHZvaWQgVHlwZVNl dDo6YWRkVHlwZUluZm9ybWF0aW9uKFJ1bnRpbWUKICAgICAgICAgICAgIC8vIE1ha2Ugb25lIG1v cmUgcGFzcyBtYWtpbmcgc3VyZSB0aGF0IHdlIGRvbid0IGhhdmUgdGhlIHNhbWUgc2hhcGUuIChT YW1lIHNoYXBlcyBtYXkgaGF2ZSBkaWZmZXJlbnQgU3RydWN0dXJlSURzKS4KICAgICAgICAgICAg IGJvb2wgZm91bmQgPSBmYWxzZTsKICAgICAgICAgICAgIFN0cmluZyBoYXNoID0gc2hhcGUtPnBy b3BlcnR5SGFzaCgpOwotICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3N0cnVj dHVyZUhpc3RvcnktPnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICAgICAgUmVmUHRyPFN0cnVj dHVyZVNoYXBlPiBvYmogPSBtX3N0cnVjdHVyZUhpc3RvcnktPmF0KGkpOworICAgICAgICAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3N0cnVjdHVyZUhpc3Rvcnkuc2l6ZSgpOyBpKyspIHsK KyAgICAgICAgICAgICAgICBSZWZQdHI8U3RydWN0dXJlU2hhcGU+IG9iaiA9IG1fc3RydWN0dXJl SGlzdG9yeS5hdChpKTsKICAgICAgICAgICAgICAgICBpZiAob2JqLT5wcm9wZXJ0eUhhc2goKSA9 PSBoYXNoKSB7CiAgICAgICAgICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CkBAIC04OCw3ICs4Nyw3IEBAIHZvaWQgVHlwZVNldDo6YWRkVHlwZUlu Zm9ybWF0aW9uKFJ1bnRpbWUKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCFmb3Vu ZCkKLSAgICAgICAgICAgICAgICBtX3N0cnVjdHVyZUhpc3RvcnktPmFwcGVuZChzaGFwZSk7Cisg ICAgICAgICAgICAgICAgbV9zdHJ1Y3R1cmVIaXN0b3J5LmFwcGVuZChzaGFwZSk7CiAgICAgICAg IH0KICAgICB9CiB9CkBAIC0xMTcsMjIgKzExNiwyMiBAQCBTdHJpbmcgVHlwZVNldDo6c2VlblR5 cGVzKCkgY29uc3QKICAgICBpZiAobV9zZWVuVHlwZXMgJiBUeXBlT2JqZWN0KQogICAgICAgICAg c2Vlbi5hcHBlbmQoIk9iamVjdCAiKTsKIAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9z dHJ1Y3R1cmVIaXN0b3J5LT5zaXplKCk7IGkrKykgewotICAgICAgICBSZWZQdHI8U3RydWN0dXJl U2hhcGU+IHNoYXBlID0gbV9zdHJ1Y3R1cmVIaXN0b3J5LT5hdChpKTsKKyAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1fc3RydWN0dXJlSGlzdG9yeS5zaXplKCk7IGkrKykgeworICAgICAgICBS ZWZQdHI8U3RydWN0dXJlU2hhcGU+IHNoYXBlID0gbV9zdHJ1Y3R1cmVIaXN0b3J5LmF0KGkpOwog ICAgICAgICBzZWVuLmFwcGVuZChzaGFwZS0+bV9jb25zdHJ1Y3Rvck5hbWUpOwogICAgICAgICBz ZWVuLmFwcGVuZCgiICIpOwogICAgIH0KIAotICAgIGlmIChtX3N0cnVjdHVyZUhpc3RvcnktPnNp emUoKSkgCisgICAgaWYgKG1fc3RydWN0dXJlSGlzdG9yeS5zaXplKCkpIAogICAgICAgICBzZWVu LmFwcGVuZCgiXG5TdHJ1Y3R1cmVzOlsgIik7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt X3N0cnVjdHVyZUhpc3RvcnktPnNpemUoKTsgaSsrKSB7Ci0gICAgICAgIHNlZW4uYXBwZW5kKG1f c3RydWN0dXJlSGlzdG9yeS0+YXQoaSktPnN0cmluZ1JlcHJlc2VudGF0aW9uKCkpOworICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9zdHJ1Y3R1cmVIaXN0b3J5LnNpemUoKTsgaSsrKSB7Cisg ICAgICAgIHNlZW4uYXBwZW5kKG1fc3RydWN0dXJlSGlzdG9yeS5hdChpKS0+c3RyaW5nUmVwcmVz ZW50YXRpb24oKSk7CiAgICAgICAgIHNlZW4uYXBwZW5kKCIgIik7CiAgICAgfQotICAgIGlmICht X3N0cnVjdHVyZUhpc3RvcnktPnNpemUoKSkKKyAgICBpZiAobV9zdHJ1Y3R1cmVIaXN0b3J5LnNp emUoKSkKICAgICAgICAgc2Vlbi5hcHBlbmQoIl0iKTsKIAotICAgIGlmIChtX3N0cnVjdHVyZUhp c3RvcnktPnNpemUoKSkgeworICAgIGlmIChtX3N0cnVjdHVyZUhpc3Rvcnkuc2l6ZSgpKSB7CiAg ICAgICAgIHNlZW4uYXBwZW5kKCJcbkxlYXN0IENvbW1vbiBBbmNlc3RvcjogIik7CiAgICAgICAg IHNlZW4uYXBwZW5kKGxlYXN0Q29tbW9uQW5jZXN0b3IoKSk7CiAgICAgfQpAQCAtMTY1LDcgKzE2 NCw3IEBAIFN0cmluZyBUeXBlU2V0OjpkaXNwbGF5TmFtZSgpIGNvbnN0CiAgICAgaWYgKG1fc2Vl blR5cGVzID09IFR5cGVOb3RoaW5nKQogICAgICAgICByZXR1cm4gIiI7CiAKLSAgICBpZiAobV9z dHJ1Y3R1cmVIaXN0b3J5LT5zaXplKCkgJiYgZG9lc1R5cGVDb25mb3JtVG8oVHlwZU9iamVjdCB8 IFR5cGVOdWxsIHwgVHlwZVVuZGVmaW5lZCkpIHsKKyAgICBpZiAobV9zdHJ1Y3R1cmVIaXN0b3J5 LnNpemUoKSAmJiBkb2VzVHlwZUNvbmZvcm1UbyhUeXBlT2JqZWN0IHwgVHlwZU51bGwgfCBUeXBl VW5kZWZpbmVkKSkgewogICAgICAgICBTdHJpbmcgY3Rvck5hbWUgPSBsZWFzdENvbW1vbkFuY2Vz dG9yKCk7IAogCiAgICAgICAgIGlmIChkb2VzVHlwZUNvbmZvcm1UbyhUeXBlT2JqZWN0KSkKQEAg LTIzNyw4ICsyMzYsOCBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5 CiB7CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6 VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN0cnVjdHVyZURlc2NyaXB0aW9uPj4gZGVzY3JpcHRpb24g PSBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpS dW50aW1lOjpTdHJ1Y3R1cmVEZXNjcmlwdGlvbj46OmNyZWF0ZSgpOwogCi0gICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBtX3N0cnVjdHVyZUhpc3RvcnktPnNpemUoKTsgaSsrKQotICAgICAgICBk ZXNjcmlwdGlvbi0+YWRkSXRlbShtX3N0cnVjdHVyZUhpc3RvcnktPmF0KGkpLT5pbnNwZWN0b3JS ZXByZXNlbnRhdGlvbigpKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fc3RydWN0dXJl SGlzdG9yeS5zaXplKCk7IGkrKykKKyAgICAgICAgZGVzY3JpcHRpb24tPmFkZEl0ZW0obV9zdHJ1 Y3R1cmVIaXN0b3J5LmF0KGkpLT5pbnNwZWN0b3JSZXByZXNlbnRhdGlvbigpKTsKIAogICAgIHJl dHVybiBkZXNjcmlwdGlvbi5yZWxlYXNlKCk7CiB9CkBAIC0yOTksMTYgKzI5OCwxNiBAQCBTdHJp bmcgU3RydWN0dXJlU2hhcGU6OnByb3BlcnR5SGFzaCgpIAogICAgIHJldHVybiAqbV9wcm9wZXJ0 eUhhc2g7CiB9CiAKLVN0cmluZyBTdHJ1Y3R1cmVTaGFwZTo6bGVhc3RDb21tb25BbmNlc3Rvcihj b25zdCBWZWN0b3I8UmVmUHRyPFN0cnVjdHVyZVNoYXBlPj4qIHNoYXBlcykKK1N0cmluZyBTdHJ1 Y3R1cmVTaGFwZTo6bGVhc3RDb21tb25BbmNlc3Rvcihjb25zdCBWZWN0b3I8UmVmUHRyPFN0cnVj dHVyZVNoYXBlPj4gc2hhcGVzKQogewotICAgIGlmICghc2hhcGVzLT5zaXplKCkpCisgICAgaWYg KCFzaGFwZXMuc2l6ZSgpKQogICAgICAgICByZXR1cm4gIiI7CiAKLSAgICBSZWZQdHI8U3RydWN0 dXJlU2hhcGU+IG9yaWdpbiA9IHNoYXBlcy0+YXQoMCk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDE7 IGkgPCBzaGFwZXMtPnNpemUoKTsgaSsrKSB7CisgICAgUmVmUHRyPFN0cnVjdHVyZVNoYXBlPiBv cmlnaW4gPSBzaGFwZXMuYXQoMCk7CisgICAgZm9yIChzaXplX3QgaSA9IDE7IGkgPCBzaGFwZXMu c2l6ZSgpOyBpKyspIHsKICAgICAgICAgYm9vbCBmb3VuZExVQiA9IGZhbHNlOwogICAgICAgICB3 aGlsZSAoIWZvdW5kTFVCKSB7Ci0gICAgICAgICAgICBSZWZQdHI8U3RydWN0dXJlU2hhcGU+IGNo ZWNrID0gc2hhcGVzLT5hdChpKTsKKyAgICAgICAgICAgIFJlZlB0cjxTdHJ1Y3R1cmVTaGFwZT4g Y2hlY2sgPSBzaGFwZXMuYXQoaSk7CiAgICAgICAgICAgICBTdHJpbmcgY3VyQ3Rvck5hbWUgPSBv cmlnaW4tPm1fY29uc3RydWN0b3JOYW1lOwogICAgICAgICAgICAgd2hpbGUgKGNoZWNrKSB7CiAg ICAgICAgICAgICAgICAgaWYgKGNoZWNrLT5tX2NvbnN0cnVjdG9yTmFtZSA9PSBjdXJDdG9yTmFt ZSkgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZVNldC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuaAkocmV2aXNp b24gMTcyNzkwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZVNldC5oCSh3 b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByb3Rv KFBhc3NSZWZQdHI8U3RydWN0dXJlU2hhcGU+IHNoYXBlKSB7IG1fcHJvdG8gPSBzaGFwZTsgfQog CiBwcml2YXRlOgotICAgIHN0YXRpYyBTdHJpbmcgbGVhc3RDb21tb25BbmNlc3Rvcihjb25zdCBW ZWN0b3I8UmVmUHRyPFN0cnVjdHVyZVNoYXBlPj4qKTsKKyAgICBzdGF0aWMgU3RyaW5nIGxlYXN0 Q29tbW9uQW5jZXN0b3IoY29uc3QgVmVjdG9yPFJlZlB0cjxTdHJ1Y3R1cmVTaGFwZT4+KTsKIAog ICAgIFZlY3RvcjxSZWZQdHI8U3RyaW5nSW1wbD4+IG1fZmllbGRzOwogICAgIFJlZlB0cjxTdHJ1 Y3R1cmVTaGFwZT4gbV9wcm90bzsKQEAgLTEwMyw3ICsxMDMsNyBAQCBwcml2YXRlOgogICAgIGJv b2wgZG9lc1R5cGVDb25mb3JtVG8odWludDMyX3QgdGVzdCkgY29uc3Q7CiAKICAgICB1aW50MzJf dCBtX3NlZW5UeXBlczsKLSAgICBWZWN0b3I8UmVmUHRyPFN0cnVjdHVyZVNoYXBlPj4qIG1fc3Ry dWN0dXJlSGlzdG9yeTsKKyAgICBWZWN0b3I8UmVmUHRyPFN0cnVjdHVyZVNoYXBlPj4gbV9zdHJ1 Y3R1cmVIaXN0b3J5OwogICAgIEhhc2hNYXA8U3RydWN0dXJlSUQsIHVpbnQ4X3Q+IG1fc3RydWN0 dXJlSURIaXN0b3J5OwogfTsKIAo=