Fix CI. (#305)

peterhuene · web-flow · commit b2b0480e127c · 2024-04-16T12:47:25.000-07:00
* Fix CI.

This commit:

* Updates target framework to `net8.0`.
* Fixes the `externref` API to match recent changes in upstream Wasmtime.
* Remove WASI "snapshot 0" from the tests (so old!).

* Bump .NET version in CI.

* Attempt to fix Windows CI.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     #  workaround for actions/setup-dotnet#155
     - name: Clear package cache
       run: dotnet clean Wasmtime.sln && dotnet nuget locals all --clear
diff --git a/benchmarks/simple/simple.csproj b/benchmarks/simple/simple.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <ProjectReference Include="..\..\src\Wasmtime.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <ProjectReference Include="..\..\src\Wasmtime.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/examples/consumefuel/consumefuel.csproj b/examples/consumefuel/consumefuel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/externref/externref.csproj b/examples/externref/externref.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/funcref/funcref.csproj b/examples/funcref/funcref.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/global/global.csproj b/examples/global/global.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/hello/hello.csproj b/examples/hello/hello.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/examples/memory/memory.csproj b/examples/memory/memory.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/storedata/storedata.csproj b/examples/storedata/storedata.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/examples/table/table.csproj b/examples/table/table.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Function.cs b/src/Function.cs
@@ -132,7 +132,7 @@ public bool CheckTypeSignature(Type? returnType = null, params Type[] parameters
             }
 
             // Validate the return type(s)
-            if(returnType != null)
+            if (returnType != null)
             {
                 // Multiple return types are represented by a tuple.
                 if (returnType.IsTupleType())
@@ -295,7 +295,7 @@ private unsafe void InvokeWithoutReturn(Span<ValueRaw> arguments, StoreContext s
             Span<Value> args = stackalloc Value[Parameters.Count];
             for (var i = 0; i < arguments.Length; ++i)
             {
-                args[i] = arguments[i].ToValue(Parameters[i]);
+                args[i] = arguments[i].ToValue(store, Parameters[i]);
             }
 
             // Make some space to store the return results
@@ -641,14 +641,14 @@ internal static unsafe IntPtr InvokeUntypedCallback(UntypedCallbackDelegate call
 
                     for (int i = 0; i < argumentsSpan.Length; i++)
                     {
-                        argumentsSpan[i] = args[i].ToValueBox();
+                        argumentsSpan[i] = args[i].ToValueBox(caller.Store);
                     }
 
                     callback(caller, argumentsSpan, resultsSpan);
 
                     for (int i = 0; i < resultsSpan.Length; i++)
                     {
-                        results[i] = resultsSpan[i].ToValue(resultKinds[i]);
+                        results[i] = resultsSpan[i].ToValue(caller.Store, resultKinds[i]);
                     }
                 }
                 finally
diff --git a/src/Global.cs b/src/Global.cs
@@ -117,7 +117,7 @@ public Global(Store store, ValueKind kind, object? initialValue, Mutability muta
                 throw new InvalidOperationException("Failed to create global type, invalid ValueKind or Mutability");
             }
 
-            var value = Value.FromObject(initialValue, Kind);
+            var value = Value.FromObject(store, initialValue, Kind);
             var error = Native.wasmtime_global_new(store.Context.handle, globalType, in value, out this.global);
             GC.KeepAlive(store);
 
@@ -155,7 +155,7 @@ public void SetValue(object? value)
                 throw new InvalidOperationException("The global is immutable and cannot be changed.");
             }
 
-            var v = Value.FromObject(value, Kind);
+            var v = Value.FromObject(store, value, Kind);
             Native.wasmtime_global_set(store.Context.handle, this.global, in v);
             GC.KeepAlive(store);
 
@@ -300,7 +300,7 @@ public T GetValue()
                 Native.wasmtime_global_get(context.handle, _global.global, out var v);
                 GC.KeepAlive(_store);
 
-                var result = _converter.Unbox(_store, v.ToValueBox());
+                var result = _converter.Unbox(_store, v.ToValueBox(_store));
                 v.Dispose();
 
                 return result;
@@ -317,7 +317,7 @@ public void SetValue(T value)
                     throw new InvalidOperationException("The global is immutable and cannot be changed.");
                 }
 
-                using (var v = _converter.Box(value).ToValue(_global.Kind))
+                using (var v = _converter.Box(value).ToValue(_store, _global.Kind))
                 {
                     var context = _store.Context;
                     Native.wasmtime_global_set(context.handle, _global.global, in v);
diff --git a/src/Instance.cs b/src/Instance.cs
@@ -667,7 +667,7 @@ public Instance(Store store, Module module, params object[] imports)
 
                 if (type != null && type.Value != @extern.kind)
                 {
-                    return  null;
+                    return null;
                 }
 
                 var name = Encoding.UTF8.GetString(namePtr, checked((int)nameLen));
diff --git a/src/Linker.cs b/src/Linker.cs
@@ -60,7 +60,7 @@ private void Define<T>(string module, string name, T item)
             }
 
             var ext = item.AsExtern();
-            
+
             using var nameBytes = name.ToUTF8(stackalloc byte[Math.Min(64, name.Length * 2)]);
             using var moduleBytes = module.ToUTF8(stackalloc byte[Math.Min(64, module.Length * 2)]);
 
diff --git a/src/Table.cs b/src/Table.cs
@@ -78,7 +78,7 @@ public Table(Store store, TableKind kind, object? initialValue, uint initial, ui
                 limits
             ));
 
