Skip to content
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.

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

[main] Fix backtraces through empty sequences of Wasm frames #9418

Merged
merged 1 commit into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions crates/wasmtime/src/runtime/vm/traphandlers/backtrace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,26 @@ impl Backtrace {

arch::assert_entry_sp_is_aligned(trampoline_sp);

// It is possible that the contiguous sequence of Wasm frames is
// empty. This is rare, but can happen if:
//
// * Host calls into Wasm, pushing the entry trampoline frame
//
// * Entry trampoline calls the actual Wasm function, pushing a Wasm frame
//
// * Wasm function tail calls to an imported host function, *replacing*
// the Wasm frame with the exit trampoline's frame
//
// Now we have a stack like `[host, entry trampoline, exit trampoline]`
// which has a contiguous sequence of Wasm frames that are empty.
//
// Therefore, check if we've reached the entry trampoline's SP as the
// first thing we do.
if arch::reached_entry_sp(fp, trampoline_sp) {
log::trace!("=== Empty contiguous sequence of Wasm frames ===");
return ControlFlow::Continue(());
}

loop {
// At the start of each iteration of the loop, we know that `fp` is
// a frame pointer from Wasm code. Therefore, we know it is not
Expand Down
111 changes: 111 additions & 0 deletions tests/all/traps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::panic::{self, AssertUnwindSafe};
use std::process::Command;
use std::sync::{Arc, Mutex};
use wasmtime::*;
use wasmtime_test_macros::wasmtime_test;

#[test]
fn test_trap_return() -> Result<()> {
Expand Down Expand Up @@ -1679,3 +1680,113 @@ fn async_stack_size_ignored_if_disabled() -> Result<()> {

Ok(())
}

#[wasmtime_test(wasm_features(tail_call))]
fn tail_call_to_imported_function(config: &mut Config) -> Result<()> {
let engine = Engine::new(config)?;

let module = Module::new(
&engine,
r#"
(module
(import "" "" (func (result i32)))

(func (export "run") (result i32)
return_call 0
)
)
"#,
)?;

let mut store = Store::new(&engine, ());
let host_func = Func::wrap(&mut store, || -> Result<i32> { bail!("whoopsie") });
let instance = Instance::new(&mut store, &module, &[host_func.into()])?;

let run = instance.get_typed_func::<(), i32>(&mut store, "run")?;
let err = run.call(&mut store, ()).unwrap_err();
assert!(err.to_string().contains("whoopsie"));

Ok(())
}

#[wasmtime_test(wasm_features(tail_call))]
fn tail_call_to_imported_function_in_start_function(config: &mut Config) -> Result<()> {
let engine = Engine::new(config)?;

let module = Module::new(
&engine,
r#"
(module
(import "" "" (func))

(func $f
return_call 0
)

(start $f)
)
"#,
)?;

let mut store = Store::new(&engine, ());
let host_func = Func::wrap(&mut store, || -> Result<()> { bail!("whoopsie") });
let err = Instance::new(&mut store, &module, &[host_func.into()]).unwrap_err();
assert!(err.to_string().contains("whoopsie"));

Ok(())
}

#[wasmtime_test(wasm_features(tail_call, function_references))]
fn return_call_ref_to_imported_function(config: &mut Config) -> Result<()> {
let engine = Engine::new(config)?;

let module = Module::new(
&engine,
r#"
(module
(type (func (result i32)))
(func (export "run") (param (ref 0)) (result i32)
(return_call_ref 0 (local.get 0))
)
)
"#,
)?;

let mut store = Store::new(&engine, ());
let host_func = Func::wrap(&mut store, || -> Result<i32> { bail!("whoopsie") });
let instance = Instance::new(&mut store, &module, &[])?;

let run = instance.get_typed_func::<Func, i32>(&mut store, "run")?;
let err = run.call(&mut store, host_func).unwrap_err();
assert!(err.to_string().contains("whoopsie"));

Ok(())
}

#[wasmtime_test(wasm_features(tail_call, function_references))]
fn return_call_indirect_to_imported_function(config: &mut Config) -> Result<()> {
let engine = Engine::new(config)?;

let module = Module::new(
&engine,
r#"
(module
(import "" "" (func (result i32)))
(table 1 funcref (ref.func 0))
(func (export "run") (result i32)
(return_call_indirect (result i32) (i32.const 0))
)
)
"#,
)?;

let mut store = Store::new(&engine, ());
let host_func = Func::wrap(&mut store, || -> Result<i32> { bail!("whoopsie") });
let instance = Instance::new(&mut store, &module, &[host_func.into()])?;

let run = instance.get_typed_func::<(), i32>(&mut store, "run")?;
let err = run.call(&mut store, ()).unwrap_err();
assert!(err.to_string().contains("whoopsie"));

Ok(())
}