replace two more ScriptRuntime method invoke

Author: ZZZank

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

@@ -5843,10 +5843,12 @@ public static RegExpProxy checkRegExpProxy(Context cx) {
         return result;
     }
 
+    @CodeGenMarker(ScriptRuntimeMethodSig.wrapRegExp)
     public static Scriptable wrapRegExp(Context cx, Scriptable scope, Object compiled) {
         return cx.getRegExpProxy().wrapRegExp(cx, scope, compiled);
     }
 
+    @CodeGenMarker(ScriptRuntimeMethodSig.getTemplateLiteralCallSite)
     public static Scriptable getTemplateLiteralCallSite(
             Context cx, Scriptable scope, Object[] strings, int index) {
         Object callsite = strings[index];

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

@@ -1116,14 +1116,7 @@ private void generateExpression(Node node, Node parent) {
                             codegen.mainClassName,
                             codegen.getCompiledRegexpName(scriptOrFn, i),
                             "Ljava/lang/Object;");
-                    cfw.addInvoke(
-                            ByteCode.INVOKESTATIC,
-                            "org/mozilla/javascript/ScriptRuntime",
-                            "wrapRegExp",
-                            "(Lorg/mozilla/javascript/Context;"
-                                    + "Lorg/mozilla/javascript/Scriptable;"
-                                    + "Ljava/lang/Object;"
-                                    + ")Lorg/mozilla/javascript/Scriptable;");
+                    ScriptRuntimeMethodSig.wrapRegExp.addInvoke(cfw);
                 }
                 break;
 
@@ -1839,14 +1832,7 @@ private void visitTemplateLiteral(Node node) {
                 codegen.getTemplateLiteralName(scriptOrFn),
                 "[Ljava/lang/Object;");
         cfw.addPush(index);
-        cfw.addInvoke(
-                ByteCode.INVOKESTATIC,
-                "org/mozilla/javascript/ScriptRuntime",
-                "getTemplateLiteralCallSite",
-                "(Lorg/mozilla/javascript/Context;"
-                        + "Lorg/mozilla/javascript/Scriptable;"
-                        + "[Ljava/lang/Object;I"
-                        + ")Lorg/mozilla/javascript/Scriptable;");
+        ScriptRuntimeMethodSig.getTemplateLiteralCallSite.addInvoke(cfw);
     }
 
     private void generateIfJump(Node node, Node parent, int trueLabel, int falseLabel) {

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

@@ -86,7 +86,9 @@ public enum ScriptRuntimeMethodSig {
     in,
     enterDotQuery,
     updateDotQuery,
-    leaveDotQuery;
+    leaveDotQuery,
+    wrapRegExp,
+    getTemplateLiteralCallSite;
 
     private static final String CLASS_INTERNAL_NAME =
             ScriptRuntime.class.getName().replace('.', '/');