RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:07:45 +00:00
Code Issues Activity Actions

LibJS: Move the empty object shape from Interpreter to GlobalObject

Browse source 
The big remaining hurdle before a GlobalObject-agnostic Interpreter is
the fact that Interpreter owns and vends the GlobalObject :^)
This commit is contained in:
Andreas Kling 2020-04-18 13:56:13 +02:00
parent 75f6454de7
commit 3072f9fd82
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibJS/Runtime/GlobalObject.cpp
View file

@ -72,6 +72,7 @@ GlobalObject::GlobalObject()
void GlobalObject::initialize()
{
// These are done first since other prototypes depend on their presence.
m_empty_object_shape = heap().allocate<Shape>();
m_object_prototype = heap().allocate<ObjectPrototype>();
m_function_prototype = heap().allocate<FunctionPrototype>();
@ -119,6 +120,8 @@ void GlobalObject::visit_children(Visitor& visitor)
{
Object::visit_children(visitor);
visitor.visit(m_empty_object_shape);
#define __JS_ENUMERATE(ClassName, snake_name, PrototypeName, ConstructorName) \
visitor.visit(m_##snake_name##_constructor);
JS_ENUMERATE_ERROR_SUBCLASSES

4
Libraries/LibJS/Runtime/GlobalObject.h
View file

@ -37,6 +37,8 @@ public:
virtual ~GlobalObject() override;
Shape* empty_object_shape() { return m_empty_object_shape; }
#define __JS_ENUMERATE(ClassName, snake_name, PrototypeName, ConstructorName) \
ConstructorName* snake_name##_constructor() { return m_##snake_name##_constructor; } \
Object* snake_name##_prototype() { return m_##snake_name##_prototype; }
@ -55,6 +57,8 @@ private:
template<typename ConstructorType>
void add_constructor(const FlyString& property_name, ConstructorType*&, Object& prototype);
Shape* m_empty_object_shape { nullptr };
#define __JS_ENUMERATE(ClassName, snake_name, PrototypeName, ConstructorName) \
ConstructorName* m_##snake_name##_constructor { nullptr }; \
Object* m_##snake_name##_prototype { nullptr };

8
Libraries/LibJS/Runtime/Object.cpp
View file

@ -45,8 +45,12 @@ Object* Object::create_empty(Interpreter&, GlobalObject& global_object)
Object::Object(Object* prototype)
{
m_shape = interpreter().empty_object_shape();
set_prototype(prototype);
if (prototype) {
m_shape = interpreter().global_object().empty_object_shape();
set_prototype(prototype);
} else {
m_shape = interpreter().heap().allocate<Shape>();
}
}
Object::~Object()