1216744 - Move weakKeys table to the zone

Status: RESOLVED FIXED

(Core :: JavaScript: GC, defect)

Description

[Steve Fink [:sfink] [:s:]]

The weak keys table (the table mapping all not-yet-live weakmap keys to their entries) should really be on the zone. Filing this as a separate bug without the patch first, because I'm also working on bzexport.

Comment 1

[Steve Fink [:sfink] [:s:]]

Attachment: Move weakKeys to the zone

Moves GCMarker.weakKeys -> Zone.gcWeakkeys.

I'm going to take a look at changing the way GCMarker clears the weak keys tables before requesting review. I may or may not change anything.

Comment 2

[Terrence Cole [:terrence]]

Comment on attachment 8676523 [details] [diff] [review]
Move weakKeys to the zone

Review of attachment 8676523 [details] [diff] [review]:
-----------------------------------------------------------------

That is indeed surprisingly clean!

::: js/src/gc/Marking.h
@@ -136,5 @@
>  
>      size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
>  };
>  
> -class WeakMapBase;

Thanks, I've boggled at this more than once!

::: js/src/jsgc.cpp
@@ -4995,5 @@
> -            bool found;
> -            marker.weakKeys.remove(key, &found);
> -            MOZ_ASSERT(found);
> -        }
> -    }

Nice!

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b3a42d2881e5

Comment 4

[Guilherme Lima]

This landed yesterday - https://hg.mozilla.org/mozilla-central/rev/b3a42d2881e5