LibJS/Bytecode: Make typeof return "undefined" on unresolvable IDs

Previously it would throw instead of returning "undefined" for
`typeof Identifier` if Identifier does not exist.
This commit is contained in:
Luke Wilde 2022-06-11 23:12:22 +01:00 committed by Ali Mohammad Pur
parent c0fadfb9b7
commit 482a827346
Notes: sideshowbarker 2024-07-17 10:18:13 +09:00
4 changed files with 55 additions and 1 deletions

View file

@ -436,7 +436,9 @@ Bytecode::CodeGenerationErrorOr<void> UnaryExpression::generate_bytecode(Bytecod
if (m_op == UnaryOp::Delete)
return generator.emit_delete_reference(m_lhs);
TRY(m_lhs->generate_bytecode(generator));
// Typeof needs some special handling for when the LHS is an Identifier. Namely, it shouldn't throw on unresolvable references, but instead return "undefined".
if (m_op != UnaryOp::Typeof)
TRY(m_lhs->generate_bytecode(generator));
switch (m_op) {
case UnaryOp::BitwiseNot:
@ -452,6 +454,13 @@ Bytecode::CodeGenerationErrorOr<void> UnaryExpression::generate_bytecode(Bytecod
generator.emit<Bytecode::Op::UnaryMinus>();
break;
case UnaryOp::Typeof:
if (is<Identifier>(*m_lhs)) {
auto& identifier = static_cast<Identifier const&>(*m_lhs);
generator.emit<Bytecode::Op::TypeofVariable>(generator.intern_identifier(identifier.string()));
break;
}
TRY(m_lhs->generate_bytecode(generator));
generator.emit<Bytecode::Op::Typeof>();
break;
case UnaryOp::Void:

View file

@ -82,6 +82,7 @@
O(Sub) \
O(Throw) \
O(Typeof) \
O(TypeofVariable) \
O(UnaryMinus) \
O(UnaryPlus) \
O(UnsignedRightShift) \

View file

@ -764,6 +764,29 @@ ThrowCompletionOr<void> NewClass::execute_impl(Bytecode::Interpreter& interprete
return {};
}
// 13.5.3.1 Runtime Semantics: Evaluation, https://tc39.es/ecma262/#sec-typeof-operator-runtime-semantics-evaluation
ThrowCompletionOr<void> TypeofVariable::execute_impl(Bytecode::Interpreter& interpreter) const
{
// 1. Let val be the result of evaluating UnaryExpression.
auto const& string = interpreter.current_executable().get_identifier(m_identifier);
auto reference = TRY(interpreter.vm().resolve_binding(string));
// 2. If val is a Reference Record, then
// a. If IsUnresolvableReference(val) is true, return "undefined".
if (reference.is_unresolvable()) {
interpreter.accumulator() = js_string(interpreter.vm(), "undefined"sv);
return {};
}
// 3. Set val to ? GetValue(val).
auto value = TRY(reference.get_value(interpreter.global_object()));
// 4. NOTE: This step is replaced in section B.3.6.3.
// 5. Return a String according to Table 41.
interpreter.accumulator() = js_string(interpreter.vm(), value.typeof());
return {};
}
String Load::to_string_impl(Bytecode::Executable const&) const
{
return String::formatted("Load {}", m_src);
@ -1076,4 +1099,9 @@ String GetNewTarget::to_string_impl(Bytecode::Executable const&) const
return "GetNewTarget"sv;
}
String TypeofVariable::to_string_impl(Bytecode::Executable const& executable) const
{
return String::formatted("TypeofVariable {} ({})", m_identifier, executable.identifier_table->get(m_identifier));
}
}

View file

@ -910,6 +910,22 @@ public:
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
};
class TypeofVariable final : public Instruction {
public:
explicit TypeofVariable(IdentifierTableIndex identifier)
: Instruction(Type::TypeofVariable)
, m_identifier(identifier)
{
}
ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
String to_string_impl(Bytecode::Executable const&) const;
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
private:
IdentifierTableIndex m_identifier;
};
}
namespace JS::Bytecode {