Skip to content

Add missing gc feature gates #12074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcrichton merged 2 commits into from
Nov 24, 2025
Merged

Add missing gc feature gates #12074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a1c2ef
add more `gc` feature gates
primoly Nov 23, 2025
f757c87
test debug gc feature combination
primoly Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,8 @@ jobs:
-p wasmtime --no-default-features --features stack-switching
-p wasmtime --no-default-features --features cranelift,stack-switching
-p wasmtime --no-default-features --features runtime,stack-switching
-p wasmtime --no-default-features --features debug
-p wasmtime --no-default-features --features debug,gc
-p wasmtime --features incremental-cache
-p wasmtime --features profile-pulley
-p wasmtime --all-features
Expand Down
2 changes: 1 addition & 1 deletion crates/wasmtime/src/runtime/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ impl Module {

/// Get the text offset (relative PC) for a given absolute PC in
/// this module.
#[cfg(any(feature = "gc", feature = "debug"))]
#[cfg(feature = "gc")]
pub(crate) fn text_offset(&self, pc: usize) -> u32 {
u32::try_from(pc - self.inner.module.text().as_ptr() as usize).unwrap()
}
Expand Down
6 changes: 3 additions & 3 deletions crates/wasmtime/src/runtime/vm/traphandlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::runtime::module::lookup_code;
use crate::runtime::store::{ExecutorRef, StoreOpaque};
use crate::runtime::vm::sys::traphandlers;
use crate::runtime::vm::{InterpreterRef, VMContext, VMStore, VMStoreContext, f32x4, f64x2, i8x16};
#[cfg(feature = "debug")]
#[cfg(all(feature = "debug", feature = "gc"))]
use crate::store::AsStoreOpaque;
use crate::{EntryStoreContext, prelude::*};
use crate::{StoreContextMut, WasmBacktrace};
Expand Down Expand Up @@ -830,6 +830,7 @@ impl CallThreadState {
#[cfg(feature = "debug")]
{
let result = match &unwind {
#[cfg(feature = "gc")]
UnwindState::UnwindToWasm(_) => {
assert!(store.as_store_opaque().has_pending_exception());
let exn = store
Expand All @@ -838,12 +839,11 @@ impl CallThreadState {
.expect("exception should be set when we are throwing");
store.block_on_debug_handler(crate::DebugEvent::CaughtExceptionThrown(exn))
}

#[cfg(feature = "gc")]
UnwindState::UnwindToHost {
reason: UnwindReason::Trap(TrapReason::Exception),
..
} => {
use crate::store::AsStoreOpaque;
let exn = store
.as_store_opaque()
.pending_exception_owned_rooted()
Expand Down