Add support for block statement preparation (#2048)

* fix benchmark issues between modern and classic in dromaeo-object-string
sebastienros · Jan 28, 2025 · 7ab17c5 · 7ab17c5
1 parent 8925d0f
commit 7ab17c5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/Jint.Benchmark/Scripts/dromaeo-object-string-modern.js b/Jint.Benchmark/Scripts/dromaeo-object-string-modern.js
@@ -2,7 +2,7 @@
 
 // Try to force real results
 let ret;
-const num = 80000;
+const num = 5000;
 
 // TESTS: String concatenation
 

diff --git a/Jint.Benchmark/Scripts/dromaeo-object-string.js b/Jint.Benchmark/Scripts/dromaeo-object-string.js
@@ -2,7 +2,7 @@
 
 // Try to force real results
 var ret;
-var num = 80000;
+var num = 5000;
 
 // TESTS: String concatenation
 

diff --git a/Jint/Engine.Ast.cs b/Jint/Engine.Ast.cs
@@ -100,8 +100,7 @@ public void NodeVisitor(Node node, OnNodeContext _)
                 case NodeType.ArrowFunctionExpression:
                 case NodeType.FunctionDeclaration:
                 case NodeType.FunctionExpression:
-                    var function = (IFunction) node;
-                    node.UserData = JintFunctionDefinition.BuildState(function);
+                    node.UserData = JintFunctionDefinition.BuildState((IFunction) node);
                     break;
 
                 case NodeType.Program:
@@ -151,6 +150,10 @@ public void NodeVisitor(Node node, OnNodeContext _)
                         }
                     }
                     break;
+
+                case NodeType.BlockStatement:
+                    node.UserData = JintBlockStatement.BuildState((BlockStatement) node);
+                    break;
             }
         }
     }

diff --git a/Jint/Engine.cs b/Jint/Engine.cs
@@ -1149,11 +1149,14 @@ private void GlobalDeclarationInstantiation(
 
         UpdateLexicalEnvironment(lexEnv);
 
-        if (configuration.LexicalDeclarations?.Declarations.Count > 0)
+        var declarations = configuration.LexicalDeclarations;
+        if (declarations?.Declarations.Count > 0)
         {
-            var lexicalDeclarations = configuration.LexicalDeclarations.Value.Declarations;
-            var dictionary = lexEnv._dictionary ??= new HybridDictionary<Binding>(lexicalDeclarations.Count, checkExistingKeys: true);
+            var lexicalDeclarations = declarations.Value.Declarations;
+            var checkExistingKeys = (lexEnv._dictionary is not null && lexEnv._dictionary.Count > 0) || !declarations.Value.AllLexicalScoped;
+            var dictionary = lexEnv._dictionary ??= new HybridDictionary<Binding>(lexicalDeclarations.Count, checkExistingKeys);
             dictionary.EnsureCapacity(dictionary.Count + lexicalDeclarations.Count);
+
             for (var i = 0; i < lexicalDeclarations.Count; i++)
             {
                 var declaration = lexicalDeclarations[i];
@@ -1169,6 +1172,8 @@ private void GlobalDeclarationInstantiation(
                     }
                 }
             }
+
+            dictionary.CheckExistingKeys = true;
         }
 
         if (configuration.FunctionsToInitialize != null)

diff --git a/Jint/Runtime/Interpreter/Statements/JintBlockStatement.cs b/Jint/Runtime/Interpreter/Statements/JintBlockStatement.cs
@@ -15,7 +15,7 @@ public JintBlockStatement(NestedBlockStatement blockStatement) : base(blockState
 
     protected override void Initialize(EvaluationContext context)
     {
-        _lexicalDeclarations = DeclarationCacheBuilder.Build(_statement);
+        _lexicalDeclarations = (DeclarationCache) (_statement.UserData ??= BuildState(_statement));
 
         if (_statement.Body.Count == 1)
         {
@@ -27,6 +27,11 @@ protected override void Initialize(EvaluationContext context)
         }
     }
 
+    internal static DeclarationCache BuildState(BlockStatement blockStatement)
+    {
+        return DeclarationCacheBuilder.Build(blockStatement);
+    }
+
     /// <summary>
     /// Optimized for direct access without virtual dispatch.
     /// </summary>