fix(csharp): componentize map runtime with harness metadata

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

Author: yordis

Cargo.lock

@@ -23,7 +23,6 @@ test = false
 wit-bindgen-core = { workspace = true }
 wit-component = { workspace = true }
 wit-parser = { workspace = true }
-wasm-encoder = { workspace = true }
 wasm-metadata = { workspace = true }
 heck = { workspace = true }
 clap = { workspace = true, optional = true }

crates/csharp/Cargo.toml

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use std::{fs, path::PathBuf};
 
-use heck::{ToSnakeCase, ToUpperCamelCase};
+use heck::ToUpperCamelCase;
 
 pub struct CSProject;
 
@@ -12,7 +12,7 @@ pub struct CSProjectLLVMBuilder {
     clean_targets: bool,
     world_name: String,
     binary: bool,
-    component_type_object: bool,
+    skip_wit_component: bool,
 }
 
 pub struct CSProjectMonoBuilder {
@@ -32,7 +32,7 @@ impl CSProject {
             clean_targets: false,
             world_name: world_name.to_string(),
             binary: false,
-            component_type_object: false,
+            skip_wit_component: false,
         }
     }
 
@@ -71,21 +71,8 @@ impl CSProjectLLVMBuilder {
             "<OutputType>Library</OutputType>"
         };
 
