Convert NativeContinuation to descriptor.

Author: aardvark179

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

@@ -3549,8 +3549,9 @@ NewState execute(Context cx, CallFrame frame, InterpreterState state, int op) {
             if (fun instanceof JSFunction
                     && ((JSFunction) fun).getDescriptor().getCode() instanceof InterpreterData) {
                 JSFunction ifun = (JSFunction) fun;
-                JSDescriptor desc = ifun.getDescriptor();
-                InterpreterData idata = (InterpreterData) desc.getCode();
+
+                JSDescriptor<JSFunction> desc = ifun.getDescriptor();
+                var idata = (InterpreterData<JSFunction>) desc.getCode();
                 if (frame.fnOrScript.getDescriptor().getSecurityDomain()
                         == desc.getSecurityDomain()) {
                     CallFrame callParentFrame = frame;
@@ -3620,8 +3621,9 @@ NewState execute(Context cx, CallFrame frame, InterpreterState state, int op) {
                 return BREAK_WITHOUT_EXTENSION;
             }
 
-            if (fun instanceof IdFunctionObject) {
-                IdFunctionObject ifun = (IdFunctionObject) fun;
+            if (fun instanceof JSFunction) {
+                var ifun = (JSFunction) fun;
+
                 if (NativeContinuation.isContinuationConstructor(ifun)) {
                     frame.stack[state.stackTop] = captureContinuation(cx, frame.parentFrame, false);
                     return null;
@@ -3666,8 +3668,9 @@ NewState execute(Context cx, CallFrame frame, InterpreterState state, int op) {
             if (lhs instanceof JSFunction
                     && ((JSFunction) lhs).getConstructor() instanceof InterpreterData) {
                 JSFunction f = (JSFunction) lhs;
-                JSDescriptor desc = f.getDescriptor();
-                InterpreterData idata = (InterpreterData) desc.getConstructor();
+
+                JSDescriptor<JSFunction> desc = f.getDescriptor();
+                var idata = (InterpreterData<JSFunction>) desc.getConstructor();
                 if (frame.fnOrScript.getDescriptor().getSecurityDomain()
                         == desc.getSecurityDomain()) {
                     if (cx.getLanguageVersion() >= Context.VERSION_ES6
@@ -3700,20 +3703,21 @@ NewState execute(Context cx, CallFrame frame, InterpreterState state, int op) {
                     return new StateContinueResult(calleeFrame, state.indexReg);
                 }
             }
-            if (!(lhs instanceof Constructable)) {
-                if (lhs == DOUBLE_MARK) lhs = ScriptRuntime.wrapNumber(frame.sDbl[state.stackTop]);
-                throw ScriptRuntime.notFunctionError(lhs);
-            }
-            Constructable ctor = (Constructable) lhs;
+            if (lhs instanceof JSFunction) {
+                var f = (JSFunction) lhs;
 
-            if (ctor instanceof IdFunctionObject) {
-                IdFunctionObject ifun = (IdFunctionObject) ctor;
-                if (NativeContinuation.isContinuationConstructor(ifun)) {
+                if (NativeContinuation.isContinuationConstructor(f)) {
                     frame.stack[state.stackTop] = captureContinuation(cx, frame.parentFrame, false);
                     return null;
                 }
             }
 
+            if (!(lhs instanceof Constructable)) {
+                if (lhs == DOUBLE_MARK) lhs = ScriptRuntime.wrapNumber(frame.sDbl[state.stackTop]);
+                throw ScriptRuntime.notFunctionError(lhs);
+            }
+            Constructable ctor = (Constructable) lhs;
+
             Object[] outArgs =
                     getArgsArray(frame.stack, frame.sDbl, state.stackTop + 1, state.indexReg);
             frame.stack[state.stackTop] = ctor.construct(cx, frame.scope, outArgs);

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

@@ -9,16 +9,34 @@
 import java.io.Serial;
 import java.util.Objects;
 
-public final class NativeContinuation extends IdScriptableObject implements Function {
+public final class NativeContinuation extends ScriptableObject implements Function {
     @Serial private static final long serialVersionUID = 1794167133757605367L;
 
-    private static final Object FTAG = "Continuation";
+    private static final String CLASS_NAME = "Continuation";
+
+    private static final ClassDescriptor DESCRIPTOR;
+    private static final JSDescriptor<JSFunction> CTOR_DESCRIPTOR;
+
+    static {
+        DESCRIPTOR =
+                new ClassDescriptor.Builder(
+                                CLASS_NAME,
+                                0,
+                                NativeContinuation::js_constructor,
+                                NativeContinuation::js_constructor)
+                        .build();
+        CTOR_DESCRIPTOR = DESCRIPTOR.ctorDesc();
+    }
 
     private Object implementation;
 
     public static void init(Context cx, VarScope scope, boolean sealed) {
-        NativeContinuation obj = new NativeContinuation();
-        obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed);
+        DESCRIPTOR.buildConstructor(cx, scope, new NativeContinuation(), sealed);
+    }
+
+    private static Object js_constructor(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        throw Context.reportRuntimeError("Direct call is not supported");
     }
 
     public Object getImplementation() {
@@ -44,11 +62,8 @@ public Object call(Context cx, VarScope scope, Scriptable thisObj, Object[] args
         return Interpreter.restartContinuation(this, cx, scope, args);
     }
 
-    public static boolean isContinuationConstructor(IdFunctionObject f) {
-        if (f.hasTag(FTAG) && f.methodId() == Id_constructor) {
-            return true;
-        }
-        return false;
+    public static boolean isContinuationConstructor(JSFunction f) {
+        return f.getDescriptor() == CTOR_DESCRIPTOR;
     }
 
     /**
@@ -62,49 +77,4 @@ public static boolean isContinuationConstructor(IdFunctionObject f) {
     public static boolean equalImplementations(NativeContinuation c1, NativeContinuation c2) {
         return Objects.equals(c1.implementation, c2.implementation);
     }
-
-    @Override
-    protected void initPrototypeId(int id) {
-        String s;
-        int arity;
-        switch (id) {
-            case Id_constructor:
-                arity = 0;
-                s = "constructor";
-                break;
-            default:
-                throw new IllegalArgumentException(String.valueOf(id));
-        }
-        initPrototypeMethod(FTAG, id, s, arity);
-    }
-
-    @Override
-    public Object execIdCall(
-            IdFunctionObject f, Context cx, VarScope scope, Scriptable thisObj, Object[] args) {
-        if (!f.hasTag(FTAG)) {
-            return super.execIdCall(f, cx, scope, thisObj, args);
-        }
-        int id = f.methodId();
-        switch (id) {
-            case Id_constructor:
-                throw Context.reportRuntimeError("Direct call is not supported");
-        }
-        throw new IllegalArgumentException(String.valueOf(id));
-    }
-
-    @Override
-    protected int findPrototypeId(String s) {
-        int id;
-        switch (s) {
-            case "constructor":
-                id = Id_constructor;
-                break;
-            default:
-                id = 0;
-                break;
-        }
-        return id;
-    }
-
-    private static final int Id_constructor = 1, MAX_PROTOTYPE_ID = 1;
 }