1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:18:11 +00:00

LibJS: Only consider VM-accessible execution contexts as strong roots

Partially reverts 3dc5f467a8 to fix
GC memory leak that happens because we treated all execution contexts
as strong roots.
This commit is contained in:
Aliaksandr Kalenik 2023-12-13 10:24:30 +01:00 committed by Andreas Kling
parent cbb660c756
commit b108d51c5b
9 changed files with 32 additions and 18 deletions

View file

@ -450,9 +450,6 @@ void Heap::mark_live_cells(HashMap<Cell*, HeapRoot> const& roots)
MarkingVisitor visitor(*this, roots); MarkingVisitor visitor(*this, roots);
for (auto& execution_context : m_execution_contexts)
execution_context.visit_edges(visitor);
vm().bytecode_interpreter().visit_edges(visitor); vm().bytecode_interpreter().visit_edges(visitor);
visitor.mark_all_live_cells(); visitor.mark_all_live_cells();

View file

@ -148,7 +148,6 @@ private:
HandleImpl::List m_handles; HandleImpl::List m_handles;
MarkedVectorBase::List m_marked_vectors; MarkedVectorBase::List m_marked_vectors;
WeakContainer::List m_weak_containers; WeakContainer::List m_weak_containers;
ExecutionContext::List m_execution_contexts;
Vector<GCPtr<Cell>> m_uprooted_cells; Vector<GCPtr<Cell>> m_uprooted_cells;
@ -196,16 +195,4 @@ inline void Heap::did_destroy_weak_container(Badge<WeakContainer>, WeakContainer
m_weak_containers.remove(set); m_weak_containers.remove(set);
} }
inline void Heap::did_create_execution_context(Badge<ExecutionContext>, ExecutionContext& set)
{
VERIFY(!m_execution_contexts.contains(set));
m_execution_contexts.append(set);
}
inline void Heap::did_destroy_execution_context(Badge<ExecutionContext>, ExecutionContext& set)
{
VERIFY(m_execution_contexts.contains(set));
m_execution_contexts.remove(set);
}
} }

View file

@ -192,6 +192,8 @@ void AsyncFunctionDriverWrapper::visit_edges(Cell::Visitor& visitor)
visitor.visit(m_top_level_promise); visitor.visit(m_top_level_promise);
if (m_current_promise) if (m_current_promise)
visitor.visit(m_current_promise); visitor.visit(m_current_promise);
if (m_suspended_execution_context)
m_suspended_execution_context->visit_edges(visitor);
} }
} }

View file

@ -48,6 +48,7 @@ void AsyncGenerator::visit_edges(Cell::Visitor& visitor)
if (m_frame) if (m_frame)
m_frame->visit_edges(visitor); m_frame->visit_edges(visitor);
visitor.visit(m_current_promise); visitor.visit(m_current_promise);
m_async_generator_context->visit_edges(visitor);
} }
// 27.6.3.4 AsyncGeneratorEnqueue ( generator, completion, promiseCapability ), https://tc39.es/ecma262/#sec-asyncgeneratorenqueue // 27.6.3.4 AsyncGeneratorEnqueue ( generator, completion, promiseCapability ), https://tc39.es/ecma262/#sec-asyncgeneratorenqueue

View file

@ -21,12 +21,10 @@ NonnullOwnPtr<ExecutionContext> ExecutionContext::create(Heap& heap)
ExecutionContext::ExecutionContext(Heap& heap) ExecutionContext::ExecutionContext(Heap& heap)
: m_heap(heap) : m_heap(heap)
{ {
m_heap.did_create_execution_context({}, *this);
} }
ExecutionContext::~ExecutionContext() ExecutionContext::~ExecutionContext()
{ {
m_heap.did_destroy_execution_context({}, *this);
} }
NonnullOwnPtr<ExecutionContext> ExecutionContext::copy() const NonnullOwnPtr<ExecutionContext> ExecutionContext::copy() const

View file

