Implement feedback

Author: tolumide-ng

crates/c-api/include/wasmtime/config.hh

@@ -303,13 +303,15 @@ class Config {
     wasmtime_config_wasm_tail_call_set(ptr.get(), enable);
   }
 
+  #ifdef WASMTIME_FEATURE_GC
   /// \brief Configures whether the WebAssembly reference types proposal is
   /// enabled
   ///
   /// https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_reference_types
   void wasm_reference_types(bool enable) {
     wasmtime_config_wasm_reference_types_set(ptr.get(), enable);
   }
+  #endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly simd proposal is enabled
   ///
@@ -361,11 +363,13 @@ class Config {
     wasmtime_config_wasm_memory64_set(ptr.get(), enable);
   }
 
+  #ifdef WASMTIME_FEATURE_GC
   /// \brief Configures whether the WebAssembly Garbage Collection proposal will
   /// be enabled
   ///
   /// https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_gc
   void wasm_gc(bool enable) { wasmtime_config_wasm_gc_set(ptr.get(), enable); }
+  #endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly function references proposal
   /// will be enabled
@@ -383,13 +387,15 @@ class Config {
     wasmtime_config_wasm_wide_arithmetic_set(ptr.get(), enable);
   }
 
+  #ifdef WASMTIME_FEATURE_GC
   /// \brief Configures whether the WebAssembly exceptions proposal will be
   /// enabled
   ///
   /// https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_exceptions
   void wasm_exceptions(bool enable) {
     wasmtime_config_wasm_exceptions_set(ptr.get(), enable);
   }
+  #endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly custom-page-sizes proposal will
   /// be enabled

crates/c-api/include/wasmtime/func.hh

@@ -102,15 +102,18 @@ template <> struct WasmType<std::optional<ExternRef>> {
       p->externref = 0;
     }
   }
+  
+  #ifdef WASMTIME_FEATURE_GC
   static std::optional<ExternRef> load(Store::Context cx,
-                                       wasmtime_val_raw_t *p) {
+                                      wasmtime_val_raw_t *p) {
     if (p->externref == 0) {
       return std::nullopt;
     }
     wasmtime_externref_t val;
     wasmtime_externref_from_raw(cx.capi(), p->externref, &val);
     return ExternRef(val);
   }
+  #endif // WASMTIME_FEATURE_GC
 };
 
 /// Type information for the `V128` host value used as a wasm value.

crates/c-api/include/wasmtime/store.h

