Clean up Heap::collect and Heap::markRoots

• Component: JavaScriptCore
• Status: RESOLVED FIXED

[Mark Hahnenberg]

These functions have built up a lot of cruft recently. We should do a bit of cleanup to make them easier to grok.

[Mark Hahnenberg]

Created attachment 225430 [details]
Patch

[Geoffrey Garen]

Comment on attachment 225430 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=225430&action=review

r=me

> Source/JavaScriptCore/heap/Heap.cpp:483
> +void Heap::markProtectedObjects(HeapRootVisitor& heapRootVisitor)

"visit"?

> Source/JavaScriptCore/heap/Heap.cpp:493
> +void Heap::markTempSortVectors(HeapRootVisitor& heapRootVisitor)

"visit"?

> Source/JavaScriptCore/heap/Heap.cpp:513
> +void Heap::markArgumentBuffers(HeapRootVisitor& visitor)

"visit"?

> Source/JavaScriptCore/heap/Heap.cpp:637
> +    SamplingRegion samplingRegion("Garbage Collection: Tracing");

"Marking"?

[Mark Hahnenberg]

Committed r164862: <http://trac.webkit.org/changeset/164862>

[Mark Hahnenberg]

Comment on attachment 225430 [details]
Patch

Clearing review flag.

[Csaba Osztrogonác]

Comment on attachment 225430 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=225430&action=review

> Source/JavaScriptCore/heap/Heap.cpp:667
> +#if ENABLE(GGC)
> +    Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
> +    m_slotVisitor.markStack().fillVector(rememberedSet);
> +#endif

rememberedSet is defined inside ENABLE(GGC) guard ...

> Source/JavaScriptCore/heap/Heap.cpp:689
> +    clearRememberedSet(rememberedSet);

... but used outside. And it broke the !ENABLE(GGC) builds.

[Mark Hahnenberg]

(In reply to comment #5)
> (From update of attachment 225430 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=225430&action=review
> 
> > Source/JavaScriptCore/heap/Heap.cpp:667
> > +#if ENABLE(GGC)
> > +    Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
> > +    m_slotVisitor.markStack().fillVector(rememberedSet);
> > +#endif
> 
> rememberedSet is defined inside ENABLE(GGC) guard ...
> 
> > Source/JavaScriptCore/heap/Heap.cpp:689
> > +    clearRememberedSet(rememberedSet);
> 
> ... but used outside. And it broke the !ENABLE(GGC) builds.

Good point, fix coming.

[Mark Hahnenberg]

Reopening to attach new patch.

[Mark Hahnenberg]

Created attachment 225473 [details]
Patch

[Mark Hahnenberg]

Comment on attachment 225473 [details]
Patch

Since this fixes a build, it doesn't need review but feel free to comment :-)

[Mark Hahnenberg]

Comment on attachment 225473 [details]
Patch

Bah, commit queue will take too long. Landed manually in r164864.

[Mark Hahnenberg]

Closing.