Fix the .NET API for recent Wasmtime C API changes. (#221)

Peter Huene · web-flow · commit dacd910803ac · 2023-02-06T13:21:36.000-08:00
This commit fixes the definition of `wasmtime_linker_define` to match what is
currently expected upstream.

As a result, items passed to `Linker.Define` must be associated with a store.

The internal `IExternal` interface was updated to expose the store associated
with the item for `LinkerDefine` to use.

Also update the target framework to 7.0 (still `netstandard2.1` as well).
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: '6.0.x'
+        dotnet-version: '7.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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/consumefuel/consumefuel.csproj b/examples/consumefuel/consumefuel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Function.cs b/src/Function.cs
@@ -439,6 +439,8 @@ Extern IExternal.AsExtern()
             };
         }
 
+        Store? IExternal.Store => store;
+
         internal Function()
         {
             this.store = null;
diff --git a/src/Global.cs b/src/Global.cs
@@ -185,6 +185,8 @@ Extern IExternal.AsExtern()
             };
         }
 
+        Store? IExternal.Store => store;
+
         internal Global(Store store, ExternGlobal global)
         {
             this.global = global;
@@ -309,6 +311,8 @@ Extern IExternal.AsExtern()
             {
                 return ((IExternal)_global).AsExtern();
             }
+
+            Store? IExternal.Store => _store;
         }
     }
 }
diff --git a/src/Linker.cs b/src/Linker.cs
@@ -63,6 +63,11 @@ public void Define(string module, string name, object item)
                 throw new ArgumentException($"Objects of type `{item.GetType()}` cannot be defined in a linker.");
             }
 
+            if (external.Store is null)
+            {
+                throw new ArgumentException($"The item is not associated with a store.");
+            }
+
             var ext = external.AsExtern();
 
             unsafe
@@ -71,11 +76,13 @@ public void Define(string module, string name, object item)
                 var nameBytes = Encoding.UTF8.GetBytes(name);
                 fixed (byte* modulePtr = moduleBytes, namePtr = nameBytes)
                 {
-                    var error = Native.wasmtime_linker_define(handle, modulePtr, (UIntPtr)moduleBytes.Length, namePtr, (UIntPtr)nameBytes.Length, ext);
+                    var error = Native.wasmtime_linker_define(handle, external.Store.Context.handle, modulePtr, (UIntPtr)moduleBytes.Length, namePtr, (UIntPtr)nameBytes.Length, ext);
                     if (error != IntPtr.Zero)
                     {
                         throw WasmtimeException.FromOwnedError(error);
                     }
+
+                    GC.KeepAlive(external);
                 }
             }
         }
@@ -473,7 +480,7 @@ internal static class Native
             public static extern void wasmtime_linker_allow_shadowing(Handle linker, [MarshalAs(UnmanagedType.I1)] bool allow);
 
             [DllImport(Engine.LibraryName)]
-            public static unsafe extern IntPtr wasmtime_linker_define(Handle linker, byte* module, nuint moduleLen, byte* name, nuint nameLen, in Extern item);
+            public static unsafe extern IntPtr wasmtime_linker_define(Handle linker, IntPtr context, byte* module, nuint moduleLen, byte* name, nuint nameLen, in Extern item);
 
             [DllImport(Engine.LibraryName)]
             public static extern IntPtr wasmtime_linker_define_wasi(Handle linker);
diff --git a/src/Memory.cs b/src/Memory.cs
@@ -540,6 +540,9 @@ Extern IExternal.AsExtern()
                 of = new ExternUnion { memory = this.memory }
             };
         }
+
+        Store? IExternal.Store => store;
+
         internal Memory(Store store, ExternMemory memory)
         {
             this.memory = memory;
diff --git a/src/Module.cs b/src/Module.cs
@@ -28,6 +28,8 @@ private static class Native
     internal interface IExternal
     {
         Extern AsExtern();
+
+        Store? Store { get; }
     }
 
     /// <summary>
diff --git a/src/Table.cs b/src/Table.cs
@@ -173,6 +173,8 @@ Extern IExternal.AsExtern()
             };
         }
 
+        Store? IExternal.Store => store;
+
         internal class TypeHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
             public TypeHandle(IntPtr handle)
diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
diff --git a/tests/Wasmtime.Tests.csproj b/tests/Wasmtime.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
