optimization - migrate from INVOKEINTERFACE to INVOKEVIRTUAL

fglock · fglock · commit 9bff83c789d4 · 2025-07-13T20:36:07.000+02:00
diff --git a/src/main/java/org/perlonjava/codegen/EmitLiteral.java b/src/main/java/org/perlonjava/codegen/EmitLiteral.java
@@ -427,8 +427,8 @@ private static void addElementToList(MethodVisitor mv, Node element, int context
                     "addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", false);
         } else {
             // Fall back to interface call for unknown types
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, RuntimeTypeConstants.DATA_PROVIDER_INTERFACE,
-                    "addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", true);
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, RuntimeTypeConstants.BASE_CLASS,
+                    "addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", false);
         }
     }
 
diff --git a/src/main/java/org/perlonjava/codegen/EmitOperator.java b/src/main/java/org/perlonjava/codegen/EmitOperator.java
@@ -93,7 +93,7 @@ static void handleReadlineOperator(EmitterVisitor emitterVisitor, BinaryOperator
             // Push call context for SCALAR or LIST context.
             emitterVisitor.pushCallContext();
             // Invoke the static method for the operator.
-            emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC, "org/perlonjava/operators/Readline", operator, "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;", false);
+            emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC, "org/perlonjava/operators/Readline", operator, "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;", false);
         } else {
             // Invoke the static method for the operator without context.
             emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC, "org/perlonjava/operators/Operator", operator, "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;", false);
