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

LibJS: Remove a bunch of unnecessary uses of Cell::interpreter()

Browse source 
We'll want to get rid of all uses of this, to free up the engine from
the old assumption that there's always an Interpreter available.
This commit is contained in:
Andreas Kling 2020-09-27 20:07:25 +02:00
parent 591b7b7031
commit 063acda76e
9 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibJS/Runtime/Array.cpp
View file

@ -25,7 +25,6 @@
*/ */
#include <AK/Function.h> #include <AK/Function.h>
#include <LibJS/Interpreter.h>
#include <LibJS/Runtime/Array.h> #include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/ArrayPrototype.h> #include <LibJS/Runtime/ArrayPrototype.h>
#include <LibJS/Runtime/Error.h> #include <LibJS/Runtime/Error.h>
@ -35,8 +34,7 @@ namespace JS {
Array* Array::create(GlobalObject& global_object) Array* Array::create(GlobalObject& global_object)
{ {
auto& interpreter = global_object.interpreter(); return global_object.heap().allocate<Array>(global_object, *global_object.array_prototype());
return interpreter.heap().allocate<Array>(global_object, *global_object.array_prototype());
} }
Array::Array(Object& prototype) Array::Array(Object& prototype)

4
Libraries/LibJS/Runtime/BooleanObject.cpp
View file

@ -24,7 +24,6 @@
* 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 <LibJS/Interpreter.h>
#include <LibJS/Runtime/BooleanObject.h> #include <LibJS/Runtime/BooleanObject.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
@ -32,8 +31,7 @@ namespace JS {
BooleanObject* BooleanObject::create(GlobalObject& global_object, bool value) BooleanObject* BooleanObject::create(GlobalObject& global_object, bool value)
{ {
auto& interpreter = global_object.interpreter(); return global_object.heap().allocate<BooleanObject>(global_object, value, *global_object.boolean_prototype());
return interpreter.heap().allocate<BooleanObject>(global_object, value, *global_object.boolean_prototype());
} }
BooleanObject::BooleanObject(bool value, Object& prototype) BooleanObject::BooleanObject(bool value, Object& prototype)

4
Libraries/LibJS/Runtime/Error.cpp
View file

@ -24,7 +24,6 @@
* 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 <LibJS/Interpreter.h>
#include <LibJS/Runtime/Error.h> #include <LibJS/Runtime/Error.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
@ -32,8 +31,7 @@ namespace JS {
Error* Error::create(GlobalObject& global_object, const FlyString& name, const String& message) Error* Error::create(GlobalObject& global_object, const FlyString& name, const String& message)
{ {
auto& interpreter = global_object.interpreter(); return global_object.heap().allocate<Error>(global_object, name, message, *global_object.error_prototype());
return interpreter.heap().allocate<Error>(global_object, name, message, *global_object.error_prototype());
} }
Error::Error(const FlyString& name, const String& message, Object& prototype) Error::Error(const FlyString& name, const String& message, Object& prototype)

6
Libraries/LibJS/Runtime/Function.cpp
View file

@ -67,14 +67,14 @@ BoundFunction* Function::bind(Value bound_this_value, Vector<Value> arguments)
i32 computed_length = 0; i32 computed_length = 0;
auto length_property = get("length"); auto length_property = get("length");
if (interpreter().exception()) if (vm().exception())
return nullptr; return nullptr;
if (length_property.is_number()) if (length_property.is_number())
computed_length = max(0, length_property.as_i32() - static_cast<i32>(arguments.size())); computed_length = max(0, length_property.as_i32() - static_cast<i32>(arguments.size()));
Object* constructor_prototype = nullptr; Object* constructor_prototype = nullptr;
auto prototype_property = target_function.get("prototype"); auto prototype_property = target_function.get("prototype");
if (interpreter().exception()) if (vm().exception())
return nullptr; return nullptr;
if (prototype_property.is_object()) if (prototype_property.is_object())
constructor_prototype = &prototype_property.as_object(); constructor_prototype = &prototype_property.as_object();
@ -82,7 +82,7 @@ BoundFunction* Function::bind(Value bound_this_value, Vector<Value> arguments)
auto all_bound_arguments = bound_arguments(); auto all_bound_arguments = bound_arguments();
all_bound_arguments.append(move(arguments)); all_bound_arguments.append(move(arguments));
return interpreter().heap().allocate<BoundFunction>(global_object(), global_object(), target_function, bound_this_object, move(all_bound_arguments), computed_length, constructor_prototype); return heap().allocate<BoundFunction>(global_object(), global_object(), target_function, bound_this_object, move(all_bound_arguments), computed_length, constructor_prototype);
} }
void Function::visit_children(Visitor& visitor) void Function::visit_children(Visitor& visitor)

4
Libraries/LibJS/Runtime/LexicalEnvironment.cpp
View file

@ -118,7 +118,7 @@ Value LexicalEnvironment::get_this_binding() const
{ {
ASSERT(has_this_binding()); ASSERT(has_this_binding());
if (this_binding_status() == ThisBindingStatus::Uninitialized) { if (this_binding_status() == ThisBindingStatus::Uninitialized) {
interpreter().vm().throw_exception<ReferenceError>(interpreter().global_object(), ErrorType::ThisHasNotBeenInitialized); vm().throw_exception<ReferenceError>(interpreter().global_object(), ErrorType::ThisHasNotBeenInitialized);
return {}; return {};
} }
return m_this_value; return m_this_value;
@ -128,7 +128,7 @@ void LexicalEnvironment::bind_this_value(Value this_value)
{ {
ASSERT(has_this_binding()); ASSERT(has_this_binding());
if (m_this_binding_status == ThisBindingStatus::Initialized) { if (m_this_binding_status == ThisBindingStatus::Initialized) {
interpreter().vm().throw_exception<ReferenceError>(interpreter().global_object(), ErrorType::ThisIsAlreadyInitialized); vm().throw_exception<ReferenceError>(interpreter().global_object(), ErrorType::ThisIsAlreadyInitialized);
return; return;
} }
m_this_value = this_value; m_this_value = this_value;

2
Libraries/LibJS/Runtime/NativeFunction.cpp
View file

@ -70,7 +70,7 @@ Value NativeFunction::construct(Function&)
LexicalEnvironment* NativeFunction::create_environment() LexicalEnvironment* NativeFunction::create_environment()
{ {
return interpreter().heap().allocate<LexicalEnvironment>(global_object(), LexicalEnvironment::EnvironmentRecordType::Function); return heap().allocate<LexicalEnvironment>(global_object(), LexicalEnvironment::EnvironmentRecordType::Function);
} }
} }

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

@ -547,7 +547,7 @@ bool Object::put_own_property_by_index(Object& this_object, u32 property_index,
dbg() << "Disallow define_property of non-extensible object"; dbg() << "Disallow define_property of non-extensible object";
#endif #endif
if (throw_exceptions && interpreter().in_strict_mode()) if (throw_exceptions && interpreter().in_strict_mode())
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::NonExtensibleDefine, property_index); vm().throw_exception<TypeError>(global_object(), ErrorType::NonExtensibleDefine, property_index);
return false; return false;
} }
@ -566,7 +566,7 @@ bool Object::put_own_property_by_index(Object& this_object, u32 property_index,
dbg() << "Disallow reconfig of non-configurable property"; dbg() << "Disallow reconfig of non-configurable property";
#endif #endif
if (throw_exceptions) if (throw_exceptions)
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::DescChangeNonConfigurable, property_index); vm().throw_exception<TypeError>(global_object(), ErrorType::DescChangeNonConfigurable, property_index);
return false; return false;
} }

