Remove deprecated functions from rhino module

mozilla · Dec 11, 2024 · a8190a7 · a8190a7
1 parent d15eb7a
commit a8190a7
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 102 deletions.
diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/BuiltinBenchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/BuiltinBenchmark.java
@@ -22,7 +22,6 @@ public static class AbstractClassState {
         public void init()
                 throws IllegalAccessException, InvocationTargetException, InstantiationException {
             cx = Context.enter();
-            cx.setOptimizationLevel(9);
             cx.setLanguageVersion(Context.VERSION_ES6);
 
             scope = cx.initStandardObjects();

diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/MathBenchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/MathBenchmark.java
@@ -36,7 +36,6 @@ public static class MathState {
         @Setup(Level.Trial)
         public void setup() throws IOException {
             cx = Context.enter();
-            cx.setOptimizationLevel(9);
             cx.setLanguageVersion(Context.VERSION_ES6);
             scope = cx.initStandardObjects();
 

diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/ObjectBenchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/ObjectBenchmark.java
@@ -37,7 +37,6 @@ public static class FieldTestState {
         @SuppressWarnings("unused")
         public void create() throws IOException {
             cx = Context.enter();
-            cx.setOptimizationLevel(9);
             cx.setLanguageVersion(Context.VERSION_ES6);
 
             scope = new Global(cx);

diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/PropertyBenchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/PropertyBenchmark.java
@@ -27,7 +27,6 @@ public static class PropertyState {
         @Setup(Level.Trial)
         public void setup() throws IOException {
             cx = Context.enter();
-            cx.setOptimizationLevel(9);
             cx.setLanguageVersion(Context.VERSION_ES6);
             scope = cx.initStandardObjects();
 

diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/SunSpiderBenchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/SunSpiderBenchmark.java
@@ -26,7 +26,6 @@ abstract static class AbstractState {
         public void setUp() {
             cx = Context.enter();
             cx.setLanguageVersion(Context.VERSION_ES6);
-            cx.setOptimizationLevel(9);
             scope = cx.initStandardObjects();
 
             try (FileReader rdr = new FileReader(fileName)) {

diff --git a/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/V8Benchmark.java b/benchmarks/src/jmh/java/org/mozilla/javascript/benchmarks/V8Benchmark.java
@@ -41,7 +41,6 @@ void evaluateSource(Context cx, Scriptable scope, String fileName) {
         void initialize() {
             cx = Context.enter();
             cx.setLanguageVersion(Context.VERSION_ES6);
-            cx.setOptimizationLevel(9);
             scope = cx.initStandardObjects();
             evaluateSource(cx, scope, "testsrc/benchmarks/framework.js");
         }

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java
@@ -19,7 +19,7 @@ public class Bug482203Test {
     @Test
     public void jsApi() throws Exception {
         try (Context cx = Context.enter()) {
-            cx.setOptimizationLevel(-1);
+            cx.setInterpretedMode(true);
             InputStreamReader in =
                     new InputStreamReader(Bug482203Test.class.getResourceAsStream("Bug482203.js"));
             Script script = cx.compileReader(in, "", 1, null);
@@ -42,7 +42,7 @@ public void jsApi() throws Exception {
     @Test
     public void javaApi() throws Exception {
         try (Context cx = Context.enter()) {
-            cx.setOptimizationLevel(-1);
+            cx.setInterpretedMode(true);
             InputStreamReader in =
                     new InputStreamReader(Bug482203Test.class.getResourceAsStream("Bug482203.js"));
             Script script = cx.compileReader(in, "", 1, null);

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java
@@ -28,7 +28,7 @@ public class Bug685403Test {
     @Before
     public void setUp() {
         cx = Context.enter();
-        cx.setOptimizationLevel(-1);
+        cx.setInterpretedMode(true);
         scope = cx.initStandardObjects();
     }
 

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java
@@ -37,13 +37,10 @@ public class Bug708801Test {
 
     private static final ContextFactory factory =
             new ContextFactory() {
-                static final int COMPILER_MODE = 9;
-
                 @Override
                 protected Context makeContext() {
                     Context cx = super.makeContext();
                     cx.setLanguageVersion(Context.VERSION_1_8);
-                    cx.setOptimizationLevel(COMPILER_MODE);
                     return cx;
                 }
             };

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java
@@ -41,7 +41,6 @@ public class Bug782363Test {
     public void setUp() {
         cx = Context.enter();
         cx.setLanguageVersion(Context.VERSION_1_8);
-        cx.setOptimizationLevel(9);
     }
 
     @After

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/CatchTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/CatchTest.java
@@ -50,7 +50,7 @@ public String doCatchWrappedException(final ClassShutter shutter) throws Excepti
 
         return factory.call(
                 context -> {
-                    context.setOptimizationLevel(-1);
+                    context.setInterpretedMode(true);
                     if (shutter != null) {
                         context.setClassShutter(shutter);
                     }

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/CodegenTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/CodegenTest.java
@@ -32,7 +32,7 @@ public void largeMethod() {
                 _cx -> {
                     Script script =
                             _cx.compileString(scriptSource.toString(), "test-source", 1, null);
-                    if (_cx.getOptimizationLevel() > -1) {
+                    if (!_cx.isInterpretedMode()) {
                         Assert.assertTrue(
                                 script.getClass().getName(),
                                 script.getClass()
@@ -119,7 +119,7 @@ public void largeVarList() {
                 _cx -> {
                     Script script =
                             _cx.compileString(scriptSource.toString(), "test-source", 1, null);
-                    if (_cx.getOptimizationLevel() > -1) {
+                    if (!_cx.isInterpretedMode()) {
                         Assert.assertTrue(
                                 script.getClass().getName(),
                                 script.getClass()
@@ -188,7 +188,7 @@ public void largeLocalVarList() {
                 _cx -> {
                     Script script =
                             _cx.compileString(scriptSource.toString(), "test-source", 1, null);
-                    if (_cx.getOptimizationLevel() > -1) {
+                    if (!_cx.isInterpretedMode()) {
                         Assert.assertTrue(
                                 script.getClass().getName(),
                                 script.getClass()
@@ -259,7 +259,7 @@ public void tooManyMethods() {
                 _cx -> {
                     Script script =
                             _cx.compileString(scriptSource.toString(), "test-source", 1, null);
-                    if (_cx.getOptimizationLevel() > -1) {
+                    if (!_cx.isInterpretedMode()) {
                         Assert.assertTrue(
                                 script.getClass().getName(),
                                 script.getClass()

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java
@@ -71,7 +71,7 @@ public String h() {
     public void setUp() {
         try (Context cx = Context.enter()) {
             globalScope = cx.initStandardObjects();
-            cx.setOptimizationLevel(-1); // must use interpreter mode
+            cx.setInterpretedMode(true); // must use interpreter mode
             globalScope.put("myObject", globalScope, Context.javaToJS(new MyClass(), globalScope));
         }
     }
@@ -80,7 +80,7 @@ public void setUp() {
     public void scriptWithContinuations() {
         try (Context cx = Context.enter()) {
             try {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 Script script = cx.compileString("myObject.f(3) + 1;", "test source", 1, null);
                 cx.executeScriptWithContinuations(script, globalScope);
                 fail("Should throw ContinuationPending");
@@ -99,7 +99,7 @@ public void scriptWithContinuations() {
     public void scriptWithMultipleContinuations() {
         try (Context cx = Context.enter()) {
             try {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 Script script =
                         cx.compileString(
                                 "myObject.f(3) + myObject.g(3) + 2;", "test source", 1, null);
@@ -129,7 +129,7 @@ public void scriptWithMultipleContinuations() {
     public void scriptWithNestedContinuations() {
         try (Context cx = Context.enter()) {
             try {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 Script script =
                         cx.compileString(
                                 "myObject.g( myObject.f(1) ) + 2;", "test source", 1, null);
@@ -159,7 +159,7 @@ public void scriptWithNestedContinuations() {
     public void functionWithContinuations() {
         try (Context cx = Context.enter()) {
             try {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 cx.evaluateString(
                         globalScope,
                         "function f(a) { return myObject.f(a); }",
@@ -189,7 +189,7 @@ public void functionWithContinuations() {
     @Test
     public void errorOnEvalCall() {
         try (Context cx = Context.enter()) {
-            cx.setOptimizationLevel(-1); // must use interpreter mode
+            cx.setInterpretedMode(true); // must use interpreter mode
             Script script = cx.compileString("eval('myObject.f(3);');", "test source", 1, null);
             cx.executeScriptWithContinuations(script, globalScope);
             fail("Should throw IllegalStateException");
@@ -204,7 +204,7 @@ public void errorOnEvalCall() {
     public void serializationWithContinuations() throws IOException, ClassNotFoundException {
         try (Context cx = Context.enter()) {
             try {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 cx.evaluateString(
                         globalScope,
                         "function f(a) { var k = myObject.f(a); var t = []; return k; }",
@@ -255,13 +255,13 @@ public void continuationsPrototypesAndSerialization()
 
             try (Context cx = Context.enter()) {
                 globalScope = cx.initStandardObjects();
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 globalScope.put(
                         "myObject", globalScope, Context.javaToJS(new MyClass(), globalScope));
             }
 
             try (Context cx = Context.enter()) {
-                cx.setOptimizationLevel(-1); // must use interpreter mode
+                cx.setInterpretedMode(true); // must use interpreter mode
                 cx.evaluateString(
                         globalScope,
                         "function f(a) { Number.prototype.blargh = function() {return 'foo';}; var k = myObject.f(a); var t = []; return new Number(8).blargh(); }",
@@ -315,12 +315,12 @@ public void continuationsInlineFunctionsSerialization()
 
         try (Context cx = Context.enter()) {
             globalScope = cx.initStandardObjects();
-            cx.setOptimizationLevel(-1); // must use interpreter mode
+            cx.setInterpretedMode(true); // must use interpreter mode
             globalScope.put("myObject", globalScope, Context.javaToJS(new MyClass(), globalScope));
         }
 
         try (Context cx = Context.enter()) {
-            cx.setOptimizationLevel(-1); // must use interpreter mode
+            cx.setInterpretedMode(true); // must use interpreter mode
 
             try {
                 cx.evaluateString(

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java
@@ -38,7 +38,6 @@ protected boolean hasFeature(Context cx, int featureIndex) {
         protected Context makeContext() {
             Context cx = super.makeContext();
             cx.setLanguageVersion(Context.VERSION_ES6);
-            cx.setOptimizationLevel(0);
             return cx;
         }
     }

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java
@@ -20,15 +20,14 @@ public class ErrorPropertiesTest {
     static final String LS = System.getProperty("line.separator");
 
     private void testScriptStackTrace(final String script, final String expectedStackTrace) {
-        testScriptStackTrace(script, expectedStackTrace, -1);
-        testScriptStackTrace(script, expectedStackTrace, 0);
-        testScriptStackTrace(script, expectedStackTrace, 1);
+        testScriptStackTrace(script, expectedStackTrace, false);
+        testScriptStackTrace(script, expectedStackTrace, true);
     }
 
     private void testScriptStackTrace(
-            final String script, final String expectedStackTrace, final int optimizationLevel) {
+            final String script, final String expectedStackTrace, final boolean interpreted) {
         try {
-            Utils.executeScript(script, optimizationLevel);
+            Utils.executeScript(script, interpreted);
         } catch (final RhinoException e) {
             Assert.assertEquals(expectedStackTrace, e.getScriptStackTrace());
         }

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/Issue385Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue385Test.java
@@ -29,7 +29,7 @@ public void setUp() {
         cx.setLanguageVersion(Context.VERSION_1_8);
         // errors are reported in the parsing stage,
         // optimization level doesn't matter
-        cx.setOptimizationLevel(-1);
+        cx.setInterpretedMode(true);
     }
 
     @After

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/ScriptRuntimeEquivalentValuesTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ScriptRuntimeEquivalentValuesTest.java
@@ -32,7 +32,7 @@ public void equivalentValuesUndefined() throws Exception {
                                     "test",
                                     1,
                                     null);
-                    assertEquals("" + cx.getOptimizationLevel(), "true true", result);
+                    assertEquals("" + cx.isInterpretedMode(), "true true", result);
 
                     return null;
                 });
@@ -56,7 +56,7 @@ public void equivalentValuesNull() throws Exception {
                                     "test",
                                     1,
                                     null);
-                    assertEquals("" + cx.getOptimizationLevel(), "true true", result);
+                    assertEquals("" + cx.isInterpretedMode(), "true true", result);
 
                     return null;
                 });

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java
@@ -91,9 +91,9 @@ public class ToNumberConversionsTest {
     public static Collection<Object[]> data() {
         List<Object[]> cases = new ArrayList<>();
 
-        for (int optLevel : Utils.DEFAULT_OPT_LEVELS) {
+        for (boolean interpreted : new boolean[] {false, true}) {
             for (Object[] test : TESTS) {
-                cases.add(new Object[] {test[0], test[1], optLevel});
+                cases.add(new Object[] {test[0], test[1], interpreted});
             }
         }
 
@@ -107,7 +107,7 @@ public static Collection<Object[]> data() {
     public String source;
 
     @Parameterized.Parameter(2)
-    public int optLevel;
+    public boolean interpreted;
 
     @SuppressWarnings("ConstantConditions")
     private boolean execute(Context cx, Scriptable scope, String script) {
@@ -120,7 +120,7 @@ private boolean execute(Context cx, Scriptable scope, String script) {
     @Before
     public void setup() {
         cx = Context.enter();
-        cx.setOptimizationLevel(optLevel);
+        cx.setInterpretedMode(interpreted);
         cx.setLanguageVersion(Context.VERSION_ES6);
         scope = cx.initSafeStandardObjects();
     }

diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java
@@ -97,9 +97,9 @@ public class ToNumberLegacyConversionsTest {
     public static Collection<Object[]> data() {
         List<Object[]> cases = new ArrayList<>();
 
-        for (int optLevel : OPT_LEVELS) {
+        for (boolean interpreted : new boolean[] {false, true}) {
             for (Object[] test : TESTS) {
-                cases.add(new Object[] {test[0], test[1], optLevel});
+                cases.add(new Object[] {test[0], test[1], interpreted});
             }
         }
 
@@ -113,7 +113,7 @@ public static Collection<Object[]> data() {
     public String source;
 
     @Parameterized.Parameter(2)
-    public int optLevel;
+    public boolean interpreted;
 
     @SuppressWarnings("ConstantConditions")
     private boolean execute(Context cx, Scriptable scope, String script) {
@@ -126,7 +126,7 @@ private boolean execute(Context cx, Scriptable scope, String script) {
     @Before
     public void setup() {
         cx = Context.enter();
-        cx.setOptimizationLevel(optLevel);
+        cx.setInterpretedMode(interpreted);
         cx.setLanguageVersion(Context.VERSION_1_8);
         scope = cx.initSafeStandardObjects();
     }