-            var value = Value.FromObject(initialValue, Kind);
+            var value = Value.FromObject(store, initialValue, Kind);
             var error = Native.wasmtime_table_new(store.Context.handle, tableType, in value, out this.table);
             GC.KeepAlive(store);
             value.Dispose();
@@ -132,7 +132,7 @@ public Table(Store store, TableKind kind, object? initialValue, uint initial, ui
         /// <param name="value">The value to set.</param>
         public void SetElement(uint index, object? value)
         {
-            var v = Value.FromObject(value, Kind);
+            var v = Value.FromObject(store, value, Kind);
             var error = Native.wasmtime_table_set(store.Context.handle, this.table, index, v);
             GC.KeepAlive(store);
             v.Dispose();
@@ -162,7 +162,7 @@ public uint GetSize()
         /// <returns>Returns the previous number of elements in the table.</returns>
         public uint Grow(uint delta, object? initialValue)
         {
-            var v = Value.FromObject(initialValue, Kind);
+            var v = Value.FromObject(store, initialValue, Kind);
 
             var error = Native.wasmtime_table_grow(store.Context.handle, this.table, delta, v, out var prev);
             GC.KeepAlive(store);
diff --git a/src/TrapException.cs b/src/TrapException.cs
@@ -243,9 +243,6 @@ public TrapException(string message, Exception? inner) : base(message, inner) {
         /// </summary>
         public TrapCode Type { get; private set; }
 
-        /// <inheritdoc/>
-        protected TrapException(SerializationInfo info, StreamingContext context) : base(info, context) { }
-
         internal TrapException(string message, IReadOnlyList<TrapFrame>? frames, TrapCode type, Exception? innerException = null)
             : base(message, innerException)
         {
diff --git a/src/Value.cs b/src/Value.cs
@@ -222,7 +222,7 @@ public static bool TryGetKind(Type type, out ValueKind kind)
             return false;
         }
 
-        public static Value FromValueBox(ValueBox box)
+        public static Value FromValueBox(Store store, ValueBox box)
         {
             var value = new Value();
             value.kind = box.Kind;
@@ -235,33 +235,36 @@ public static Value FromValueBox(ValueBox box)
                 if (box.ExternRefObject is not null)
                 {
                     value.of.externref = Native.wasmtime_externref_new(
+                        store.Context.handle,
                         GCHandle.ToIntPtr(GCHandle.Alloc(box.ExternRefObject)),
                         Finalizer
                     );
+
+                    GC.KeepAlive(store);
                 }
             }
 
             return value;
         }
 
-        public ValueBox ToValueBox()
+        public ValueBox ToValueBox(Store store)
         {
             if (kind != ValueKind.ExternRef)
             {
                 return new ValueBox(kind, of);
             }
             else
             {
-                return new ValueBox(ResolveExternRef());
+                return new ValueBox(ResolveExternRef(store));
             }
         }
 
-        public static Value FromObject(object? o, TableKind kind)
+        public static Value FromObject(Store store, object? o, TableKind kind)
         {
-            return FromObject(o, (ValueKind)kind);
+            return FromObject(store, o, (ValueKind)kind);
         }
 
-        public static Value FromObject(object? o, ValueKind kind)
+        public static Value FromObject(Store store, object? o, ValueKind kind)
         {
             var value = new Value();
             value.kind = kind;
@@ -306,9 +309,12 @@ public static Value FromObject(object? o, ValueKind kind)
                         if (!(o is null))
                         {
                             value.of.externref = Native.wasmtime_externref_new(
+                                store.Context.handle,
                                 GCHandle.ToIntPtr(GCHandle.Alloc(o)),
                                 Value.Finalizer
                             );
+
+                            GC.KeepAlive(store);
                         }
                         break;
 
@@ -360,7 +366,7 @@ public static Value FromObject(object? o, ValueKind kind)
                     return of.v128;
 
                 case ValueKind.ExternRef:
-                    return ResolveExternRef();
+                    return ResolveExternRef(store);
 
                 case ValueKind.FuncRef:
                     return store.GetCachedExtern(of.funcref);
@@ -370,13 +376,13 @@ public static Value FromObject(object? o, ValueKind kind)
             }
         }
 
-        private object? ResolveExternRef()
+        private object? ResolveExternRef(Store store)
         {
             if (of.externref == IntPtr.Zero)
             {
                 return null;
             }
-            var data = Native.wasmtime_externref_data(of.externref);
+            var data = Native.wasmtime_externref_data(store.Context.handle, of.externref);
             if (data == IntPtr.Zero)
             {
                 return null;
@@ -392,13 +398,13 @@ public static class Native
             public static extern void wasmtime_val_delete(in Value val);
 
             [DllImport(Engine.LibraryName)]
-            public static extern IntPtr wasmtime_externref_new(IntPtr data, Finalizer? finalizer);
+            public static extern IntPtr wasmtime_externref_new(IntPtr context, IntPtr data, Finalizer? finalizer);
 
             [DllImport(Engine.LibraryName)]
-            public static extern IntPtr wasmtime_externref_data(IntPtr externref);
+            public static extern IntPtr wasmtime_externref_data(IntPtr context, IntPtr externref);
 
             [DllImport(Engine.LibraryName)]
-            public static extern void wasmtime_externref_delete(IntPtr externref);
+            public static extern void wasmtime_externref_delete(IntPtr context, IntPtr externref);
 
             [DllImport(Engine.LibraryName)]
             public static extern IntPtr wasmtime_externref_from_raw(IntPtr context, IntPtr raw);
diff --git a/src/ValueBox.cs b/src/ValueBox.cs
@@ -84,7 +84,7 @@ public V128 AsV128()
         public Function AsFunction(Store store)
         {
             ThrowIfNotOfCorrectKind(ValueKind.FuncRef);
-            
+
             return store.GetCachedExtern(Union.funcref);
         }
 
@@ -100,12 +100,12 @@ public Function AsFunction(Store store)
             return (T?)ExternRefObject;
         }
 
-        internal Value ToValue(ValueKind convertTo)
+        internal Value ToValue(Store store, ValueKind convertTo)
         {
             if (convertTo != Kind)
-                return Value.FromValueBox(ConvertTo(convertTo));
+                return Value.FromValueBox(store, ConvertTo(convertTo));
 
-            return Value.FromValueBox(this);
+            return Value.FromValueBox(store, this);
         }
 
         private ValueBox ConvertTo(ValueKind convertTo)
diff --git a/src/ValueRaw.cs b/src/ValueRaw.cs
@@ -263,15 +263,15 @@ private GenericValueRawConverter()
 
                 try
                 {
-                    var data = Value.Native.wasmtime_externref_data(externref);
+                    var data = Value.Native.wasmtime_externref_data(storeContext.handle, externref);
                     if (data != IntPtr.Zero)
                     {
                         o = GCHandle.FromIntPtr(data).Target!;
                     }
                 }
                 finally
                 {
-                    Value.Native.wasmtime_externref_delete(externref);
+                    Value.Native.wasmtime_externref_delete(storeContext.handle, externref);
                 }
             }
 
@@ -285,6 +285,7 @@ public void Box(StoreContext storeContext, Store store, ref ValueRaw valueRaw, T
             if (value is not null)
             {
                 var externref = Value.Native.wasmtime_externref_new(
+                    storeContext.handle,
                     GCHandle.ToIntPtr(GCHandle.Alloc(value)),
                     Value.Finalizer);
 
@@ -300,7 +301,7 @@ public void Box(StoreContext storeContext, Store store, ref ValueRaw valueRaw, T
                 {
                     // We still must delete the old externref afterwards because
                     // wasmtime_externref_to_raw doesn't transfer ownership.
-                    Value.Native.wasmtime_externref_delete(externref);
+                    Value.Native.wasmtime_externref_delete(storeContext.handle, externref);
                 }
             }
 
diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj
diff --git a/src/WasmtimeException.cs b/src/WasmtimeException.cs
diff --git a/tests/EpochInterruptionTests.cs b/tests/EpochInterruptionTests.cs
diff --git a/tests/Modules/WasiSnapshot0.wat b/tests/Modules/WasiSnapshot0.wat
diff --git a/tests/ValueBoxTests.cs b/tests/ValueBoxTests.cs
diff --git a/tests/WasiTests.cs b/tests/WasiTests.cs
diff --git a/tests/Wasmtime.Tests.csproj b/tests/Wasmtime.Tests.csproj