2
Libraries/LibJS/Runtime/ScriptFunction.cpp
View file

@ -53,7 +53,7 @@ ScriptFunction* ScriptFunction::create(GlobalObject& global_object, const FlyStr
} }
ScriptFunction::ScriptFunction(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector<FunctionNode::Parameter> parameters, i32 m_function_length, LexicalEnvironment* parent_environment, Object& prototype, bool is_arrow_function) ScriptFunction::ScriptFunction(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector<FunctionNode::Parameter> parameters, i32 m_function_length, LexicalEnvironment* parent_environment, Object& prototype, bool is_arrow_function)
: Function(prototype, is_arrow_function ? interpreter().this_value(global_object) : Value(), {}) : Function(prototype, is_arrow_function ? vm().this_value(global_object) : Value(), {})
, m_name(name) , m_name(name)
, m_body(body) , m_body(body)
, m_parameters(move(parameters)) , m_parameters(move(parameters))

4
Libraries/LibJS/Runtime/Uint8ClampedArray.cpp
View file

@ -25,7 +25,6 @@
*/ */
#include <AK/Function.h> #include <AK/Function.h>
#include <LibJS/Interpreter.h>
#include <LibJS/Runtime/Error.h> #include <LibJS/Runtime/Error.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Uint8ClampedArray.h> #include <LibJS/Runtime/Uint8ClampedArray.h>
@ -34,8 +33,7 @@ namespace JS {
Uint8ClampedArray* Uint8ClampedArray::create(GlobalObject& global_object, u32 length) Uint8ClampedArray* Uint8ClampedArray::create(GlobalObject& global_object, u32 length)
{ {
auto& interpreter = global_object.interpreter(); return global_object.heap().allocate<Uint8ClampedArray>(global_object, length, *global_object.array_prototype());
return interpreter.heap().allocate<Uint8ClampedArray>(global_object, length, *global_object.array_prototype());
} }
Uint8ClampedArray::Uint8ClampedArray(u32 length, Object& prototype) Uint8ClampedArray::Uint8ClampedArray(u32 length, Object& prototype)