RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-21 15:05:07 +00:00
Code Issues Activity Actions

LibJS: Use correct this value when callee is a with binding

Browse source 
If we're inside of a `with` statement scope, we have to take care to
extract the correct `this` value for use in calls when calling a method
on the binding object via an Identifier instead of a MemberExpression.

This makes Vue.js work way better in the bytecode VM. :^)

Also, 1 new pass on test262.
This commit is contained in:
Andreas Kling 2023-08-01 14:33:58 +02:00
parent e61fdd1dc6
commit e91bdedc93
4 changed files with 186 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
View file

@ -1526,6 +1526,19 @@ Bytecode::CodeGenerationErrorOr<void> CallExpression::generate_bytecode(Bytecode
} else if (is<OptionalChain>(*m_callee)) { } else if (is<OptionalChain>(*m_callee)) {
auto& optional_chain = static_cast<OptionalChain const&>(*m_callee); auto& optional_chain = static_cast<OptionalChain const&>(*m_callee);
TRY(generate_optional_chain(generator, optional_chain, callee_reg, this_reg)); TRY(generate_optional_chain(generator, optional_chain, callee_reg, this_reg));
} else if (is<Identifier>(*m_callee)) {
// If the callee is an identifier, we may need to extract a `this` value.
// This is important when we're inside a `with` statement and calling a method on
// the environment's binding object.
// NOTE: If the identifier refers to a known "local" or "global", we know it can't be
// a `with` binding, so we can skip this.
auto& identifier = static_cast<Identifier const&>(*m_callee);
if (!identifier.is_local() && !identifier.is_global()) {
generator.emit<Bytecode::Op::GetCalleeAndThisFromEnvironment>(generator.intern_identifier(identifier.string()), callee_reg, this_reg);
} else {
TRY(m_callee->generate_bytecode(generator));
generator.emit<Bytecode::Op::Store>(callee_reg);
}
} else { } else {
// FIXME: this = global object in sloppy mode. // FIXME: this = global object in sloppy mode.
TRY(m_callee->generate_bytecode(generator)); TRY(m_callee->generate_bytecode(generator));

209
Userland/Libraries/LibJS/Bytecode/Instruction.h
View file

@ -10,110 +10,111 @@
#include <AK/Span.h> #include <AK/Span.h>
#include <LibJS/Forward.h> #include <LibJS/Forward.h>
#define ENUMERATE_BYTECODE_OPS(O) \ #define ENUMERATE_BYTECODE_OPS(O) \
O(Add) \ O(Add) \
O(Append) \ O(Append) \
O(AsyncIteratorClose) \ O(AsyncIteratorClose) \
O(Await) \ O(Await) \
O(BitwiseAnd) \ O(BitwiseAnd) \
O(BitwiseNot) \ O(BitwiseNot) \
O(BitwiseOr) \ O(BitwiseOr) \
O(BitwiseXor) \ O(BitwiseXor) \
O(BlockDeclarationInstantiation) \ O(BlockDeclarationInstantiation) \
O(Call) \ O(Call) \
O(CallWithArgumentArray) \ O(CallWithArgumentArray) \
O(ConcatString) \ O(ConcatString) \
O(ContinuePendingUnwind) \ O(ContinuePendingUnwind) \
O(CopyObjectExcludingProperties) \ O(CopyObjectExcludingProperties) \
O(CreateLexicalEnvironment) \ O(CreateLexicalEnvironment) \
O(CreateVariable) \ O(CreateVariable) \
O(Decrement) \ O(Decrement) \
O(DeleteById) \ O(DeleteById) \
O(DeleteByIdWithThis) \ O(DeleteByIdWithThis) \
O(DeleteByValue) \ O(DeleteByValue) \
O(DeleteByValueWithThis) \ O(DeleteByValueWithThis) \
O(DeleteVariable) \ O(DeleteVariable) \
O(Div) \ O(Div) \
O(EnterUnwindContext) \ O(EnterUnwindContext) \
O(EnterObjectEnvironment) \ O(EnterObjectEnvironment) \
O(Exp) \ O(Exp) \
O(GetById) \ O(GetById) \
O(GetByIdWithThis) \ O(GetByIdWithThis) \
O(GetByValue) \ O(GetByValue) \
O(GetByValueWithThis) \ O(GetByValueWithThis) \
O(GetIterator) \ O(GetCalleeAndThisFromEnvironment) \
O(GetMethod) \ O(GetIterator) \
O(GetNewTarget) \ O(GetMethod) \
O(GetImportMeta) \ O(GetNewTarget) \
O(GetObjectPropertyIterator) \ O(GetImportMeta) \
O(GetPrivateById) \ O(GetObjectPropertyIterator) \
O(GetVariable) \ O(GetPrivateById) \
O(GetGlobal) \ O(GetVariable) \
O(GetLocal) \ O(GetGlobal) \
O(GreaterThan) \ O(GetLocal) \
O(GreaterThanEquals) \ O(GreaterThan) \
O(HasPrivateId) \ O(GreaterThanEquals) \
O(ImportCall) \ O(HasPrivateId) \
O(In) \ O(ImportCall) \
O(Increment) \ O(In) \
O(InstanceOf) \ O(Increment) \
O(IteratorClose) \ O(InstanceOf) \
O(IteratorNext) \ O(IteratorClose) \
O(IteratorResultDone) \ O(IteratorNext) \
O(IteratorResultValue) \ O(IteratorResultDone) \
O(IteratorToArray) \ O(IteratorResultValue) \
O(Jump) \ O(IteratorToArray) \
O(JumpConditional) \ O(Jump) \
O(JumpNullish) \ O(JumpConditional) \
O(JumpUndefined) \ O(JumpNullish) \
O(LeaveLexicalEnvironment) \ O(JumpUndefined) \
O(LeaveUnwindContext) \ O(LeaveLexicalEnvironment) \
O(LeftShift) \ O(LeaveUnwindContext) \
O(LessThan) \ O(LeftShift) \
O(LessThanEquals) \ O(LessThan) \
O(Load) \ O(LessThanEquals) \
O(LoadImmediate) \ O(Load) \
O(LooselyEquals) \ O(LoadImmediate) \
O(LooselyInequals) \ O(LooselyEquals) \
O(Mod) \ O(LooselyInequals) \
O(Mul) \ O(Mod) \
O(NewArray) \ O(Mul) \
O(NewBigInt) \ O(NewArray) \
O(NewClass) \ O(NewBigInt) \
O(NewFunction) \ O(NewClass) \
O(NewObject) \ O(NewFunction) \
O(NewRegExp) \ O(NewObject) \
O(NewString) \ O(NewRegExp) \
O(NewTypeError) \ O(NewString) \
O(Not) \ O(NewTypeError) \
O(PushDeclarativeEnvironment) \ O(Not) \
O(PutById) \ O(PushDeclarativeEnvironment) \
O(PutByIdWithThis) \ O(PutById) \
O(PutByValue) \ O(PutByIdWithThis) \
O(PutByValueWithThis) \ O(PutByValue) \
O(PutPrivateById) \ O(PutByValueWithThis) \
O(ResolveThisBinding) \ O(PutPrivateById) \
O(ResolveSuperBase) \ O(ResolveThisBinding) \
O(Return) \ O(ResolveSuperBase) \
O(RightShift) \ O(Return) \
O(ScheduleJump) \ O(RightShift) \
O(SetVariable) \ O(ScheduleJump) \
O(SetLocal) \ O(SetVariable) \
O(Store) \ O(SetLocal) \
O(StrictlyEquals) \ O(Store) \
O(StrictlyInequals) \ O(StrictlyEquals) \
O(Sub) \ O(StrictlyInequals) \
O(SuperCallWithArgumentArray) \ O(Sub) \
O(Throw) \ O(SuperCallWithArgumentArray) \
O(ThrowIfNotObject) \ O(Throw) \
O(ThrowIfNullish) \ O(ThrowIfNotObject) \
O(ToNumeric) \ O(ThrowIfNullish) \
O(Typeof) \ O(ToNumeric) \
O(TypeofVariable) \ O(Typeof) \
O(TypeofLocal) \ O(TypeofVariable) \
O(UnaryMinus) \ O(TypeofLocal) \
O(UnaryPlus) \ O(UnaryMinus) \
O(UnsignedRightShift) \ O(UnaryPlus) \
O(UnsignedRightShift) \
O(Yield) O(Yield)
namespace JS::Bytecode { namespace JS::Bytecode {

45
Userland/Libraries/LibJS/Bytecode/Op.cpp
View file

@ -418,6 +418,46 @@ ThrowCompletionOr<void> GetVariable::execute_impl(Bytecode::Interpreter& interpr
return {}; return {};
} }
ThrowCompletionOr<void> GetCalleeAndThisFromEnvironment::execute_impl(Bytecode::Interpreter& interpreter) const
{
auto& vm = interpreter.vm();
auto get_reference = [&]() -> ThrowCompletionOr<Reference> {
auto const& string = interpreter.current_executable().get_identifier(m_identifier);
if (m_cached_environment_coordinate.has_value()) {
auto environment = vm.running_execution_context().lexical_environment;
for (size_t i = 0; i < m_cached_environment_coordinate->hops; ++i)
environment = environment->outer_environment();
VERIFY(environment);
VERIFY(environment->is_declarative_environment());
if (!environment->is_permanently_screwed_by_eval()) {
return Reference { *environment, string, vm.in_strict_mode(), m_cached_environment_coordinate };
}
m_cached_environment_coordinate = {};
}
auto reference = TRY(vm.resolve_binding(string));
if (reference.environment_coordinate().has_value())
m_cached_environment_coordinate = reference.environment_coordinate();
return reference;
};
auto reference = TRY(get_reference());
interpreter.reg(m_callee_reg) = TRY(reference.get_value(vm));
Value this_value = js_undefined();
if (reference.is_property_reference()) {
this_value = reference.get_this_value();
} else {
if (reference.is_environment_reference()) {
if (auto base_object = reference.base_environment().with_base_object(); base_object != nullptr)
this_value = base_object;
}
}
interpreter.reg(m_this_reg) = this_value;
return {};
}
ThrowCompletionOr<void> GetGlobal::execute_impl(Bytecode::Interpreter& interpreter) const ThrowCompletionOr<void> GetGlobal::execute_impl(Bytecode::Interpreter& interpreter) const
{ {
auto& vm = interpreter.vm(); auto& vm = interpreter.vm();
@ -1498,6 +1538,11 @@ DeprecatedString ConcatString::to_deprecated_string_impl(Bytecode::Executable co
return DeprecatedString::formatted("ConcatString {}", m_lhs); return DeprecatedString::formatted("ConcatString {}", m_lhs);
} }
DeprecatedString GetCalleeAndThisFromEnvironment::to_deprecated_string_impl(Bytecode::Executable const& executable) const
{
return DeprecatedString::formatted("GetCalleeAndThisFromEnvironment {} -> callee: {}, this:{} ", executable.identifier_table->get(m_identifier), m_callee_reg, m_this_reg);
}
DeprecatedString GetVariable::to_deprecated_string_impl(Bytecode::Executable const& executable) const DeprecatedString GetVariable::to_deprecated_string_impl(Bytecode::Executable const& executable) const
{ {
return DeprecatedString::formatted("GetVariable {} ({})", m_identifier, executable.identifier_table->get(m_identifier)); return DeprecatedString::formatted("GetVariable {} ({})", m_identifier, executable.identifier_table->get(m_identifier));

23
Userland/Libraries/LibJS/Bytecode/Op.h
View file

@ -441,6 +441,29 @@ private:
size_t m_index; size_t m_index;
}; };
class GetCalleeAndThisFromEnvironment final : public Instruction {
public:
explicit GetCalleeAndThisFromEnvironment(IdentifierTableIndex identifier, Register callee_reg, Register this_reg)
: Instruction(Type::GetCalleeAndThisFromEnvironment)
, m_identifier(identifier)
, m_callee_reg(callee_reg)
, m_this_reg(this_reg)
{
}
ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
DeprecatedString to_deprecated_string_impl(Bytecode::Executable const&) const;
IdentifierTableIndex identifier() const { return m_identifier; }
private:
IdentifierTableIndex m_identifier;
Register m_callee_reg;
Register m_this_reg;
Optional<EnvironmentCoordinate> mutable m_cached_environment_coordinate;
};
class GetVariable final : public Instruction { class GetVariable final : public Instruction {
public: public:
explicit GetVariable(IdentifierTableIndex identifier) explicit GetVariable(IdentifierTableIndex identifier)