Change array literal related methods to be static.

Author: aardvark179

rhino/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java

@@ -1,6 +1,7 @@
 package org.mozilla.javascript.optimizer;
 
 import static org.mozilla.classfile.ClassFileWriter.ACC_PRIVATE;
+import static org.mozilla.classfile.ClassFileWriter.ACC_PUBLIC;
 import static org.mozilla.classfile.ClassFileWriter.ACC_STATIC;
 
 import java.util.ArrayDeque;
@@ -35,20 +36,20 @@ void generateBodyCode() {
             // generator has a unique prefix followed by _gen
             String type =
                     "("
-                            + codegen.mainClassSignature
+                            + "Lorg/mozilla/javascript/NativeFunction;"
                             + "Lorg/mozilla/javascript/Context;"
                             + "Lorg/mozilla/javascript/Scriptable;"
                             + "Ljava/lang/Object;"
                             + "Ljava/lang/Object;I)Ljava/lang/Object;";
             cfw.startMethod(
                     codegen.getBodyMethodName(scriptOrFn) + "_gen",
                     type,
-                    (short) (ACC_STATIC | ACC_PRIVATE));
+                    (short) (ACC_STATIC | ACC_PUBLIC));
         } else {
             cfw.startMethod(
                     codegen.getBodyMethodName(scriptOrFn),
                     codegen.getBodyMethodSignature(scriptOrFn),
-                    (short) (ACC_STATIC | ACC_PRIVATE));
+                    (short) (ACC_STATIC | ACC_PUBLIC));
         }
 
         generatePrologue();
@@ -2135,12 +2136,13 @@ private void generateArrayLiteralFactory(Node node, int count) {
         localsMax = firstFreeLocal;
         cfw.startMethod(
                 methodName,
-                "(Lorg/mozilla/javascript/Context;"
+                "(Lorg/mozilla/javascript/NativeFunction;"
+                        + "Lorg/mozilla/javascript/Context;"
                         + "Lorg/mozilla/javascript/Scriptable;"
                         + "Lorg/mozilla/javascript/Scriptable;"
                         + "[Ljava/lang/Object;"
                         + ")Lorg/mozilla/javascript/Scriptable;",
-                ACC_PRIVATE);
+                (short) (ACC_STATIC | ACC_PRIVATE));
         visitArrayLiteral(node, node.getFirstChild(), true);
         cfw.add(ByteCode.ARETURN);
         cfw.stopMethod((short) (localsMax + 1));
@@ -2153,12 +2155,13 @@ private void generateObjectLiteralFactory(Node node, int count) {
         localsMax = firstFreeLocal;
         cfw.startMethod(
                 methodName,
-                "(Lorg/mozilla/javascript/Context;"
+                "(Lorg/mozilla/javascript/NativeFunction;"
+                        + "Lorg/mozilla/javascript/Context;"
                         + "Lorg/mozilla/javascript/Scriptable;"
                         + "Lorg/mozilla/javascript/Scriptable;"
                         + "[Ljava/lang/Object;"
                         + ")Lorg/mozilla/javascript/Scriptable;",
-                ACC_PRIVATE);
+                (short) (ACC_STATIC | ACC_PRIVATE));
         visitObjectLiteral(node, node.getFirstChild(), true);
         cfw.add(ByteCode.ARETURN);
         cfw.stopMethod((short) (localsMax + 1));
@@ -2185,10 +2188,11 @@ private void visitArrayLiteral(Node node, Node child, boolean topLevel) {
             cfw.addALoad(thisObjLocal);
             cfw.addALoad(argsLocal);
             cfw.addInvoke(
-                    ByteCode.INVOKEVIRTUAL,
+                    ByteCode.INVOKESTATIC,
                     codegen.mainClassName,
                     methodName,
-                    "(Lorg/mozilla/javascript/Context;"
+                    "(Lorg/mozilla/javascript/NativeFunction;"
+                            + "Lorg/mozilla/javascript/Context;"
                             + "Lorg/mozilla/javascript/Scriptable;"
                             + "Lorg/mozilla/javascript/Scriptable;"
                             + "[Ljava/lang/Object;"
@@ -2421,10 +2425,11 @@ private void visitObjectLiteral(Node node, Node child, boolean topLevel) {
             cfw.addALoad(thisObjLocal);
             cfw.addALoad(argsLocal);
             cfw.addInvoke(
-                    ByteCode.INVOKEVIRTUAL,
+                    ByteCode.INVOKESTATIC,
                     codegen.mainClassName,
                     methodName,
-                    "(Lorg/mozilla/javascript/Context;"
+                    "(Lorg/mozilla/javascript/NativeFunction;"
+                            + "Lorg/mozilla/javascript/Context;"
                             + "Lorg/mozilla/javascript/Scriptable;"
                             + "Lorg/mozilla/javascript/Scriptable;"
                             + "[Ljava/lang/Object;"

rhino/src/main/java/org/mozilla/javascript/optimizer/Codegen.java

@@ -412,7 +412,7 @@ private void generateResumeGenerator(ClassFileWriter cfw) {
             if (isGenerator(n)) {
                 String type =
                         "("
-                                + mainClassSignature
+                                + "Lorg/mozilla/javascript/NativeFunction;"
                                 + "Lorg/mozilla/javascript/Context;"
                                 + "Lorg/mozilla/javascript/Scriptable;"
                                 + "Ljava/lang/Object;"
@@ -1289,7 +1289,7 @@ String cleanName(final ScriptNode n) {
     String getBodyMethodSignature(ScriptNode n) {
         StringBuilder sb = new StringBuilder();
         sb.append('(');
-        sb.append(mainClassSignature);
+        sb.append("Lorg/mozilla/javascript/NativeFunction;");
         sb.append(
                 "Lorg/mozilla/javascript/Context;"
                         + "Lorg/mozilla/javascript/Scriptable;"