Host colectable GC references

annotations/it/src/it/all-imports/src/test/java/endive/test/AllImportsTest.java

@@ -20,6 +20,7 @@
 import run.endive.wasm.types.Value;
 import run.endive.wasm.types.ValueType;
 
+@SuppressWarnings("deprecation")
 class AllImportsTest {
 
     @WasmModuleInterface("all-imports.wat.wasm")

annotations/it/src/it/externref-base/src/test/java/endive/test/ExternRefExampleTest.java

@@ -1,6 +1,7 @@
 package endive.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 import run.endive.annotations.WasmModuleInterface;
@@ -34,28 +35,25 @@ public TestModule_ModuleExports exports() {
 
         private Object sampleObj = null;
 
-        public long getHostObject() {
+        public Object getHostObject() {
             sampleObj = new Object();
-            return 123;
+            return sampleObj;
         }
 
-        public int isNull(long arg0) {
-            if (arg0 != 123) {
-                throw new RuntimeException("unrecognized external ref");
-            }
-            return (sampleObj == null) ? 1 : 0;
+        public int isNull(Object arg0) {
+            return (arg0 == null) ? 1 : 0;
         }
     }
 
     @Test
     public void testExternRef() {
         var module = new TestModule();
 
-        assertEquals(1, module.exports().isNull(123L));
+        assertEquals(1, module.exports().isNull(null));
 
         var hostObj = module.exports().getHostObject();
-        assertEquals(123, hostObj);
+        assertNotNull(hostObj);
 
-        assertEquals(0, module.exports().isNull(123L));
+        assertEquals(0, module.exports().isNull(hostObj));
     }
 }

compiler-tests/src/test/java/run/endive/testing/ArgsAdapter.java

@@ -1,36 +1,58 @@
 package run.endive.testing;
 
-import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import run.endive.runtime.CallResult;
+import run.endive.runtime.ExportFunction;
 
 public final class ArgsAdapter {
-    private final ArrayDeque<Long> stack;
+    private final List<Long> longs = new ArrayList<>();
+    private final List<Object> refs = new ArrayList<>();
+    private boolean hasRefs;
 
-    private ArgsAdapter() {
-        stack = new ArrayDeque<>();
-    }
+    private ArgsAdapter() {}
 
     public static ArgsAdapter builder() {
         return new ArgsAdapter();
     }
 
-    public long[] build() {
-        var result = new long[stack.size()];
-        int i = stack.size() - 1;
-        while (!stack.isEmpty()) {
-            result[i--] = stack.pop();
-        }
-        return result;
+    public ArgsAdapter add(long arg) {
+        longs.add(arg);
+        refs.add(null);
+        return this;
     }
 
     public ArgsAdapter add(long[] args) {
         for (var arg : args) {
-            stack.push(arg);
+            longs.add(arg);
+            refs.add(null);
         }
         return this;
     }
 
-    public ArgsAdapter add(long arg) {
-        stack.push(arg);
+    public ArgsAdapter addRef(Object ref) {
+        longs.add(0L);
+        refs.add(ref);
+        hasRefs = true;
         return this;
     }
+
+    public long[] build() {
+        var result = new long[longs.size()];
+        for (int i = 0; i < longs.size(); i++) {
+            result[i] = longs.get(i);
+        }
+        return result;
+    }
+
+    public Object[] buildRefs() {
+        if (!hasRefs) {
+            return null;
+        }
+        return refs.toArray();
+    }
+
+    public CallResult applyWithRefs(ExportFunction func) {
+        return func.applyWithRefs(build(), buildRefs());
+    }
 }

compiler-tests/src/test/java/run/endive/testing/Spectest.java

@@ -21,6 +21,7 @@
 import run.endive.wasm.types.Value;
 
 // https://github.com/WebAssembly/spec/blob/ee82c8e50c5106e0cedada0a083d4cc4129034a2/interpreter/host/spectest.ml
+@SuppressWarnings("deprecation")
 public final class Spectest {
     private static final WasmFunctionHandle noop = (Instance instance, long... args) -> null;
 

compiler-tests/src/test/resources/run/endive/testing/InterpreterFallbackTest.testSilentInterpreterFallback-indirect.approved.txt

@@ -16,4 +16,4 @@ run.endive.testing.Test3MachineFuncGroup_0.func_3
 run.endive.testing.Test3MachineFuncGroup_0.call_3
 run.endive.testing.Test3MachineMachineCall.call
 run.endive.testing.Test3Machine.call
-run.endive.runtime.Instance$Exports.lambda$function$0
+run.endive.runtime.Instance$Exports$1.apply

compiler-tests/src/test/resources/run/endive/testing/InterpreterFallbackTest.testSilentInterpreterFallback.approved.txt

@@ -16,4 +16,4 @@ run.endive.testing.Test3MachineFuncGroup_0.func_3
 run.endive.testing.Test3MachineFuncGroup_0.call_3
 run.endive.testing.Test3MachineMachineCall.call
 run.endive.testing.Test3Machine.call
-run.endive.runtime.Instance$Exports.lambda$function$0
+run.endive.runtime.Instance$Exports$1.apply

compiler-tests/src/test/resources/run/endive/testing/MethodTooLargeTest.testBigFunc.approved.txt

@@ -3,6 +3,8 @@ private final Lrun/endive/runtime/Instance; instance
   private final Lrun/endive/runtime/internal/CompilerInterpreterMachine; compilerInterpreterMachine
 }
 
+  public final static INNERCLASS run/endive/runtime/ConstantEvaluators$ConstantResult run/endive/runtime/ConstantEvaluators ConstantResult
+
   private final static Z memCopyWorkaround
 }