Skip to content

Commit 674c597

Browse files
committed
Revert "Wasm ABI can unwind"
This reverts commit 72c4238.
1 parent 7f1b76a commit 674c597

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Diff for: compiler/rustc_middle/src/ty/layout.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1243,12 +1243,9 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: SpecAbi) ->
12431243
| RiscvInterruptM
12441244
| RiscvInterruptS
12451245
| CCmseNonSecureCall
1246+
| Wasm
12461247
| PlatformIntrinsic
12471248
| Unadjusted => false,
1248-
Wasm => {
1249-
tcx.sess.panic_strategy() == PanicStrategy::Unwind
1250-
|| tcx.sess.target_features.contains(&Symbol::intern("exception-handling"))
1251-
}
12521249
Rust | RustCall | RustCold | RustIntrinsic => {
12531250
tcx.sess.panic_strategy() == PanicStrategy::Unwind
12541251
}

0 commit comments

Comments
 (0)