Fixes thrownexcpetion import which is behind gc

Author: tolumide-ng

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

@@ -303,15 +303,15 @@ class Config {
     wasmtime_config_wasm_tail_call_set(ptr.get(), enable);
   }
 
-  #ifdef WASMTIME_FEATURE_GC
+#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
+#endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly simd proposal is enabled
   ///
@@ -363,13 +363,13 @@ class Config {
     wasmtime_config_wasm_memory64_set(ptr.get(), enable);
   }
 
-  #ifdef WASMTIME_FEATURE_GC
+#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
+#endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly function references proposal
   /// will be enabled
@@ -387,15 +387,15 @@ class Config {
     wasmtime_config_wasm_wide_arithmetic_set(ptr.get(), enable);
   }
 
-  #ifdef WASMTIME_FEATURE_GC
+#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
+#endif // WASMTIME_FEATURE_GC
 
   /// \brief Configures whether the WebAssembly custom-page-sizes proposal will
   /// be enabled

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

@@ -103,9 +103,9 @@ template <> struct WasmType<std::optional<ExternRef>> {
       p->externref = 0;
     }
   }
-  
+
   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;
     }

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

@@ -15,6 +15,7 @@
 extern "C" {
 #endif
 
+#ifdef WASMTIME_FEATURE_GC
 struct wasmtime_eqref;
 /// Convenience alias for #wasmtime_eqref
 typedef struct wasmtime_eqref wasmtime_eqref_t;
@@ -56,7 +57,6 @@ typedef struct wasmtime_anyref {
   void *__private3;
 } wasmtime_anyref_t;
 
-#ifdef WASMTIME_FEATURE_GC
 /// \brief Helper function to initialize the `ref` provided to a null anyref
 /// value.
 static inline void wasmtime_anyref_set_null(wasmtime_anyref_t *ref) {
@@ -72,7 +72,6 @@ static inline bool wasmtime_anyref_is_null(const wasmtime_anyref_t *ref) {
   return ref->store_id == 0;
 }
 
-
 /**
  * \brief Creates a new reference pointing to the same data that `anyref`
  * points to (depending on the configured collector this might increase a
@@ -203,7 +202,6 @@ WASM_API_EXTERN bool wasmtime_anyref_i31_get_s(wasmtime_context_t *context,
  * `wasmtime_externref_set_null`. Null can be tested for with the
  * `wasmtime_externref_is_null` function.
  */
-#endif // WASMTIME_FEATURE_GC
 
 typedef struct wasmtime_externref {
   /// Internal metadata tracking within the store, embedders should not
@@ -217,7 +215,6 @@ typedef struct wasmtime_externref {
   void *__private3;
 } wasmtime_externref_t;
 
-#ifdef WASMTIME_FEATURE_GC
 /// \brief Helper function to initialize the `ref` provided to a null externref
 /// value.
 static inline void wasmtime_externref_set_null(wasmtime_externref_t *ref) {
@@ -318,7 +315,6 @@ 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
 
 /**
  * \typedef wasmtime_exnref_t
@@ -399,11 +395,12 @@ typedef uint8_t wasmtime_valkind_t;
 /// exnref
 #define WASMTIME_EXNREF 8
 
+#endif // WASMTIME_FEATURE_GC
+
 /// \brief A 128-bit value representing the WebAssembly `v128` type. Bytes are
 /// stored in little-endian order.
 typedef uint8_t wasmtime_v128[16];
 
-
 /**
  * \typedef wasmtime_valunion_t
  * \brief Convenience alias for #wasmtime_valunion
@@ -423,6 +420,7 @@ typedef union wasmtime_valunion {
   float32_t f32;
   /// Field used if #wasmtime_val_t::kind is #WASMTIME_F64
   float64_t f64;
+#ifdef WASMTIME_FEATURE_GC
   /// Field used if #wasmtime_val_t::kind is #WASMTIME_ANYREF
   wasmtime_anyref_t anyref;
   /// Field used if #wasmtime_val_t::kind is #WASMTIME_EXTERNREF
@@ -434,6 +432,7 @@ typedef union wasmtime_valunion {
   /// Use `wasmtime_funcref_is_null` to test whether this is a null function
   /// reference.
   wasmtime_func_t funcref;
+#endif // WASMTIME_FEATURE_GC
   /// Field used if #wasmtime_val_t::kind is #WASMTIME_V128
   wasmtime_v128 v128;
 } wasmtime_valunion_t;

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

@@ -108,7 +108,6 @@ public:
 
 class EqRef;
 
-
 #ifdef WASMTIME_FEATURE_GC
 /**
  * \brief Representation of a WebAssembly `anyref` value.

crates/c-api/src/exn.rs

@@ -1,3 +1,4 @@
+#![cfg(feature = "gc")]
 use crate::{
     WasmtimeStoreContextMut, handle_result, wasm_trap_t, wasmtime_error_t, wasmtime_val_t,
 };

crates/c-api/src/func.rs

@@ -10,12 +10,12 @@ use std::mem::{self, MaybeUninit};
 use std::panic::{self, AssertUnwindSafe};
 use std::ptr;
 use std::str;
-#[cfg(feature = "gc")]
-use wasmtime::RootScope;
 use wasmtime::{
     AsContext, AsContextMut, Error, Extern, Func, Result, StoreContext, StoreContextMut, Trap, Val,
     ValRaw,
 };
+#[cfg(feature = "gc")]
+use wasmtime::{RootScope, ThrownException};
 
 #[derive(Clone)]
 #[repr(transparent)]
@@ -406,8 +406,18 @@ pub unsafe extern "C" fn wasmtime_func_call_unchecked(
     }
 }
 
+#[cfg(feature = "gc")]
+fn is_trap_like_impl(err: &Error) -> bool {
+    err.is::<Trap>() || err.is::<ThrownException>()
+}
+
+#[cfg(not(feature = "gc"))]
+fn is_trap_like_impl(err: &Error) -> bool {
+    err.is::<Trap>()
+}
+
 fn store_err(err: Error, trap_ret: &mut *mut wasm_trap_t) -> Option<Box<wasmtime_error_t>> {
-    if err.is::<Trap>() || err.is::<wasmtime::ThrownException>() {
+    if is_trap_like_impl(&err) {
         *trap_ret = Box::into_raw(Box::new(wasm_trap_t::new(err)));
         None
     } else {

crates/c-api/src/lib.rs

@@ -20,6 +20,7 @@ pub use wasmtime;
 mod config;
 mod engine;
 mod error;
+#[cfg(feature = "gc")]
 mod exn;
 mod r#extern;
 mod func;
@@ -44,6 +45,7 @@ mod vec;
 pub use crate::config::*;
 pub use crate::engine::*;
 pub use crate::error::*;
+#[cfg(feature = "gc")]
 pub use crate::exn::*;
 pub use crate::r#extern::*;
 pub use crate::func::*;

crates/c-api/src/ref.rs

@@ -3,7 +3,7 @@
 use crate::WasmtimeStoreContextMut;
 use crate::abort;
 use std::mem::{ManuallyDrop, MaybeUninit};
-use std::{num::NonZeroU64, os::raw::c_void, ptr};
+use std::{num::NonZeroU64, os::raw::c_void};
 use wasmtime::{
     AnyRef, ArrayRef, ArrayRefPre, ArrayType, EqRef, ExnRef, ExternRef, FieldType, I31, Mutability,
     OwnedRooted, Ref, RootScope, StorageType, StructRef, StructRefPre, StructType, Val, ValType,

crates/c-api/src/val.rs

@@ -1,10 +1,8 @@
 #[cfg(feature = "gc")]
 use crate::r#ref::ref_to_val;
-use crate::{
-    WASM_I32, from_valtype, into_valtype, wasm_valkind_t, wasmtime_exnref_t, wasmtime_valkind_t,
-};
+use crate::{WASM_I32, from_valtype, into_valtype, wasm_valkind_t, wasmtime_valkind_t};
 #[cfg(feature = "gc")]
-use crate::{wasm_ref_t, wasmtime_anyref_t, wasmtime_externref_t};
+use crate::{wasm_ref_t, wasmtime_anyref_t, wasmtime_exnref_t, wasmtime_externref_t};
 use std::mem::{ManuallyDrop, MaybeUninit};
 use std::ptr;
 use wasmtime::{AsContextMut, Func, Val, ValType};
@@ -46,7 +44,10 @@ impl Drop for wasm_val_t {
 
 impl Clone for wasm_val_t {
     fn clone(&self) -> Self {
-        #[allow(unused_mut)]
+        #[allow(
+            unused_mut,
+            reason = "needed for conditional mutation under cfg(feature = \"gc\")"
+        )]
         let mut ret = wasm_val_t {
             kind: self.kind,
             of: self.of,
@@ -166,6 +167,7 @@ pub union wasmtime_val_union {
     pub anyref: ManuallyDrop<wasmtime_anyref_t>,
     #[cfg(feature = "gc")]
     pub externref: ManuallyDrop<wasmtime_externref_t>,
+    #[cfg(feature = "gc")]
     pub exnref: ManuallyDrop<wasmtime_exnref_t>,
     #[cfg(feature = "gc")]
     pub funcref: wasmtime_func_t,
@@ -311,6 +313,7 @@ impl wasmtime_val_t {
                     funcref: func.into(),
                 },
             },
+            #[cfg(feature = "gc")]
             Val::ExnRef(e) => wasmtime_val_t {
                 kind: crate::WASMTIME_EXNREF,
                 of: wasmtime_val_union {
@@ -374,6 +377,7 @@ impl wasmtime_val_t {
             }
             #[cfg(feature = "gc")]
             crate::WASMTIME_FUNCREF => Val::FuncRef(self.of.funcref.as_wasmtime()),
+            #[cfg(feature = "gc")]
             crate::WASMTIME_EXNREF => {
                 Val::ExnRef(self.of.exnref.as_wasmtime().map(|e| e.to_rooted(cx)))
             }
@@ -401,6 +405,7 @@ pub unsafe extern "C" fn wasmtime_val_clone(
         crate::WASMTIME_EXTERNREF => wasmtime_val_union {
             externref: ManuallyDrop::new(src.of.externref.as_wasmtime().into()),
         },
+        #[cfg(feature = "gc")]
         crate::WASMTIME_EXNREF => wasmtime_val_union {
             exnref: ManuallyDrop::new(src.of.exnref.as_wasmtime().into()),
         },