diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-25 13:58:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 13:58:02 -0700 |
| commit | c2e3521bfbef47939d858a0c9d11e08b71bc80c0 (patch) | |
| tree | 255ebd85d7c30ba43616a673bf014d19be47c1f2 /src | |
| parent | cb5b40269f6f087e4bdb8cc1c2776fd47eda1a3e (diff) | |
| parent | 3a423c3feb9b4827ff8b3dd1e18307df700320f2 (diff) | |
| download | rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.tar.gz rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.zip | |
Rollup merge of #111950 - cjgillot:expn-noinline, r=oli-obk
Remove ExpnKind::Inlined. Suggested in https://github.com/rust-lang/rust/pull/111815#issuecomment-1561903339 r? ``@oli-obk``
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/tests/fail/terminate-terminator.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/terminate-terminator.stderr | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/tools/miri/tests/fail/terminate-terminator.rs b/src/tools/miri/tests/fail/terminate-terminator.rs index 22ffa1b2711..b9199cff079 100644 --- a/src/tools/miri/tests/fail/terminate-terminator.rs +++ b/src/tools/miri/tests/fail/terminate-terminator.rs @@ -12,13 +12,13 @@ impl Drop for Foo { #[inline(always)] fn has_cleanup() { + //~^ ERROR: panic in a function that cannot unwind let _f = Foo; panic!(); } extern "C" fn panic_abort() { has_cleanup(); - //~^ ERROR: panic in a function that cannot unwind } fn main() { diff --git a/src/tools/miri/tests/fail/terminate-terminator.stderr b/src/tools/miri/tests/fail/terminate-terminator.stderr index 8ce4bb7cbb5..d73e23a53d0 100644 --- a/src/tools/miri/tests/fail/terminate-terminator.stderr +++ b/src/tools/miri/tests/fail/terminate-terminator.stderr @@ -6,15 +6,18 @@ error: abnormal termination: panic in a function that cannot unwind --> $DIR/terminate-terminator.rs:LL:CC | LL | / fn has_cleanup() { +LL | | LL | | let _f = Foo; LL | | panic!(); LL | | } | |_^ panic in a function that cannot unwind -... -LL | has_cleanup(); - | ------------- in this inlined function call | - = note: inside `panic_abort` at $DIR/terminate-terminator.rs:LL:CC + = note: inside `has_cleanup` at $DIR/terminate-terminator.rs:LL:CC +note: inside `panic_abort` + --> $DIR/terminate-terminator.rs:LL:CC + | +LL | has_cleanup(); + | ^^^^^^^^^^^^^ note: inside `main` --> $DIR/terminate-terminator.rs:LL:CC | |