@@ -144,8 +144,10 @@ WASM_API_EXTERN void wasmtime_context_set_data(wasmtime_context_t *context,
  *
  * The `context` argument must not be NULL.
  */
+#ifdef WASMTIME_FEATURE_GC
 WASM_API_EXTERN wasmtime_error_t *
 wasmtime_context_gc(wasmtime_context_t *context);
+#endif
 
 /**
  * \brief Set fuel to this context's store for wasm to consume while executing.

crates/c-api/include/wasmtime/store.hh

@@ -89,6 +89,7 @@ public:
     /// Creates a context referencing the provided `Caller`.
     Context(Caller *caller);
 
+#ifdef WASMTIME_FEATURE_GC
     /// Runs a garbage collection pass in the referenced store to collect loose
     /// `externref` values, if any are available.
     Result<std::monostate> gc() {
@@ -98,6 +99,7 @@ public:
       }
       return std::monostate();
     }
+#endif
 
     /// Injects fuel to be consumed within this store.
     ///
@@ -231,9 +233,11 @@ public:
   /// Explicit function to acquire a `Context` from this store.
   Context context() { return this; }
 
+#ifdef WASMTIME_FEATURE_GC
   /// Runs a garbage collection pass in the referenced store to collect loose
   /// GC-managed objects, if any are available.
   Result<std::monostate> gc() { return context().gc(); }
+#endif
 
 private:
   template <typename F>

crates/c-api/include/wasmtime/val.h

@@ -92,6 +92,7 @@ WASM_API_EXTERN void wasmtime_anyref_clone(const wasmtime_anyref_t *anyref,
  */
 WASM_API_EXTERN void wasmtime_anyref_unroot(wasmtime_anyref_t *ref);
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Converts a raw `anyref` value coming from #wasmtime_val_raw_t into
  * a #wasmtime_anyref_t.
@@ -102,7 +103,9 @@ WASM_API_EXTERN void wasmtime_anyref_unroot(wasmtime_anyref_t *ref);
 WASM_API_EXTERN void wasmtime_anyref_from_raw(wasmtime_context_t *context,
                                               uint32_t raw,
                                               wasmtime_anyref_t *out);
+#endif // WASMTIME_FEATURE_GC
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Converts a #wasmtime_anyref_t to a raw value suitable for storing
  * into a #wasmtime_val_raw_t.
@@ -115,7 +118,9 @@ WASM_API_EXTERN void wasmtime_anyref_from_raw(wasmtime_context_t *context,
  */
 WASM_API_EXTERN uint32_t wasmtime_anyref_to_raw(wasmtime_context_t *context,
                                                 const wasmtime_anyref_t *ref);
+#endif // WASMTIME_FEATURE_GC
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Create a new `i31ref` value.
  *
@@ -127,7 +132,10 @@ WASM_API_EXTERN uint32_t wasmtime_anyref_to_raw(wasmtime_context_t *context,
 WASM_API_EXTERN void wasmtime_anyref_from_i31(wasmtime_context_t *context,
                                               uint32_t i31val,
                                               wasmtime_anyref_t *out);
+#endif // WASMTIME_FEATURE_GC
 
+
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Get the `anyref`'s underlying `i31ref` value, zero extended, if any.
  *
@@ -140,7 +148,9 @@ WASM_API_EXTERN void wasmtime_anyref_from_i31(wasmtime_context_t *context,
 WASM_API_EXTERN bool wasmtime_anyref_i31_get_u(wasmtime_context_t *context,
                                                const wasmtime_anyref_t *anyref,
                                                uint32_t *dst);
+#endif // WASMTIME_FEATURE_GC
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Get the `anyref`'s underlying `i31ref` value, sign extended, if any.
  *
@@ -153,6 +163,7 @@ WASM_API_EXTERN bool wasmtime_anyref_i31_get_u(wasmtime_context_t *context,
 WASM_API_EXTERN bool wasmtime_anyref_i31_get_s(wasmtime_context_t *context,
                                                const wasmtime_anyref_t *anyref,
                                                int32_t *dst);
+#endif // WASMTIME_FEATURE_GC
 
 /**
  * \typedef wasmtime_externref_t
@@ -202,6 +213,7 @@ static inline bool wasmtime_externref_is_null(const wasmtime_externref_t *ref) {
   return ref->store_id == 0;
 }
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Create a new `externref` value.
  *
@@ -229,7 +241,10 @@ WASM_API_EXTERN bool wasmtime_externref_new(wasmtime_context_t *context,
                                             void *data,
                                             void (*finalizer)(void *),
                                             wasmtime_externref_t *out);
+#endif // WASMTIME_FEATURE_GC
+
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Get an `externref`'s wrapped data
  *
@@ -238,6 +253,7 @@ WASM_API_EXTERN bool wasmtime_externref_new(wasmtime_context_t *context,
  */
 WASM_API_EXTERN void *wasmtime_externref_data(wasmtime_context_t *context,
                                               const wasmtime_externref_t *data);
+#endif // WASMTIME_FEATURE_GC
 
 /**
  * \brief Creates a new reference pointing to the same data that `ref` points
@@ -264,6 +280,7 @@ WASM_API_EXTERN void wasmtime_externref_clone(const wasmtime_externref_t *ref,
  */
 WASM_API_EXTERN void wasmtime_externref_unroot(wasmtime_externref_t *ref);
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Converts a raw `externref` value coming from #wasmtime_val_raw_t into
  * a #wasmtime_externref_t.
@@ -274,7 +291,9 @@ WASM_API_EXTERN void wasmtime_externref_unroot(wasmtime_externref_t *ref);
 WASM_API_EXTERN void wasmtime_externref_from_raw(wasmtime_context_t *context,
                                                  uint32_t raw,
                                                  wasmtime_externref_t *out);
+#endif // WASMTIME_FEATURE_GC
 
+#ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Converts a #wasmtime_externref_t to a raw value suitable for storing
  * into a #wasmtime_val_raw_t.
@@ -287,6 +306,7 @@ WASM_API_EXTERN void wasmtime_externref_from_raw(wasmtime_context_t *context,
  */
 WASM_API_EXTERN uint32_t wasmtime_externref_to_raw(
     wasmtime_context_t *context, const wasmtime_externref_t *ref);
+#endif // WASMTIME_FEATURE_GC
 
 /// \brief Discriminant stored in #wasmtime_val::kind
 typedef uint8_t wasmtime_valkind_t;

crates/c-api/include/wasmtime/val.hh

@@ -66,6 +66,7 @@ public:
 
   ~ExternRef() { wasmtime_externref_unroot(&val); }
 
+  #ifdef WASMTIME_FEATURE_GC
   /// Creates a new `externref` value from the provided argument.
   ///
   /// Note that `val` should be safe to send across threads and should own any
@@ -79,24 +80,31 @@ public:
       abort();
     }
   }
+  #endif // WASMTIME_FEATURE_GC
 
+  #ifdef WASMTIME_FEATURE_GC
   /// Returns the underlying host data associated with this `ExternRef`.
   std::any &data(Store::Context cx) {
     return *static_cast<std::any *>(wasmtime_externref_data(cx.ptr, &val));
   }
+  #endif // WASMTIME_FEATURE_GC
 
+  #ifdef WASMTIME_FEATURE_GC
   /// Consumes ownership of the underlying `wasmtime_externref_t` and returns
   /// the result of `wasmtime_externref_to_raw`.
   uint32_t take_raw(Store::Context cx) {
     uint32_t ret = wasmtime_externref_to_raw(cx.capi(), &val);
     wasmtime_externref_set_null(&val);
     return ret;
   }
+  #endif // WASMTIME_FEATURE_GC
 
+  #ifdef WASMTIME_FEATURE_GC
   /// Returns `wasmtime_externref_to_raw`.
   uint32_t borrow_raw(Store::Context cx) const {
     return wasmtime_externref_to_raw(cx.capi(), &val);
   }
+  #endif // WASMTIME_FEATURE_GC
 };
 
 /**
@@ -166,13 +174,15 @@ public:
     return std::nullopt;
   }
 
+  #ifdef WASMTIME_FEATURE_GC
   /// \brief If this is an `i31`, get the value sign-extended.
   std::optional<int32_t> i31(Store::Context cx) const {
     int32_t ret = 0;
     if (wasmtime_anyref_i31_get_s(cx.ptr, &val, &ret))
       return ret;
     return std::nullopt;
   }
+  #endif // WASMTIME_FEATURE_GC
 };
 
 /// \brief Container for the `v128` WebAssembly type.

crates/c-api/src/config.rs

@@ -90,33 +90,24 @@ pub extern "C" fn wasmtime_config_wasm_tail_call_set(c: &mut wasm_config_t, enab
 }
 
 #[unsafe(no_mangle)]
+#[cfg(feature = "gc")]
 pub extern "C" fn wasmtime_config_wasm_reference_types_set(c: &mut wasm_config_t, enable: bool) {
-    #[cfg(feature = "gc")]
     c.config.wasm_reference_types(enable);
-
-    #[cfg(not(feature = "gc"))]
-    let _ = (c, enable);
 }
 
 #[unsafe(no_mangle)]
+#[cfg(feature = "gc")]
 pub extern "C" fn wasmtime_config_wasm_function_references_set(
     c: &mut wasm_config_t,
     enable: bool,
 ) {
-    #[cfg(feature = "gc")]
     c.config.wasm_function_references(enable);
-
-    #[cfg(not(feature = "gc"))]
-    let _ = (c, enable);
 }
 
 #[unsafe(no_mangle)]
+#[cfg(feature = "gc")]
 pub extern "C" fn wasmtime_config_wasm_gc_set(c: &mut wasm_config_t, enable: bool) {
-    #[cfg(feature = "gc")]
     c.config.wasm_gc(enable);
-
-    #[cfg(not(feature = "gc"))]
-    let _ = (c, enable);
 }
 
 #[unsafe(no_mangle)]
@@ -488,12 +479,9 @@ pub extern "C" fn wasmtime_config_wasm_wide_arithmetic_set(c: &mut wasm_config_t
 }
 
 #[unsafe(no_mangle)]
+#[cfg(feature = "gc")]
 pub extern "C" fn wasmtime_config_wasm_exceptions_set(c: &mut wasm_config_t, enable: bool) {
-    #[cfg(feature = "gc")]
     c.config.wasm_exceptions(enable);
-
-    #[cfg(not(feature = "gc"))]
-    let _ = (c, enable);
 }
 
 #[unsafe(no_mangle)]