RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-30 10:02:12 +00:00
Code Issues Activity Actions

LibJS: Use GlobalObject::associated_realm() for function object realms

Browse source 
As outlined in the previous commit, this should be more reliable than
Interpreter::realm(), as we don't always have access to an Interpreter.
This commit is contained in:
Linus Groh 2021-10-14 12:06:08 +01:00
parent cbbf4abb0d
commit 0241071ca2
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp
View file

@ -43,7 +43,7 @@ ECMAScriptFunctionObject::ECMAScriptFunctionObject(FlyString name, Statement con
, m_environment(parent_scope) , m_environment(parent_scope)
, m_formal_parameters(move(formal_parameters)) , m_formal_parameters(move(formal_parameters))
, m_ecmascript_code(ecmascript_code) , m_ecmascript_code(ecmascript_code)
, m_realm(vm().interpreter_if_exists() ? &vm().interpreter().realm() : nullptr) , m_realm(global_object().associated_realm())
, m_strict(strict) , m_strict(strict)
, m_name(move(name)) , m_name(move(name))
, m_function_length(function_length) , m_function_length(function_length)

6
Userland/Libraries/LibJS/Runtime/NativeFunction.cpp
View file

@ -24,7 +24,7 @@ NativeFunction* NativeFunction::create(GlobalObject& global_object, const FlyStr
NativeFunction::NativeFunction(Object& prototype) NativeFunction::NativeFunction(Object& prototype)
: FunctionObject(prototype) : FunctionObject(prototype)
, m_realm(vm().interpreter_if_exists() ? &vm().interpreter().realm() : nullptr) , m_realm(global_object().associated_realm())
{ {
} }
@ -32,14 +32,14 @@ NativeFunction::NativeFunction(FlyString name, Function<Value(VM&, GlobalObject&
: FunctionObject(prototype) : FunctionObject(prototype)
, m_name(move(name)) , m_name(move(name))
, m_native_function(move(native_function)) , m_native_function(move(native_function))
, m_realm(vm().interpreter_if_exists() ? &vm().interpreter().realm() : nullptr) , m_realm(global_object().associated_realm())
{ {
} }
NativeFunction::NativeFunction(FlyString name, Object& prototype) NativeFunction::NativeFunction(FlyString name, Object& prototype)
: FunctionObject(prototype) : FunctionObject(prototype)
, m_name(move(name)) , m_name(move(name))
, m_realm(vm().interpreter_if_exists() ? &vm().interpreter().realm() : nullptr) , m_realm(global_object().associated_realm())
{ {
} }