LibJS: Remove GlobalObject& argument from VM::construct()

We can just get the global object from the constructor function.
This commit is contained in:
Andreas Kling 2021-06-10 23:17:29 +02:00
parent f5feb1d2cd
commit 93a07ba962
Notes: sideshowbarker 2024-07-18 12:28:36 +09:00
6 changed files with 9 additions and 8 deletions

View file

@ -222,7 +222,7 @@ Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_obj
Object* new_object = nullptr;
Value result;
if (is<NewExpression>(*this)) {
result = vm.construct(function, function, move(arguments), global_object);
result = vm.construct(function, function, move(arguments));
if (result.is_object())
new_object = &result.as_object();
} else if (is<SuperExpression>(*m_callee)) {
@ -239,7 +239,7 @@ Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_obj
vm.throw_exception<TypeError>(global_object, ErrorType::NotAConstructor, "Super constructor");
return {};
}
result = vm.construct(static_cast<Function&>(*super_constructor), function, move(arguments), global_object);
result = vm.construct(static_cast<Function&>(*super_constructor), function, move(arguments));
if (vm.exception())
return {};

View file

@ -209,7 +209,7 @@ void Call::execute(Bytecode::Interpreter& interpreter) const
if (m_type == CallType::Call)
return_value = interpreter.vm().call(function, this_value, move(argument_values));
else
return_value = interpreter.vm().construct(function, function, move(argument_values), interpreter.global_object());
return_value = interpreter.vm().construct(function, function, move(argument_values));
}
interpreter.accumulator() = return_value;

View file

@ -45,7 +45,7 @@ PromiseCapability new_promise_capability(GlobalObject& global_object, Value cons
MarkedValueList arguments(vm.heap());
arguments.append(executor);
auto promise = vm.construct(constructor.as_function(), constructor.as_function(), move(arguments), global_object);
auto promise = vm.construct(constructor.as_function(), constructor.as_function(), move(arguments));
if (vm.exception())
return {};

View file

@ -96,7 +96,7 @@ JS_DEFINE_NATIVE_FUNCTION(ReflectObject::construct)
}
new_target = &new_target_value.as_function();
}
return vm.construct(*target, *new_target, move(arguments), global_object);
return vm.construct(*target, *new_target, move(arguments));
}
JS_DEFINE_NATIVE_FUNCTION(ReflectObject::define_property)

View file

@ -378,15 +378,16 @@ Reference VM::get_reference(const FlyString& name)
return { Reference::GlobalVariable, name };
}
Value VM::construct(Function& function, Function& new_target, Optional<MarkedValueList> arguments, GlobalObject& global_object)
Value VM::construct(Function& function, Function& new_target, Optional<MarkedValueList> arguments)
{
auto& global_object = function.global_object();
CallFrame call_frame;
call_frame.callee = &function;
if (auto* interpreter = interpreter_if_exists())
call_frame.current_node = interpreter->current_node();
call_frame.is_strict_mode = function.is_strict_mode();
push_call_frame(call_frame, function.global_object());
push_call_frame(call_frame, global_object);
if (exception())
return {};
ArmedScopeGuard call_frame_popper = [&] {

View file

@ -213,7 +213,7 @@ public:
return throw_exception(global_object, T::create(global_object, String::formatted(type.message(), forward<Args>(args)...)));
}
Value construct(Function&, Function& new_target, Optional<MarkedValueList> arguments, GlobalObject&);
Value construct(Function&, Function& new_target, Optional<MarkedValueList> arguments);
String join_arguments(size_t start_index = 0) const;