109864 2013-02-14 14:28:04 -0800 No easy way to use a RetainPtr as a key in a HashMap using object (rather than pointer) equality 2013-02-14 14:59:45 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz andersca benjamin jberlin oldest_to_newest 833428 0 mitz 2013-02-14 14:28:04 -0800 A HashMap<RetainPtr<NSObject>, ValueType> uses pointer hashing and pointer equality rather than -hash and -isEqual:. 833432 1 188429 mitz 2013-02-14 14:30:14 -0800 Created attachment 188429 Patch 833444 2 benjamin 2013-02-14 14:40:48 -0800 View in context: https://bugs.webkit.org/attachment.cgi?id=188429&action=review > Source/WTF/wtf/RetainPtr.h:310 > + static void constructDeletedValue(RetainPtr<P>& slot) { new (&slot) RetainPtr<P>(AdoptCF, reinterpret_cast<P *>(-1)); } > + static bool isDeletedValue(const RetainPtr<P>& value) { return value.get() == reinterpret_cast<P *>(-1); } I would prefer something using an explicit constructor, like we do in RefPtr. 833470 3 mitz 2013-02-14 14:59:45 -0800 (In reply to comment #2) > View in context: https://bugs.webkit.org/attachment.cgi?id=188429&action=review > > > Source/WTF/wtf/RetainPtr.h:310 > > + static void constructDeletedValue(RetainPtr<P>& slot) { new (&slot) RetainPtr<P>(AdoptCF, reinterpret_cast<P *>(-1)); } > > + static bool isDeletedValue(const RetainPtr<P>& value) { return value.get() == reinterpret_cast<P *>(-1); } > > I would prefer something using an explicit constructor, like we do in RefPtr. Done! Fixed in <http://trac.webkit.org/r142924>. 188429 2013-02-14 14:30:14 -0800 2013-02-14 14:35:12 -0800 Patch bug-109864-20130214142639.patch text/plain 2528 mitz SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNDI5MTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAyLTE0ICBEYW4gQmVybnN0ZWluICA8bWl0 ekBhcHBsZS5jb20+CisKKyAgICAgICAgTm8gZWFzeSB3YXkgdG8gdXNlIGEgUmV0YWluUHRyIGFz IGEga2V5IGluIGEgSGFzaE1hcCB1c2luZyBvYmplY3QgKHJhdGhlciB0aGFuIHBvaW50ZXIpIGVx dWFsaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDk4NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRlZCBSZXRhaW5QdHJPYmplY3RIYXNoVHJhaXRzIGFuZCBSZXRhaW5QdHJPYmplY3RIYXNoLCB3 aGljaCB1c2UgQ0ZFcXVhbAorICAgICAgICBhbmQgQ0ZIYXNoLgorCisgICAgICAgICogd3RmL1Jl dGFpblB0ci5oOgorICAgICAgICAoUmV0YWluUHRyT2JqZWN0SGFzaFRyYWl0cyk6CisgICAgICAg IChXVEY6OlJldGFpblB0ck9iamVjdEhhc2hUcmFpdHM6OmVtcHR5VmFsdWUpOgorICAgICAgICAo V1RGOjpSZXRhaW5QdHJPYmplY3RIYXNoVHJhaXRzOjpjb25zdHJ1Y3REZWxldGVkVmFsdWUpOgor ICAgICAgICAoV1RGOjpSZXRhaW5QdHJPYmplY3RIYXNoVHJhaXRzOjppc0RlbGV0ZWRWYWx1ZSk6 CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpSZXRhaW5QdHJPYmplY3RIYXNoOjpoYXNo KToKKyAgICAgICAgKFdURjo6UmV0YWluUHRyT2JqZWN0SGFzaDo6ZXF1YWwpOgorICAgICAgICAo UmV0YWluUHRyT2JqZWN0SGFzaCk6CisKIDIwMTMtMDItMTQgIFRvbnkgQ2hhbmcgIDx0b255QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBzZXQgc3ZuOmVvbC1zdHlsZSBDUkxG IGZvciAuc2xuIGZpbGVzLgpJbmRleDogU291cmNlL1dURi93dGYvUmV0YWluUHRyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dURi93dGYvUmV0YWluUHRyLmgJKHJldmlzaW9uIDE0Mjg4OSkKKysr IFNvdXJjZS9XVEYvd3RmL1JldGFpblB0ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTcsNiArMjk3 LDMyIEBAIG5hbWVzcGFjZSBXVEYgewogICAgIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFA+IHN0 cnVjdCBEZWZhdWx0SGFzaDxSZXRhaW5QdHI8UD4gPiB7IHR5cGVkZWYgUHRySGFzaDxSZXRhaW5Q dHI8UD4gPiBIYXNoOyB9OwogCisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFA+CisgICAgc3RydWN0 IFJldGFpblB0ck9iamVjdEhhc2hUcmFpdHMgOiBHZW5lcmljSGFzaFRyYWl0czxSZXRhaW5QdHI8 UD4gPiB7CisgICAgICAgIHN0YXRpYyBjb25zdCBib29sIGVtcHR5VmFsdWVJc1plcm8gPSB0cnVl OworICAgICAgICBzdGF0aWMgY29uc3QgUmV0YWluUHRyPFA+JiBlbXB0eVZhbHVlKCkKKyAgICAg ICAgeworICAgICAgICAgICAgc3RhdGljIFJldGFpblB0cjxQPiYgbnVsbCA9ICoobmV3IFJldGFp blB0cjxQPik7CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgfQorICAgICAgICBz dGF0aWMgY29uc3QgYm9vbCBuZWVkc0Rlc3RydWN0aW9uID0gdHJ1ZTsKKyAgICAgICAgc3RhdGlj IHZvaWQgY29uc3RydWN0RGVsZXRlZFZhbHVlKFJldGFpblB0cjxQPiYgc2xvdCkgeyBuZXcgKCZz bG90KSBSZXRhaW5QdHI8UD4oQWRvcHRDRiwgcmVpbnRlcnByZXRfY2FzdDxQICo+KC0xKSk7IH0K KyAgICAgICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFsdWUoY29uc3QgUmV0YWluUHRyPFA+JiB2 YWx1ZSkgeyByZXR1cm4gdmFsdWUuZ2V0KCkgPT0gcmVpbnRlcnByZXRfY2FzdDxQICo+KC0xKTsg fQorICAgIH07CisKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgUD4KKyAgICBzdHJ1Y3QgUmV0YWlu UHRyT2JqZWN0SGFzaCB7CisgICAgICAgIHN0YXRpYyB1bnNpZ25lZCBoYXNoKGNvbnN0IFJldGFp blB0cjxQPiYgbykKKyAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShv LmdldCgpLCAiYXR0ZW1wdCB0byB1c2UgbnVsbCBSZXRhaW5QdHIgaW4gSGFzaFRhYmxlIik7Cisg ICAgICAgICAgICByZXR1cm4gQ0ZIYXNoKG8uZ2V0KCkpOworICAgICAgICB9CisgICAgICAgIHN0 YXRpYyBib29sIGVxdWFsKGNvbnN0IFJldGFpblB0cjxQPiYgYSwgY29uc3QgUmV0YWluUHRyPFA+ JiBiKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gQ0ZFcXVhbChhLmdldCgpLCBiLmdl dCgpKTsKKyAgICAgICAgfQorICAgICAgICBzdGF0aWMgY29uc3QgYm9vbCBzYWZlVG9Db21wYXJl VG9FbXB0eU9yRGVsZXRlZCA9IGZhbHNlOworICAgIH07CiB9IC8vIG5hbWVzcGFjZSBXVEYKIAog dXNpbmcgV1RGOjpBZG9wdENGOwo=