LibJS: Ensure capacity of lex/var environments

kalenikaliaksandr · May 9, 2024 · 0a6d7ce · 0a6d7ce
1 parent 825a22c
commit 0a6d7ce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/Userland/Libraries/LibJS/Bytecode/Generator.cpp b/Userland/Libraries/LibJS/Bytecode/Generator.cpp
@@ -116,7 +116,7 @@ CodeGenerationErrorOr<void> Generator::emit_function_declaration_instantiation(E
             }
         }
     } else {
-        generator.emit<Op::CreateVariableEnvironment>();
+        generator.emit<Op::CreateVariableEnvironment>(function.m_var_environment_bindings_count);
 
         if (scope_body) {
             for (auto const& variable_to_initialize : function.m_var_names_to_initialize_binding) {
@@ -157,7 +157,7 @@ CodeGenerationErrorOr<void> Generator::emit_function_declaration_instantiation(E
     if (!function.m_strict) {
         bool can_elide_declarative_environment = !function.m_contains_direct_call_to_eval && (!scope_body || !scope_body->has_lexical_declarations());
         if (!can_elide_declarative_environment) {
-            generator.emit<Op::CreateLexicalEnvironment>();
+            generator.emit<Op::CreateLexicalEnvironment>(function.m_lex_environment_bindings_count);
         }
     }
 

diff --git a/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp b/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp
@@ -1258,7 +1258,9 @@ ThrowCompletionOr<void> DeleteVariable::execute_impl(Bytecode::Interpreter& inte
 ThrowCompletionOr<void> CreateLexicalEnvironment::execute_impl(Bytecode::Interpreter& interpreter) const
 {
     auto make_and_swap_envs = [&](auto& old_environment) {
-        GCPtr<Environment> environment = new_declarative_environment(*old_environment).ptr();
+        auto declarative_environment = new_declarative_environment(*old_environment).ptr();
+        declarative_environment->ensure_capacity(m_capacity);
+        GCPtr<Environment> environment = declarative_environment;
         swap(old_environment, environment);
         return environment;
     };
@@ -1271,6 +1273,7 @@ ThrowCompletionOr<void> CreateVariableEnvironment::execute_impl(Bytecode::Interp
 {
     auto& running_execution_context = interpreter.vm().running_execution_context();
     auto var_environment = new_declarative_environment(*running_execution_context.lexical_environment);
+    var_environment->ensure_capacity(m_capacity);
     running_execution_context.variable_environment = var_environment;
     running_execution_context.lexical_environment = var_environment;
     return {};

diff --git a/Userland/Libraries/LibJS/Bytecode/Op.h b/Userland/Libraries/LibJS/Bytecode/Op.h
@@ -451,24 +451,32 @@ enum class EnvironmentMode {
 
 class CreateLexicalEnvironment final : public Instruction {
 public:
-    explicit CreateLexicalEnvironment()
+    explicit CreateLexicalEnvironment(u32 capacity = 0)
         : Instruction(Type::CreateLexicalEnvironment)
+        , m_capacity(capacity)
     {
     }
 
     ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
     ByteString to_byte_string_impl(Bytecode::Executable const&) const;
+
+private:
+    u32 m_capacity { 0 };
 };
 
 class CreateVariableEnvironment final : public Instruction {
 public:
-    explicit CreateVariableEnvironment()
+    explicit CreateVariableEnvironment(u32 capacity = 0)
         : Instruction(Type::CreateVariableEnvironment)
+        , m_capacity(capacity)
     {
     }
 
     ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
     ByteString to_byte_string_impl(Bytecode::Executable const&) const;
+
+private:
+    u32 m_capacity { 0 };
 };
 
 class EnterObjectEnvironment final : public Instruction {