Skip to content

Fix FFI-unwind unsoundness with mixed panic mode #97235

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
merged 9 commits into from
Jul 2, 2022
Merged

Fix FFI-unwind unsoundness with mixed panic mode #97235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ef2033
Fix FFI-unwind unsoundness with mixed panic mode
nbdd0121 May 18, 2022
77fd0cc
Handle panic runtime specially
nbdd0121 May 19, 2022
bc5afd9
Ensure ffi_unwind_calls lint is gated behind c_unwind
nbdd0121 May 19, 2022
1750a2f
Add tests for mixed panic mode restriction and lints
nbdd0121 May 20, 2022
9e6c044
Use is_fn_like instead of matching on DefKind
nbdd0121 May 23, 2022
14d155a
Rename `panic_strategy` query to `required_panic_strategy`
nbdd0121 Jun 8, 2022
ce774e3
Add a explanation about required panic strategy computation
nbdd0121 Jun 8, 2022
49e6b79
Fix test for non-prefer-dynamic target
nbdd0121 Jun 28, 2022
0cf28dc
Skip ffi-unwind lint test with `-Cpanic=abort`
nbdd0121 Jun 30, 2022
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
Prev Previous commit
Skip ffi-unwind lint test with -Cpanic=abort
  • Loading branch information
@nbdd0121
nbdd0121 committed Jun 30, 2022
commit 0cf28dc95d8396aa207bddd2d4424963b64d0c16
2 changes: 2 additions & 0 deletions src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// build-pass
// needs-unwind
// ignore-wasm32-bare compiled with panic=abort by default

#![feature(c_unwind)]
#![warn(ffi_unwind_calls)]
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
warning: call to foreign function with FFI-unwind ABI
--> $DIR/ffi-unwind-calls-lint.rs:19:14
--> $DIR/ffi-unwind-calls-lint.rs:21:14
|
LL | unsafe { foo(); }
| ^^^^^ call to foreign function with FFI-unwind ABI
|
note: the lint level is defined here
--> $DIR/ffi-unwind-calls-lint.rs:4:9
--> $DIR/ffi-unwind-calls-lint.rs:6:9
|
LL | #![warn(ffi_unwind_calls)]
| ^^^^^^^^^^^^^^^^

warning: call to function pointer with FFI-unwind ABI
--> $DIR/ffi-unwind-calls-lint.rs:23:5
--> $DIR/ffi-unwind-calls-lint.rs:25:5
|
LL | ptr();
| ^^^^^ call to function pointer with FFI-unwind ABI
Expand Down