RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:58:13 +00:00
Code Issues Activity Actions

LibJS: Make sure we mark everything reachable from the scope stack

Browse source 
This ensures that local variables survive GC.
This commit is contained in:
Andreas Kling 2020-03-09 21:29:22 +01:00
parent 26165cd92a
commit 363c40e3f3
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibJS/Heap.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <AK/Badge.h>
#include <AK/HashTable.h> #include <AK/HashTable.h>
#include <LibJS/Heap.h> #include <LibJS/Heap.h>
#include <LibJS/HeapBlock.h> #include <LibJS/HeapBlock.h>
@ -72,7 +73,7 @@ void Heap::collect_garbage()
void Heap::collect_roots(HashTable<Cell*>& roots) void Heap::collect_roots(HashTable<Cell*>& roots)
{ {
roots.set(&m_interpreter.global_object()); m_interpreter.collect_roots({}, roots);
#ifdef HEAP_DEBUG #ifdef HEAP_DEBUG
dbg() << "collect_roots:"; dbg() << "collect_roots:";

13
Libraries/LibJS/Interpreter.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <AK/Badge.h>
#include <LibJS/AST.h> #include <LibJS/AST.h>
#include <LibJS/Interpreter.h> #include <LibJS/Interpreter.h>
#include <LibJS/Object.h> #include <LibJS/Object.h>
@ -100,4 +101,16 @@ Value Interpreter::get_variable(const String& name)
return global_object().get(name); return global_object().get(name);
} }
void Interpreter::collect_roots(Badge<Heap>, HashTable<Cell*>& roots)
{
roots.set(m_global_object);
for (auto& scope : m_scope_stack) {
for (auto& it : scope.variables) {
if (it.value.is_object())
roots.set(it.value.as_object());
}
}
}
} }

2
Libraries/LibJS/Interpreter.h
View file

@ -56,6 +56,8 @@ public:
void set_variable(String name, Value); void set_variable(String name, Value);
void declare_variable(String name); void declare_variable(String name);
void collect_roots(Badge<Heap>, HashTable<Cell*>&);
private: private:
void enter_scope(const ScopeNode&); void enter_scope(const ScopeNode&);
void exit_scope(const ScopeNode&); void exit_scope(const ScopeNode&);