New faster interpreter based on instruction objects and operands.

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/BuiltinBenchmark.java

@@ -22,7 +22,7 @@ public class BuiltinBenchmark {
     @State(Scope.Thread)
     public static class AbstractClassState {
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         public void init()

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/GeneratorBenchmark.java

@@ -22,7 +22,7 @@ public static class GeneratorState {
         Function transpiledGenerator;
         Function noReturnGenerator;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         @Setup(Level.Trial)

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/MathBenchmark.java

@@ -34,7 +34,7 @@ public static class MathState {
         Function bitwiseRsh;
         Function bitwiseSignedRsh;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         @Setup(Level.Trial)

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/ObjectBenchmark.java

@@ -36,7 +36,7 @@ public static class FieldTestState {
         Scriptable strings;
         Scriptable ints;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         @Setup(Level.Trial)

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/PropertyBenchmark.java

@@ -25,7 +25,7 @@ public static class PropertyState {
 
         Object object;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         @Setup(Level.Trial)

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/SunSpiderBenchmark.java

@@ -20,7 +20,7 @@ public abstract static class AbstractState {
         Script script;
         String fileName;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         AbstractState(String fileName) {

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/ThrowBenchmark.java

@@ -22,7 +22,7 @@ public static class GeneratorState {
         Function mediumThrow;
         Function deepThrow;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         @Setup(Level.Trial)

benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/V8Benchmark.java

@@ -20,7 +20,7 @@ public abstract static class AbstractState {
         Context cx;
         TopLevel scope;
 
-        @Param({"Interpreter", "Compiler"})
+        @Param({"Interpreter", "InterpreterV2", "Compiler"})
         public EvaluationMethod evalMethod;
 
         Callable getFunc(String name) {

rhino/src/main/java/org/mozilla/javascript/Context.java

@@ -2796,6 +2796,10 @@ private static void notifyDebugger_r(Context cx, DebuggableScript dscript, Strin
     private static final Class<? extends Evaluator> InterpreterClass =
             (Class<? extends Evaluator>) Kit.classOrNull("org.mozilla.javascript.Interpreter");
 
+    @SuppressWarnings("unchecked")
+    private static final Class<? extends Evaluator> InterpreterV2Class =
+            (Class<? extends Evaluator>) Kit.classOrNull("org.mozilla.javascript.InterpreterV2");
+
     private Evaluator createCompiler() {
         return evaluationMethod.createEvaluator();
     }
@@ -2943,6 +2947,8 @@ public static boolean isCurrentContextStrict() {
     public enum EvaluationMethod {
         /** Original bytecode-based interpreter. */
         Interpreter(-1, true, InterpreterClass),
+        /** New instruction & operand-based interpreter. */
+        InterpreterV2(-2, true, InterpreterV2Class),
         /** JVM bytecode compiler. */
         Compiler(9, false, CodegenClass);
 

rhino/src/main/java/org/mozilla/javascript/InterpreterV2.java

@@ -7,6 +7,7 @@
 import java.util.Objects;
 import org.mozilla.javascript.ast.ScriptNode;
 import org.mozilla.javascript.debug.DebuggableScript;
+import org.mozilla.javascript.interpreterv2.Compiler;
 import org.mozilla.javascript.interpreterv2.CompilerData;
 import org.mozilla.javascript.interpreterv2.GeneratorState;
 import org.mozilla.javascript.interpreterv2.instruction.JumpInstruction;
@@ -545,13 +546,17 @@ public static boolean doEquals(Context cx, CallFrameV2 frame, Operand left, Oper
     @Override
     public CompilationResult<JSScript> compileScript(
             CompilerEnvirons compilerEnv, ScriptNode tree, String rawSource) {
-        throw new UnsupportedOperationException();
+        var compiler = new Compiler<JSScript>();
+        var res = compiler.compile(compilerEnv, tree, rawSource, false);
+        return new V2CompilationResult<>(res, compilerEnv.homeObject());
     }
 
     @Override
     public CompilationResult<JSFunction> compileFunction(
             CompilerEnvirons compilerEnv, ScriptNode tree, String rawSource) {
-        throw new UnsupportedOperationException();
+        var compiler = new Compiler<JSFunction>();
+        var res = compiler.compile(compilerEnv, tree, rawSource, true);
+        return new V2CompilationResult<>(res, compilerEnv.homeObject());
     }
 
     @Override

rhino/src/main/java/org/mozilla/javascript/JSFunction.java

@@ -28,7 +28,7 @@ public JSFunction(
         }
     }
 
-    JSFunction(
+    public JSFunction(
             VarScope scope,
             JSDescriptor<JSFunction> descriptor,
             Scriptable lexicalThis,

rhino/src/main/java/org/mozilla/javascript/NativeProxy.java

@@ -392,7 +392,7 @@ public Object get(String name, Scriptable start) {
             DescriptorInfo targetDesc = target.getOwnPropertyDescriptor(Context.getContext(), name);
             if (targetDesc != null && targetDesc.isConfigurable(false)) {
                 if (targetDesc.isDataDescriptor() && targetDesc.isWritable(false)) {
-                    if (!Objects.equals(trapResult, targetDesc.value)) {
+                    if (!ScriptRuntime.shallowEq(trapResult, targetDesc.value)) {
                         throw ScriptRuntime.typeError(
                                 "proxy get has to return the same value as the plain call");
                     }

rhino/src/main/java/org/mozilla/javascript/NewLiteralStorage.java

@@ -60,6 +60,24 @@ public void pushKey(Object key) {
         }
     }
 
+    public void setKeyAt(int idx, Object key) {
+        keys[idx] = key;
+    }
+
+    public void setValueAt(int idx, Object value) {
+        values[idx] = value;
+    }
+
+    public void setGetterAt(int idx, Object value) {
+        getterSetters[idx] = -1;
+        values[idx] = value;
+    }
+
+    public void setSetterAt(int idx, Object value) {
+        getterSetters[idx] = +1;
+        values[idx] = value;
+    }
+
     public void spread(Context cx, VarScope scope, Object source, int sourcePosition) {
         int indexBefore = index;
         if (keys == null) {
@@ -231,44 +249,57 @@ private static final class NameInference extends NewLiteralStorage {
 
         @Override
         protected void attemptToInferFunctionName(Object value) {
-            // Try to infer the name if the value is a normal JS function
-            if (this.keys == null || !(value instanceof JSFunction)) {
+            if (this.keys == null) {
                 return;
             }
+            int gs = getterSetters == null ? 0 : getterSetters[index];
+            inferFunctionName(this.keys[index], value, gs);
+        }
+    }
 
-            BaseFunction fun = (BaseFunction) value;
-            if (!"".equals(fun.get("name", fun))) {
-                return;
-            }
+    /**
+     * Set the inferred name on a function value placed under {@code propKey} in an object literal,
+     * matching the semantics of {@code SetFunctionName} (ECMA 9.2.13). Used by both V1 (via {@link
+     * NewLiteralStorage}) and V2 (directly from its ObjectLit instruction).
+     *
+     * @param propKey the property key (String, Symbol, or other id)
+     * @param value the candidate function value
+     * @param getterSetter -1 for getter, +1 for setter, 0 for regular value
+     */
+    public static void inferFunctionName(Object propKey, Object value, int getterSetter) {
+        if (!(value instanceof JSFunction)) {
+            return;
+        }
+        BaseFunction fun = (BaseFunction) value;
+        if (!"".equals(fun.get("name", fun))) {
+            return;
+        }
 
-            String prefix = "";
-            if (getterSetters[index] == -1) {
-                prefix = "get ";
-            } else if (getterSetters[index] == +1) {
-                prefix = "set ";
-            }
+        String prefix = "";
+        if (getterSetter == -1) {
+            prefix = "get ";
+        } else if (getterSetter == +1) {
+            prefix = "set ";
+        }
 
-            Object propKey = this.keys[index];
-            if (propKey instanceof Symbol) {
-                // For symbol keys, valid names are: `[foo]`, `get [foo]`
-                // However `[]` or `get []` aren't, and become `` and `get `
-                String symbolName = ((Symbol) propKey).getName();
-                if (!symbolName.isEmpty()) {
-                    fun.setFunctionName(prefix + "[" + symbolName + "]");
-                } else if (!prefix.isEmpty()) {
-                    fun.setFunctionName(prefix);
-                }
+        if (propKey instanceof Symbol) {
+            // For symbol keys, valid names are: `[foo]`, `get [foo]`
+            // However `[]` or `get []` aren't, and become `` and `get `
+            String symbolName = ((Symbol) propKey).getName();
+            if (!symbolName.isEmpty()) {
+                fun.setFunctionName(prefix + "[" + symbolName + "]");
+            } else if (!prefix.isEmpty()) {
+                fun.setFunctionName(prefix);
+            }
+        } else {
+            if (!propKey.equals(PROTO_PROPERTY)) {
+                fun.setFunctionName(prefix + propKey);
             } else {
-                // Key was already converted to a string
-                if (!propKey.equals(PROTO_PROPERTY)) {
+                // `__proto__` is, as usual, weird and applies only to methods, meaning:
+                // - { __proto__(){} } infers the name
+                // - { __proto__: function(){} } does not!
+                if (((JSFunction) fun).isShorthand()) {
                     fun.setFunctionName(prefix + propKey);
-                } else {
-                    // `__proto__` is, as usual, weird and applies only to methods, meaning:
-                    // - { __proto__(){} } infers the name
-                    // - { __proto__: function(){} } does not!
-                    if (fun instanceof JSFunction && ((JSFunction) fun).isShorthand()) {
-                        fun.setFunctionName(prefix + propKey);
-                    }
                 }
             }
         }