Adds more wasmtime_feature_gc gate, and moves some definition outside the gate

Author: tolumide-ng

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

@@ -11,6 +11,8 @@
 #ifndef WASMTIME_GC_H
 #define WASMTIME_GC_H
 
+#ifdef WASMTIME_FEATURE_GC
+
 #include <wasmtime/val.h>
 
 #ifdef __cplusplus
@@ -593,4 +595,5 @@ WASM_API_EXTERN bool wasmtime_anyref_as_array(wasmtime_context_t *context,
 } // extern "C"
 #endif
 
+#endif // WASMTIME_FEATURE_GC
 #endif // WASMTIME_GC_H

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

@@ -7,6 +7,7 @@
 #ifndef WASMTIME_GC_HH
 #define WASMTIME_GC_HH
 
+#ifdef WASMTIME_FEATURE_GC
 #include <vector>
 #include <wasmtime/gc.h>
 #include <wasmtime/val.hh>
@@ -476,4 +477,6 @@ inline std::optional<ArrayRef> AnyRef::as_array(Store::Context cx) const {
 
 } // namespace wasmtime
 
+#endif // WASMTIME_FEATURE_GC
+
 #endif // WASMTIME_GC_HH

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

@@ -369,6 +369,7 @@ WASM_API_EXTERN void wasmtime_exnref_clone(const wasmtime_exnref_t *ref,
  * After this call, `ref` is left in an undefined state and should not be used.
  */
 WASM_API_EXTERN void wasmtime_exnref_unroot(wasmtime_exnref_t *ref);
+#endif // WASMTIME_FEATURE_GC
 
 /// \brief Discriminant stored in #wasmtime_val::kind
 typedef uint8_t wasmtime_valkind_t;
@@ -395,8 +396,6 @@ 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];

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

@@ -6,7 +6,9 @@
 #define WASMTIME_VAL_HH
 
 #include <optional>
+#ifdef WASMTIME_FEATURE_GC
 #include <wasmtime/gc.h>
+#endif // WASMTIME_FEATURE_GC
 #include <wasmtime/store.hh>
 #include <wasmtime/types/val.hh>
 #include <wasmtime/val.h>
@@ -454,4 +456,9 @@ public:
 // fill in `Func` constructors for `Val`
 #include <wasmtime/func.hh>
 
+#ifdef WASMTIME_FEATURE_GC
+// fill in GC type definitions and inline methods
+#include <wasmtime/gc.hh>
+#endif // WASMTIME_FEATURE_GC
+
 #endif // WASMTIME_VAL_HH

crates/wasmtime/src/runtime/gc/enabled/eqref.rs

@@ -1,5 +1,5 @@
 //! Working with GC `eqref`s.
-
+#![cfg(feature = "gc")]
 use crate::{
     AnyRef, ArrayRef, ArrayType, AsContext, AsContextMut, GcRefImpl, GcRootIndex, HeapType, I31,
     OwnedRooted, RefType, Rooted, StructRef, StructType, ValRaw, ValType, WasmTy,

crates/wasmtime/src/runtime/gc/enabled/structref.rs

@@ -1,4 +1,5 @@
 //! Working with GC `struct` objects.
+#![cfg(feature = "gc")]
 
 use crate::runtime::vm::VMGcRef;
 use crate::store::{Asyncness, StoreId};