@@ -253,7 +253,7 @@ static void handleDiamondBuiltin(EmitterVisitor emitterVisitor, OperatorNode nod
             mv.visitMethodInsn(Opcodes.INVOKESTATIC,
                     "org/perlonjava/runtime/DiamondIO",
                     "readline",
-                    "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;", false);
+                    "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;", false);
             // If the context is VOID, pop the result from the stack.
             handleVoidContext(emitterVisitor);
         } else {
@@ -284,7 +284,7 @@ static void handleGlobBuiltin(EmitterVisitor emitterVisitor, OperatorNode node)
         // Generate unique IDs for this glob instance
         int globId = ScalarGlobOperator.currentId++;
 
-        // public static RuntimeDataProvider evaluate(id, patternArg, ctx)
+        // public static RuntimeBaseEntity evaluate(id, patternArg, ctx)
         mv.visitLdcInsn(globId);
         // Accept the operand in SCALAR context.
         node.operand.accept(emitterVisitor.with(RuntimeContextType.SCALAR));
@@ -322,7 +322,7 @@ static void handleRepeat(EmitterVisitor emitterVisitor, BinaryOperatorNode node)
         // Invoke the static method for the 'repeat' operator.
         emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC, "org/perlonjava/operators/Operator",
                 "repeat",
-                "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;", false);
+                "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;", false);
 
         if (emitterVisitor.ctx.contextType == RuntimeContextType.SCALAR) {
             emitterVisitor.ctx.mv.visitTypeInsn(Opcodes.CHECKCAST, "org/perlonjava/runtime/RuntimeScalar");
diff --git a/src/main/java/org/perlonjava/codegen/EmitRegex.java b/src/main/java/org/perlonjava/codegen/EmitRegex.java
@@ -191,7 +191,7 @@ private static void emitMatchRegex(EmitterVisitor emitterVisitor) {
         // Invoke the regex matching operation
         emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC,
                 "org/perlonjava/regex/RuntimeRegex", "matchRegex",
-                "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;", false);
+                "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;", false);
 
         // Handle the result based on context type
         if (emitterVisitor.ctx.contextType == RuntimeContextType.SCALAR) {
diff --git a/src/main/java/org/perlonjava/operators/Directory.java b/src/main/java/org/perlonjava/operators/Directory.java
@@ -140,7 +140,7 @@ public static Set<PosixFilePermission> getPosixFilePermissions(int mode) {
         return permissions;
     }
 
-    public static RuntimeDataProvider readdir(RuntimeScalar dirHandle, int ctx) {
+    public static RuntimeBaseEntity readdir(RuntimeScalar dirHandle, int ctx) {
         RuntimeIO runtimeIO = dirHandle.getRuntimeIO();
         if (runtimeIO.directoryIO != null) {
             return runtimeIO.directoryIO.readdir(ctx);
diff --git a/src/main/java/org/perlonjava/operators/Operator.java b/src/main/java/org/perlonjava/operators/Operator.java
@@ -742,7 +742,7 @@ public static RuntimeList splice(RuntimeArray runtimeArray, RuntimeList list) {
      * @param value The list of files to be deleted.
      * @return A RuntimeScalar indicating the result of the unlink operation.
      */
-    public static RuntimeDataProvider unlink(RuntimeDataProvider value, int ctx) {
+    public static RuntimeBaseEntity unlink(RuntimeDataProvider value, int ctx) {
 
         boolean allDeleted = true;
         RuntimeList fileList = value.getList();
@@ -765,7 +765,7 @@ public static RuntimeDataProvider unlink(RuntimeDataProvider value, int ctx) {
         return getScalarBoolean(allDeleted);
     }
 
-    public static RuntimeDataProvider reverse(RuntimeDataProvider value, int ctx) {
+    public static RuntimeBaseEntity reverse(RuntimeDataProvider value, int ctx) {
         if (ctx == RuntimeContextType.SCALAR) {
             StringBuilder sb = new StringBuilder();
 
@@ -801,7 +801,7 @@ public static RuntimeDataProvider reverse(RuntimeDataProvider value, int ctx) {
         }
     }
 
-    public static RuntimeDataProvider repeat(RuntimeDataProvider value, RuntimeScalar timesScalar, int ctx) {
+    public static RuntimeBaseEntity repeat(RuntimeDataProvider value, RuntimeScalar timesScalar, int ctx) {
         int times = timesScalar.getInt();
         if (ctx == RuntimeContextType.SCALAR || value instanceof RuntimeScalar) {
             StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/org/perlonjava/operators/OperatorHandler.java b/src/main/java/org/perlonjava/operators/OperatorHandler.java
@@ -105,12 +105,12 @@ public class OperatorHandler {
         put("closedir", "closedir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("rewinddir", "rewinddir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("telldir", "telldir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("readdir", "readdir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("readdir", "readdir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
         put("mkdir", "mkdir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("seekdir", "seekdir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("chdir", "chdir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("opendir", "opendir", "org/perlonjava/operators/Directory", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("glob", "evaluate", "org/perlonjava/operators/ScalarGlobOperator", "(ILorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("glob", "evaluate", "org/perlonjava/operators/ScalarGlobOperator", "(ILorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
 
         // Modules
         put("doFile", "doFile", "org/perlonjava/operators/ModuleOperators", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
@@ -124,12 +124,12 @@ public class OperatorHandler {
         put("select", "select", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("caller", "caller", "org/perlonjava/runtime/RuntimeCode", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeList;");
         put("reset", "reset", "org/perlonjava/runtime/RuntimeScalar", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeList;");
-        put("warn", "warn", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeDataProvider;");
-        put("die", "die", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("warn", "warn", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
+        put("die", "die", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
         put("exit", "exit", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("reverse", "reverse", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("reverse", "reverse", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
         put("crypt", "crypt", "org/perlonjava/operators/Crypt", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("unlink", "unlink", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("unlink", "unlink", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
         put("stat", "stat", "org/perlonjava/operators/Stat", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeList;");
         put("lstat", "lstat", "org/perlonjava/operators/Stat", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeList;");
         put("vec", "vec", "org/perlonjava/operators/Vec", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
@@ -155,7 +155,7 @@ public class OperatorHandler {
         put("substr", "substr", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("sprintf", "sprintf", "org/perlonjava/operators/SprintfOperator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
 
-        put("systemCommand", "systemCommand", "org/perlonjava/operators/SystemOperator", "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeDataProvider;");
+        put("systemCommand", "systemCommand", "org/perlonjava/operators/SystemOperator", "(Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBaseEntity;");
         put("system", "system", "org/perlonjava/operators/SystemOperator", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("exec", "exec", "org/perlonjava/operators/SystemOperator", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("fork", "fork", "org/perlonjava/operators/SystemOperator", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeScalar;");
diff --git a/src/main/java/org/perlonjava/operators/Readline.java b/src/main/java/org/perlonjava/operators/Readline.java
@@ -14,7 +14,7 @@ public class Readline {
      * @param ctx        The context (SCALAR or LIST).
      * @return A RuntimeDataProvider with the line(s).
      */
-    public static RuntimeDataProvider readline(RuntimeScalar fileHandle, int ctx) {
+    public static RuntimeBaseEntity readline(RuntimeScalar fileHandle, int ctx) {
         RuntimeIO fh = fileHandle.getRuntimeIO();
         if (ctx == RuntimeContextType.LIST) {
             // Handle LIST context
diff --git a/src/main/java/org/perlonjava/operators/ScalarGlobOperator.java b/src/main/java/org/perlonjava/operators/ScalarGlobOperator.java
@@ -1,9 +1,6 @@
 package org.perlonjava.operators;
 
-import org.perlonjava.runtime.RuntimeContextType;
-import org.perlonjava.runtime.RuntimeDataProvider;
-import org.perlonjava.runtime.RuntimeList;
-import org.perlonjava.runtime.RuntimeScalar;
+import org.perlonjava.runtime.*;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -70,7 +67,7 @@ public ScalarGlobOperator(String pattern) {
      * @param ctx the runtime context (scalar or list)
      * @return RuntimeDataProvider containing the results
      */
-    public static RuntimeDataProvider evaluate(int id, RuntimeScalar patternArg, int ctx) {
+    public static RuntimeBaseEntity evaluate(int id, RuntimeScalar patternArg, int ctx) {
         String pattern = patternArg.toString();
 
         if (ctx == RuntimeContextType.SCALAR) {
@@ -83,7 +80,7 @@ public static RuntimeDataProvider evaluate(int id, RuntimeScalar patternArg, int
     /**
      * Evaluates glob in scalar context, returning one result per call.
      */
-    private static RuntimeDataProvider evaluateInScalarContext(int id, String pattern) {
+    private static RuntimeBaseEntity evaluateInScalarContext(int id, String pattern) {
         ScalarGlobOperator globOperator = globOperators.get(id);
 
         if (globOperator == null) {
diff --git a/src/main/java/org/perlonjava/operators/SystemOperator.java b/src/main/java/org/perlonjava/operators/SystemOperator.java
@@ -34,7 +34,7 @@ public class SystemOperator {
      * @return The output of the command as a RuntimeDataProvider.
      * @throws PerlCompilerException if an error occurs during command execution or stream handling.
      */
-    public static RuntimeDataProvider systemCommand(RuntimeScalar command, int ctx) {
+    public static RuntimeBaseEntity systemCommand(RuntimeScalar command, int ctx) {
         CommandResult result = executeCommand(command.toString(), true);
 
         // Set $? to the exit status
@@ -234,7 +234,7 @@ private static void closeQuietly(BufferedReader reader) {
      * @param ctx    The context type, determining the return type (list or scalar).
      * @return The processed output as a RuntimeDataProvider.
      */
-    private static RuntimeDataProvider processOutput(String output, int ctx) {
+    private static RuntimeBaseEntity processOutput(String output, int ctx) {
         if (ctx == RuntimeContextType.LIST) {
             RuntimeList list = new RuntimeList();
             List<RuntimeBaseEntity> result = list.elements;
diff --git a/src/main/java/org/perlonjava/operators/WarnDie.java b/src/main/java/org/perlonjava/operators/WarnDie.java
@@ -21,7 +21,7 @@ public class WarnDie {
      * @param where   Additional context or location information to append to the message.
      * @return A RuntimeDataProvider representing the result of the warning operation.
      */
-    public static RuntimeDataProvider warn(RuntimeDataProvider message, RuntimeScalar where) {
+    public static RuntimeBaseEntity warn(RuntimeDataProvider message, RuntimeScalar where) {
         String out = message.toString();
         if (out.isEmpty()) {
             RuntimeScalar err = getGlobalVariable("main::@");
@@ -71,7 +71,7 @@ public static RuntimeDataProvider warn(RuntimeDataProvider message, RuntimeScala
      * @return A RuntimeDataProvider representing the result of the die operation.
      * @throws PerlCompilerException if no custom die handler is defined.
      */
-    public static RuntimeDataProvider die(RuntimeDataProvider value, RuntimeScalar message) {
+    public static RuntimeBaseEntity die(RuntimeDataProvider value, RuntimeScalar message) {
         String out = value.toString();
         if (out.isEmpty()) {
             RuntimeScalar err = getGlobalVariable("main::@");
diff --git a/src/main/java/org/perlonjava/regex/RuntimeRegex.java b/src/main/java/org/perlonjava/regex/RuntimeRegex.java
@@ -133,7 +133,7 @@ public static RuntimeScalar getReplacementRegex(RuntimeScalar patternString, Run
      * @param ctx         The context LIST, SCALAR, VOID.
      * @return A RuntimeScalar or RuntimeList.
      */
-    public static RuntimeDataProvider matchRegex(RuntimeScalar quotedRegex, RuntimeScalar string, int ctx) {
+    public static RuntimeBaseEntity matchRegex(RuntimeScalar quotedRegex, RuntimeScalar string, int ctx) {
         RuntimeRegex regex;
         if (quotedRegex.type != RuntimeScalarType.REGEX) {
             // not a regex:  $var =~ "Test"
diff --git a/src/main/java/org/perlonjava/runtime/DiamondIO.java b/src/main/java/org/perlonjava/runtime/DiamondIO.java
@@ -54,7 +54,7 @@ public static void initialize(ArgumentParser.CompilerOptions compilerOptions) {
      * @return A RuntimeScalar representing the line read from the file, or an
      * undefined scalar if EOF is reached for all files.
      */
-    public static RuntimeDataProvider readline(RuntimeScalar arg, int ctx) {
+    public static RuntimeBaseEntity readline(RuntimeScalar arg, int ctx) {
         if (ctx == RuntimeContextType.LIST) {
             // Handle LIST context
             RuntimeList lines = new RuntimeList();
diff --git a/src/main/java/org/perlonjava/runtime/RuntimeDataProvider.java b/src/main/java/org/perlonjava/runtime/RuntimeDataProvider.java
@@ -69,13 +69,6 @@ public interface RuntimeDataProvider {
      */
     void addToArray(RuntimeArray array);
 
-    /**
-     * Adds itself to a RuntimeList.
-     *
-     * @param list the RuntimeList object to which this entity will be added
-     */
-    void addToList(RuntimeList list);
-
     /**
      * Counts the number of RuntimeScalar elements.
      *
diff --git a/src/main/java/org/perlonjava/runtime/RuntimeTypeConstants.java b/src/main/java/org/perlonjava/runtime/RuntimeTypeConstants.java
@@ -65,6 +65,8 @@ private RuntimeTypeConstants() {}
     /** Internal class name for RuntimeScalarCache */
     public static final String SCALAR_CACHE_CLASS = "org/perlonjava/runtime/RuntimeScalarCache";
 
+    public static final String BASE_CLASS = "org/perlonjava/runtime/RuntimeBaseEntity";
+
     // ===== Utility Methods =====
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -427,8 +427,8 @@ private static void addElementToList(MethodVisitor mv, Node element, int context`
`427`	`427`	`"addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", false);`
`428`	`428`	`} else {`
`429`	`429`	`// Fall back to interface call for unknown types`
`430`		`- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, RuntimeTypeConstants.DATA_PROVIDER_INTERFACE,`
`431`		`- "addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", true);`
	`430`	`+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, RuntimeTypeConstants.BASE_CLASS,`
	`431`	`+ "addToList", "(" + RuntimeTypeConstants.LIST_TYPE + ")V", false);`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public static Set<PosixFilePermission> getPosixFilePermissions(int mode) {`
`140`	`140`	`return permissions;`
`141`	`141`	`}`
`142`	`142`
`143`		`- public static RuntimeDataProvider readdir(RuntimeScalar dirHandle, int ctx) {`
	`143`	`+ public static RuntimeBaseEntity readdir(RuntimeScalar dirHandle, int ctx) {`
`144`	`144`	`RuntimeIO runtimeIO = dirHandle.getRuntimeIO();`
`145`	`145`	`if (runtimeIO.directoryIO != null) {`
`146`	`146`	`return runtimeIO.directoryIO.readdir(ctx);`