-        let component_type_define = if self.component_type_object {
-            "<DefineConstants>$(DefineConstants);WIT_BINDGEN_COMPONENT_TYPE_OBJECT</DefineConstants>"
-        } else {
-            ""
-        };
-
-        let component_type_linker_arg = if self.component_type_object {
-            let linking_symbol = format!(
-                "__component_type_object_force_link_{}",
-                self.world_name.to_snake_case()
-            );
-            format!(
-                "<NativeFileReference Include=\"{camel}_component_type.o\" />\n\
-                 <CustomLinkerArg Include=\"-Wl,--undefined={linking_symbol}\" />"
-            )
+        let component_type_linker_arg = if self.skip_wit_component {
+            "<CustomLinkerArg Include=\"-Wl,--skip-wit-component\" />".to_string()
         } else {
             format!(
                 "<CustomLinkerArg Include=\"-Wl,--component-type,{camel}_component_type.wit\" />"
@@ -105,7 +92,6 @@ impl CSProjectLLVMBuilder {
             <!-- treat these are errors so they are caught during code generation tests -->
             <WarningsAsErrors>CS0105</WarningsAsErrors>
             {output_type}
-            {component_type_define}
         </PropertyGroup>
 
         <PropertyGroup>
@@ -202,8 +188,8 @@ impl CSProjectLLVMBuilder {
         self.binary = true;
     }
 
-    pub fn component_type_object(&mut self) {
-        self.component_type_object = true;
+    pub fn skip_wit_component(&mut self) {
+        self.skip_wit_component = true;
     }
 
     pub fn clean(&mut self) -> &mut Self {

crates/csharp/src/csproj.rs

@@ -2,16 +2,12 @@ use crate::csharp_ident::ToCSharpIdent;
 use crate::function::ResourceInfo;
 use crate::interface::{InterfaceFragment, InterfaceGenerator, InterfaceTypeAndFragments};
 use crate::{CSharpRuntime, Opts};
-use heck::{ToSnakeCase, ToUpperCamelCase};
+use heck::ToUpperCamelCase;
 use indexmap::IndexMap;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Write;
 use std::ops::Deref;
 use std::{iter, mem};
-use wasm_encoder::{
-    CodeSection, CustomSection, Function as WasmFunction, FunctionSection, LinkingSection, Module,
-    SymbolTable, TypeSection,
-};
 use wit_bindgen_core::{Direction, Files, InterfaceGenerator as _, Types, WorldGenerator, uwrite};
 use wit_component::WitPrinter;
 use wit_parser::abi::WasmType;
@@ -861,43 +857,6 @@ impl WorldGenerator for CSharp {
                     &format!("{world_namespace}_component_type.wit"),
                     String::from(printer.output).as_bytes(),
                 );
-                files.push(
-                    &format!("{world_namespace}_component_type.o"),
-                    component_type_object(
-                        &resolve,
-                        world,
-                        &resolve.worlds[world].name,
-                        self.opts.string_encoding,
-                    )?
-                    .as_slice(),
-                );
-                let linking_symbol = format!(
-                    "__component_type_object_force_link_{}",
-                    resolve.worlds[world].name.to_snake_case()
-                );
-                files.push(
-                    &format!("{world_namespace}_component_type_force_link.cs"),
-                    indent(&format!(
-                        r#"
-                        #if WIT_BINDGEN_COMPONENT_TYPE_OBJECT
-                        namespace {world_namespace};
-
-                        internal static partial class ComponentTypeObjectForceLink
-                        {{
-                            [global::System.Runtime.InteropServices.DllImport("__Internal", EntryPoint = "{linking_symbol}")]
-                            private static extern void ForceLink();
-
-                            [global::System.Runtime.CompilerServices.ModuleInitializer]
-                            internal static void Initialize()
-                            {{
-                                ForceLink();
-                            }}
-                        }}
-                        #endif
-                        "#
-                    ))
-                    .as_bytes(),
-                );
             }
 
             // TODO: remove when we switch to dotnet 9
@@ -1158,58 +1117,6 @@ fn by_resource<'a>(
     by_resource
 }
 
-fn component_type_object(
-    resolve: &Resolve,
-    world: WorldId,
-    world_name: &str,
-    encoding: wit_component::StringEncoding,
-) -> anyhow::Result<Vec<u8>> {
-    let mut module = Module::new();
-
-    let mut types = TypeSection::new();
-    types.ty().function([], []);
-    module.section(&types);
-
-    let mut funcs = FunctionSection::new();
-    funcs.function(0);
-    module.section(&funcs);
-
-    let mut code = CodeSection::new();
-    let mut func = WasmFunction::new([]);
-    func.instruction(&wasm_encoder::Instruction::End);
-    code.function(&func);
-    module.section(&code);
-
-    let mut producers = wasm_metadata::Producers::empty();
-    producers.add(
-        "processed-by",
-        env!("CARGO_PKG_NAME"),
-        env!("CARGO_PKG_VERSION"),
-    );
-    let data = wit_component::metadata::encode(resolve, world, encoding, Some(&producers))?;
-    let section_name = format!("component-type:{world_name}");
-
-    module.section(&CustomSection {
-        name: std::borrow::Cow::Borrowed(&section_name),
-        data: std::borrow::Cow::Borrowed(data.as_slice()),
-    });
-
-    let mut linking = LinkingSection::new();
-    let mut symbols = SymbolTable::new();
-    symbols.function(
-        0,
-        0,
-        Some(&format!(
-            "__component_type_object_force_link_{}",
-            world_name.to_snake_case()
-        )),
-    );
-    linking.symbol_table(&symbols);
-    module.section(&linking);
-
-    Ok(module.finish())
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

crates/csharp/src/world_generator.rs

@@ -12,7 +12,7 @@ pub struct Csharp;
 #[derive(Default, Deserialize)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 struct LangConfig {
-    component_type_object: bool,
+    skip_wit_component: bool,
 }
 
 fn dotnet() -> Command {
@@ -83,8 +83,8 @@ impl LanguageMethods for Csharp {
         let mut csproj =
             wit_bindgen_csharp::CSProject::new(test_dir.to_path_buf(), &assembly_name, world_name);
         csproj.aot();
-        if config.component_type_object {
-            csproj.component_type_object();
+        if config.skip_wit_component {
+            csproj.skip_wit_component();
         }
         csproj.generate()?;
 
@@ -120,7 +120,11 @@ impl LanguageMethods for Csharp {
 
         runner.run_command(&mut cmd)?;
 
-        fs::copy(&wasm_filename, &compile.output)?;
+        if config.skip_wit_component {
+            runner.convert_p1_to_component_appending_type_metadata(&wasm_filename, compile)?;
+        } else {
+            fs::copy(&wasm_filename, &compile.output)?;
+        }
 
         Ok(())
     }

crates/test/src/csharp.rs

@@ -1081,14 +1081,38 @@ status: {}",
     ///
     /// Stores the output at `compile.output`.
     fn convert_p1_to_component(&self, p1: &Path, compile: &Compile<'_>) -> Result<()> {
+        self.convert_p1_to_component_impl(p1, compile, false)
+    }
+
+    /// Converts the WASIp1 module at `p1` to a component, appending component
+    /// type metadata from the test WIT even if existing metadata is present.
+    ///
+    /// Some toolchains emit incomplete or stale component type metadata even
+    /// when asked to skip componentization, while still needing their own
+    /// metadata for WASI imports. Use this when the test harness must add
+    /// guest-world metadata without discarding toolchain metadata.
+    fn convert_p1_to_component_appending_type_metadata(
+        &self,
+        p1: &Path,
+        compile: &Compile<'_>,
+    ) -> Result<()> {
+        self.convert_p1_to_component_impl(p1, compile, true)
+    }
+
+    fn convert_p1_to_component_impl(
+        &self,
+        p1: &Path,
+        compile: &Compile<'_>,
+        append_component_type: bool,
+    ) -> Result<()> {
         let mut resolve = wit_parser::Resolve::default();
         let (pkg, _) = resolve
             .push_path(&compile.component.bindgen.wit_path)
             .context("failed to load WIT")?;
         let world = resolve.select_world(&[pkg], Some(&compile.component.bindgen.world))?;
         let mut module = fs::read(&p1).context("failed to read wasm file")?;
 
-        if !has_component_type_sections(&module) {
+        if append_component_type || !has_component_type_sections(&module) {
             let encoded =
                 wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None)?;
             let section = wasm_encoder::CustomSection {

crates/test/src/lib.rs

@@ -1,6 +1,6 @@
 //@ wasmtime-flags = '-Wcomponent-model-map'
 //@ [lang]
-//@ component-type-object = true
+//@ skip-wit-component = true
 
 using System.Diagnostics;
 using System.Text;