update C# generator to match latest ILC package (#1025)

This also locks the ILC dependencies to a specific version to avoid future
surprises.

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

crates/csharp/src/csproj.rs

@@ -77,51 +77,27 @@ impl CSProjectLLVMBuilder {
             <PublishTrimmed>true</PublishTrimmed>
             <AssemblyName>{name}</AssemblyName>
         </PropertyGroup>
+
         <ItemGroup>
-          <NativeLibrary Include=\"{camel}_component_type.o\" />
-          <NativeLibrary Include=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o\" />
+            <RdXmlFile Include=\"rd.xml\" />
         </ItemGroup>
 
         <ItemGroup>
-            <RdXmlFile Include=\"rd.xml\" />
+            <CustomLinkerArg Include=\"-Wl,--component-type,{camel}_component_type.wit\" />
         </ItemGroup>
         "
         );
 
         if self.aot {
-            //TODO: Is this handled by the source generator? (Temporary just to test with numbers and strings)
             csproj.push_str(
                 r#"
                 <ItemGroup>
-                    <CustomLinkerArg Include="-Wl,--export,_initialize" />
-                    <CustomLinkerArg Include="-Wl,--no-entry" />
-                    <CustomLinkerArg Include="-mexec-model=reactor" />
-                </ItemGroup>
-   
-                <ItemGroup>
-                    <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-*" />
-                    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-*" />
+                    <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-rc.1.24412.1" />
+                    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-rc.1.24412.1" />
                 </ItemGroup>
-
-                <Target Name="CheckWasmSdks">
-                    <Error Text="Wasi SDK not found, not compiling to WebAssembly. To enable WebAssembly compilation, install Wasi SDK and ensure the WASI_SDK_PATH environment variable points to the directory containing share/wasi-sysroot"
-                        Condition="'$(WASI_SDK_PATH)' == ''" />
-                    <Warning Text="The WASI SDK version is too low. Please use WASI SDK 22 or newer with a 64 bit Clang."
-                        Condition="!Exists('$(WASI_SDK_PATH)/VERSION')" />
-                </Target>
                 "#,
             );
 
-            csproj.push_str(&format!("
-              <Target Name=\"CompileCabiRealloc\" BeforeTargets=\"IlcCompile\" DependsOnTargets=\"CheckWasmSdks\" 
-                Inputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c\"
-                Outputs=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o\"
-                >
-                <Exec Command=\"&quot;$(WASI_SDK_PATH)/bin/clang&quot; --target=wasm32-wasi &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c&quot; -c -o &quot;$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o&quot;\"/>
-              </Target>
-            "
-            ));
-
             fs::write(
                 self.dir.join("nuget.config"),
                 r#"<?xml version="1.0" encoding="utf-8"?>

crates/csharp/src/lib.rs

@@ -692,31 +692,6 @@ impl WorldGenerator for CSharp {
         }
 
         if !self.opts.skip_support_files {
-            let cabi_relloc_src = r#"
-                #include <stdlib.h>
-
-                /* Done in C so we can avoid initializing the dotnet runtime and hence WASI libc */
-                /* It would be preferable to do this in C# but the constraints of cabi_realloc and the demands */
-                /* of WASI libc prevent us doing so. */
-                /* See https://github.com/bytecodealliance/wit-bindgen/issues/777  */
-                /* and https://github.com/WebAssembly/wasi-libc/issues/452 */
-                /* The component model `start` function might be an alternative to this depending on whether it */
-                /* has the same constraints as `cabi_realloc` */
-                __attribute__((__weak__, __export_name__("cabi_realloc")))
-                void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
-                    (void) old_size;
-                    if (new_size == 0) return (void*) align;
-                    void *ret = realloc(ptr, new_size);
-                    if (!ret) abort();
-                    return ret;
-                }
-            "#;
-
-            files.push(
-                &format!("{name}World_cabi_realloc.c"),
-                indent(cabi_relloc_src).as_bytes(),
-            );
-
             //TODO: This is currently needed for mono even if it's built as a library.
             if self.opts.runtime == CSharpRuntime::Mono {
                 files.push(

tests/runtime/main.rs

@@ -749,25 +749,7 @@ fn tests(name: &str, dir_name: &str) -> Result<Vec<PathBuf>> {
                 panic!("failed to compile");
             }
 
-            // Translate the canonical ABI module into a component.
-
-            let module = fs::read(&wasm_filename).expect("failed to read wasm file");
-            let component = ComponentEncoder::default()
-                .module(module.as_slice())
-                .expect("pull custom sections from module")
-                .validate(true)
-                .adapter("wasi_snapshot_preview1", &wasi_adapter)
-                .expect("adapter failed to get loaded")
-                .realloc_via_memory_grow(true)
-                .encode()
-                .expect(&format!(
-                    "module {:?} can be translated to a component",
-                    out_wasm
-                ));
-            let component_path = out_wasm.with_extension("component.wasm");
-            fs::write(&component_path, component).expect("write component to disk");
-
-            result.push(component_path);
+            result.push(wasm_filename);
         }
     }