mirror of
https://github.com/RGBCube/serenity
synced 2025-07-22 22:27:39 +00:00
LibJS: Evaluate NewExpression arguments before checking constructor type
Exactly like in 99f9609
, which fixed the same issue in CallExpression,
the spec tells us to *first* evaluate the arguments, if any, and *then*
check if the provided value is a constructor function.
This commit is contained in:
parent
d636f7703d
commit
87068896d0
2 changed files with 74 additions and 31 deletions
|
@ -261,27 +261,35 @@ static void argument_list_evaluation(Interpreter& interpreter, GlobalObject& glo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 13.3.5.1 Runtime Semantics: Evaluation, https://tc39.es/ecma262/#sec-new-operator-runtime-semantics-evaluation
|
||||||
|
// 13.3.5.1.1 EvaluateNew ( constructExpr, arguments ), https://tc39.es/ecma262/#sec-evaluatenew
|
||||||
Value NewExpression::execute(Interpreter& interpreter, GlobalObject& global_object) const
|
Value NewExpression::execute(Interpreter& interpreter, GlobalObject& global_object) const
|
||||||
{
|
{
|
||||||
InterpreterNodeScope node_scope { interpreter, *this };
|
InterpreterNodeScope node_scope { interpreter, *this };
|
||||||
auto& vm = interpreter.vm();
|
auto& vm = interpreter.vm();
|
||||||
|
|
||||||
auto callee_value = m_callee->execute(interpreter, global_object);
|
// 1. Let ref be the result of evaluating constructExpr.
|
||||||
|
// 2. Let constructor be ? GetValue(ref).
|
||||||
|
auto constructor = m_callee->execute(interpreter, global_object);
|
||||||
if (vm.exception())
|
if (vm.exception())
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
if (!callee_value.is_function() || !callee_value.as_function().has_constructor()) {
|
// 3. If arguments is empty, let argList be a new empty List.
|
||||||
throw_type_error_for_callee(interpreter, global_object, callee_value, "constructor"sv);
|
// 4. Else,
|
||||||
return {};
|
// a. Let argList be ? ArgumentListEvaluation of arguments.
|
||||||
}
|
|
||||||
|
|
||||||
MarkedValueList arg_list(vm.heap());
|
MarkedValueList arg_list(vm.heap());
|
||||||
argument_list_evaluation(interpreter, global_object, m_arguments, arg_list);
|
argument_list_evaluation(interpreter, global_object, m_arguments, arg_list);
|
||||||
if (interpreter.exception())
|
if (interpreter.exception())
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
auto& function = callee_value.as_function();
|
// 5. If IsConstructor(constructor) is false, throw a TypeError exception.
|
||||||
return TRY_OR_DISCARD(construct(global_object, function, move(arg_list)));
|
if (!constructor.is_constructor()) {
|
||||||
|
throw_type_error_for_callee(interpreter, global_object, constructor, "constructor"sv);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. Return ? Construct(constructor, argList).
|
||||||
|
return TRY_OR_DISCARD(construct(global_object, constructor.as_function(), move(arg_list)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CallExpression::throw_type_error_for_callee(Interpreter& interpreter, GlobalObject& global_object, Value callee_value, StringView call_type) const
|
void CallExpression::throw_type_error_for_callee(Interpreter& interpreter, GlobalObject& global_object, Value callee_value, StringView call_type) const
|
||||||
|
|
|
@ -1,22 +1,23 @@
|
||||||
test("callee is evaluated before arguments", () => {
|
describe("CallExpression", () => {
|
||||||
|
test("callee is evaluated before arguments", () => {
|
||||||
function foo() {}
|
function foo() {}
|
||||||
const values = [];
|
const values = [];
|
||||||
|
|
||||||
[foo][(values.push("callee"), 0)](values.push("args"));
|
[foo][(values.push("callee"), 0)](values.push("args"));
|
||||||
|
|
||||||
expect(values).toEqual(["callee", "args"]);
|
expect(values).toEqual(["callee", "args"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("arguments are evaluated in order", () => {
|
test("arguments are evaluated in order", () => {
|
||||||
function foo() {}
|
function foo() {}
|
||||||
const values = [];
|
const values = [];
|
||||||
|
|
||||||
foo(values.push("arg1"), values.push("arg2"), values.push("arg3"));
|
foo(values.push("arg1"), values.push("arg2"), values.push("arg3"));
|
||||||
|
|
||||||
expect(values).toEqual(["arg1", "arg2", "arg3"]);
|
expect(values).toEqual(["arg1", "arg2", "arg3"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("arguments are evaluated before callee is checked for its type", () => {
|
test("arguments are evaluated before callee is checked for its type", () => {
|
||||||
const values = [];
|
const values = [];
|
||||||
|
|
||||||
expect(() => {
|
expect(() => {
|
||||||
|
@ -27,4 +28,38 @@ test("arguments are evaluated before callee is checked for its type", () => {
|
||||||
expect(() => {
|
expect(() => {
|
||||||
"foo"(bar);
|
"foo"(bar);
|
||||||
}).toThrowWithMessage(ReferenceError, "'bar' is not defined");
|
}).toThrowWithMessage(ReferenceError, "'bar' is not defined");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("NewExpression", () => {
|
||||||
|
test("callee is evaluated before arguments", () => {
|
||||||
|
function Foo() {}
|
||||||
|
const values = [];
|
||||||
|
|
||||||
|
new [Foo][(values.push("callee"), 0)](values.push("args"));
|
||||||
|
|
||||||
|
expect(values).toEqual(["callee", "args"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("arguments are evaluated in order", () => {
|
||||||
|
function Foo() {}
|
||||||
|
const values = [];
|
||||||
|
|
||||||
|
new Foo(values.push("arg1"), values.push("arg2"), values.push("arg3"));
|
||||||
|
|
||||||
|
expect(values).toEqual(["arg1", "arg2", "arg3"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("arguments are evaluated before callee is checked for its type", () => {
|
||||||
|
const values = [];
|
||||||
|
|
||||||
|
expect(() => {
|
||||||
|
new "Foo"(values.push("args"));
|
||||||
|
}).toThrowWithMessage(TypeError, "Foo is not a constructor");
|
||||||
|
expect(values).toEqual(["args"]);
|
||||||
|
|
||||||
|
expect(() => {
|
||||||
|
new "Foo"(bar);
|
||||||
|
}).toThrowWithMessage(ReferenceError, "'bar' is not defined");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue