mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-01 13:49:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibGC: Rename remaining occurrence of marked vector

Browse source 
In 3bfb0534be `MarkedVector` was renamed to `RootVector`, but some
related symbols were missed. This commit corrects this.
This commit is contained in:
InvalidUsernameException 2025-01-02 20:34:49 +01:00 • committed by Andrew Kaster
commit 01f8ab35f1
Notes: github-actions[bot] 2025-01-02 23:23:26 +00:00
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGC/Heap.cpp
View file

@ -267,7 +267,7 @@ void Heap::gather_roots(HashMap<Cell*, HeapRoot>& roots)
for (auto& root : m_roots) for (auto& root : m_roots)
roots.set(root.cell(), HeapRoot { .type = HeapRoot::Type::Root, .location = &root.source_location() }); roots.set(root.cell(), HeapRoot { .type = HeapRoot::Type::Root, .location = &root.source_location() });
for (auto& vector : m_marked_vectors) for (auto& vector : m_root_vectors)
vector.gather_roots(roots); vector.gather_roots(roots);
if constexpr (HEAP_DEBUG) { if constexpr (HEAP_DEBUG) {

18
Libraries/LibGC/Heap.h
View file

@ -61,8 +61,8 @@ public:
void did_create_root(Badge<RootImpl>, RootImpl&); void did_create_root(Badge<RootImpl>, RootImpl&);
void did_destroy_root(Badge<RootImpl>, RootImpl&); void did_destroy_root(Badge<RootImpl>, RootImpl&);
void did_create_marked_vector(Badge<RootVectorBase>, RootVectorBase&); void did_create_root_vector(Badge<RootVectorBase>, RootVectorBase&);
void did_destroy_marked_vector(Badge<RootVectorBase>, RootVectorBase&); void did_destroy_root_vector(Badge<RootVectorBase>, RootVectorBase&);
void did_create_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase&); void did_create_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase&);
void did_destroy_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase&); void did_destroy_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase&);
@ -139,7 +139,7 @@ private:
CellAllocator::List m_all_cell_allocators; CellAllocator::List m_all_cell_allocators;
RootImpl::List m_roots; RootImpl::List m_roots;
RootVectorBase::List m_marked_vectors; RootVectorBase::List m_root_vectors;
ConservativeVectorBase::List m_conservative_vectors; ConservativeVectorBase::List m_conservative_vectors;
WeakContainer::List m_weak_containers; WeakContainer::List m_weak_containers;
@ -165,16 +165,16 @@ inline void Heap::did_destroy_root(Badge<RootImpl>, RootImpl& impl)
m_roots.remove(impl); m_roots.remove(impl);
} }
inline void Heap::did_create_marked_vector(Badge<RootVectorBase>, RootVectorBase& vector) inline void Heap::did_create_root_vector(Badge<RootVectorBase>, RootVectorBase& vector)
{ {
VERIFY(!m_marked_vectors.contains(vector)); VERIFY(!m_root_vectors.contains(vector));
m_marked_vectors.append(vector); m_root_vectors.append(vector);
} }
inline void Heap::did_destroy_marked_vector(Badge<RootVectorBase>, RootVectorBase& vector) inline void Heap::did_destroy_root_vector(Badge<RootVectorBase>, RootVectorBase& vector)
{ {
VERIFY(m_marked_vectors.contains(vector)); VERIFY(m_root_vectors.contains(vector));
m_marked_vectors.remove(vector); m_root_vectors.remove(vector);
} }
inline void Heap::did_create_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase& vector) inline void Heap::did_create_conservative_vector(Badge<ConservativeVectorBase>, ConservativeVectorBase& vector)

6
Libraries/LibGC/RootVector.cpp
View file

@ -13,12 +13,12 @@ namespace GC {
RootVectorBase::RootVectorBase(Heap& heap) RootVectorBase::RootVectorBase(Heap& heap)
: m_heap(&heap) : m_heap(&heap)
{ {
m_heap->did_create_marked_vector({}, *this); m_heap->did_create_root_vector({}, *this);
} }
RootVectorBase::~RootVectorBase() RootVectorBase::~RootVectorBase()
{ {
m_heap->did_destroy_marked_vector({}, *this); m_heap->did_destroy_root_vector({}, *this);
} }
RootVectorBase& RootVectorBase::operator=(RootVectorBase const& other) RootVectorBase& RootVectorBase::operator=(RootVectorBase const& other)
@ -27,7 +27,7 @@ RootVectorBase& RootVectorBase::operator=(RootVectorBase const& other)
m_heap = other.m_heap; m_heap = other.m_heap;
// NOTE: IntrusiveList will remove this RootVectorBase from the old heap it was part of. // NOTE: IntrusiveList will remove this RootVectorBase from the old heap it was part of.
m_heap->did_create_marked_vector({}, *this); m_heap->did_create_root_vector({}, *this);
} }
return *this; return *this;