Skip to content

Commit 316f161

Browse files
committed
[WIP] Implement exception handling support
1 parent aefe37d commit 316f161

File tree

10 files changed

+671
-64
lines changed

10 files changed

+671
-64
lines changed

Diff for: Cargo.lock

+186-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ target-lexicon = "0.13"
1818
gimli = { version = "0.31", default-features = false, features = ["write"] }
1919
object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

21+
eh_frame_experiments = { git = "http://github.com/bjorn3/eh_frame_experiments.git", branch = "update_gimli" }
2122
indexmap = "2.0.0"
2223
libloading = { version = "0.8.0", optional = true }
2324
smallvec = "1.8.1"
@@ -39,8 +40,6 @@ cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", b
3940
#cranelift-jit = { path = "../wasmtime/cranelift/jit" }
4041
#cranelift-object = { path = "../wasmtime/cranelift/object" }
4142

42-
#gimli = { path = "../" }
43-
4443
[features]
4544
# Enable features not ready to be enabled when compiling as part of rustc
4645
unstable-features = ["jit", "inline_asm_sym"]

Diff for: example/std_example.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ use std::io::Write;
1919
use std::ops::Coroutine;
2020

2121
fn main() {
22-
println!("{:?}", std::env::args().collect::<Vec<_>>());
22+
println!(
23+
"{:?}",
24+
std::panic::catch_unwind(|| {
25+
panic!("foo");
26+
})
27+
);
28+
29+
return;
2330

2431
let mutex = std::sync::Mutex::new(());
2532
let _guard = mutex.lock().unwrap();

0 commit comments

Comments
 (0)