beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibJS: Create new object earlier in VM::construct()

Browse source 
Also make use of OrdinaryCreateFromConstructor() instead of setting
the prototype manually.

This fixes 2 function tests in test262. :^)
This commit is contained in:
Andreas Kling 2021-06-25 23:41:24 +02:00
parent 8fe52b8306
commit 6d7d8f3db9
Notes: sideshowbarker 2024-07-18 11:30:22 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/6d7d8f3db97
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibJS/Runtime/VM.cpp
View file

@ -408,6 +408,14 @@ Reference VM::resolve_binding(GlobalObject& global_object, FlyString const& name
Value VM::construct(Function& function, Function& new_target, Optional<MarkedValueList> arguments)
{
auto& global_object = function.global_object();
Value this_argument;
if (function.constructor_kind() == Function::ConstructorKind::Base) {
this_argument = ordinary_create_from_constructor<Object>(global_object, new_target, &GlobalObject::object_prototype);
if (exception())
return {};
}
ExecutionContext callee_context;
callee_context.function = &function;
if (auto* interpreter = interpreter_if_exists())
@ -428,31 +436,20 @@ Value VM::construct(Function& function, Function& new_target, Optional<MarkedVal
auto* environment = function.create_environment_record(function);
callee_context.lexical_environment = environment;
callee_context.variable_environment = environment;
if (environment)
if (environment) {
environment->set_new_target(&new_target);
Object* new_object = nullptr;
if (function.constructor_kind() == Function::ConstructorKind::Base) {
new_object = Object::create(global_object, nullptr);
if (environment)
environment->bind_this_value(global_object, new_object);
if (exception())
return {};
auto prototype = new_target.get(names.prototype);
if (exception())
return {};
if (prototype.is_object()) {
new_object->set_prototype(&prototype.as_object());
if (!this_argument.is_empty()) {
environment->bind_this_value(global_object, this_argument);
if (exception())
return {};
}
}
// If we are a Derived constructor, |this| has not been constructed before super is called.
Value this_value = function.constructor_kind() == Function::ConstructorKind::Base ? new_object : Value {};
callee_context.this_value = this_value;
callee_context.this_value = this_argument;
auto result = function.construct(new_target);
Value this_value = this_argument;
if (environment)
this_value = environment->get_this_binding(global_object);
pop_execution_context();