@ -51,6 +51,7 @@ void GeneratorObject::visit_edges(Cell::Visitor& visitor)
visitor.visit(m_previous_value); visitor.visit(m_previous_value);
if (m_frame) if (m_frame)
m_frame->visit_edges(visitor); m_frame->visit_edges(visitor);
m_execution_context->visit_edges(visitor);
} }
// 27.5.3.2 GeneratorValidate ( generator, generatorBrand ), https://tc39.es/ecma262/#sec-generatorvalidate // 27.5.3.2 GeneratorValidate ( generator, generatorBrand ), https://tc39.es/ecma262/#sec-generatorvalidate

View file

@ -153,6 +153,20 @@ Bytecode::Interpreter& VM::bytecode_interpreter()
return *m_bytecode_interpreter; return *m_bytecode_interpreter;
} }
struct ExecutionContextRootsCollector : public Cell::Visitor {
virtual void visit_impl(Cell& cell) override
{
roots.set(&cell);
}
virtual void visit_possible_values(ReadonlyBytes) override
{
VERIFY_NOT_REACHED();
}
HashTable<Cell*> roots;
};
void VM::gather_roots(HashMap<Cell*, HeapRoot>& roots) void VM::gather_roots(HashMap<Cell*, HeapRoot>& roots)
{ {
roots.set(m_empty_string, HeapRoot { .type = HeapRoot::Type::VM }); roots.set(m_empty_string, HeapRoot { .type = HeapRoot::Type::VM });
@ -169,6 +183,18 @@ void VM::gather_roots(HashMap<Cell*, HeapRoot>& roots)
for (auto finalization_registry : m_finalization_registry_cleanup_jobs) for (auto finalization_registry : m_finalization_registry_cleanup_jobs)
roots.set(finalization_registry, HeapRoot { .type = HeapRoot::Type::VM }); roots.set(finalization_registry, HeapRoot { .type = HeapRoot::Type::VM });
auto gather_roots_from_execution_context_stack = [&roots](Vector<ExecutionContext*> const& stack) {
for (auto const& execution_context : stack) {
ExecutionContextRootsCollector visitor;
execution_context->visit_edges(visitor);
for (auto* cell : visitor.roots)
roots.set(cell, HeapRoot { .type = HeapRoot::Type::VM });
}
};
gather_roots_from_execution_context_stack(m_execution_context_stack);
for (auto& saved_stack : m_saved_execution_context_stacks)
gather_roots_from_execution_context_stack(saved_stack);
} }
ThrowCompletionOr<Value> VM::named_evaluation_if_anonymous_function(ASTNode const& expression, DeprecatedFlyString const& name) ThrowCompletionOr<Value> VM::named_evaluation_if_anonymous_function(ASTNode const& expression, DeprecatedFlyString const& name)

View file

@ -120,6 +120,7 @@ void SourceTextModule::visit_edges(Cell::Visitor& visitor)
{ {
Base::visit_edges(visitor); Base::visit_edges(visitor);
visitor.visit(m_import_meta); visitor.visit(m_import_meta);
m_execution_context->visit_edges(visitor);
} }
// 16.2.1.6.1 ParseModule ( sourceText, realm, hostDefined ), https://tc39.es/ecma262/#sec-parsemodule // 16.2.1.6.1 ParseModule ( sourceText, realm, hostDefined ), https://tc39.es/ecma262/#sec-parsemodule

View file

@ -45,6 +45,7 @@ void EnvironmentSettingsObject::visit_edges(Cell::Visitor& visitor)
visitor.visit(target_browsing_context); visitor.visit(target_browsing_context);
visitor.visit(m_module_map); visitor.visit(m_module_map);
visitor.ignore(m_outstanding_rejected_promises_weak_set); visitor.ignore(m_outstanding_rejected_promises_weak_set);
m_realm_execution_context->visit_edges(visitor);
} }
JS::ExecutionContext& EnvironmentSettingsObject::realm_execution_context() JS::ExecutionContext& EnvironmentSettingsObject::realm_execution_context()