From 31834434a0bf9c9c98db328c4adc9b356b805dde Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 14 Sep 2021 20:16:22 +0200 Subject: Make expectation in panic-in-drop-abort.rs test more precise Check whether a call/invoke of the function exists, but don't match a leftover function declaration. Also remove the CHECK-LABELs: In panic-in-drop=unwind mode the call will not actually be in either of those functions, so remove the restriction and look for any calls. --- src/test/codegen/panic-in-drop-abort.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/panic-in-drop-abort.rs b/src/test/codegen/panic-in-drop-abort.rs index 62d093507dd..0d19351a33d 100644 --- a/src/test/codegen/panic-in-drop-abort.rs +++ b/src/test/codegen/panic-in-drop-abort.rs @@ -3,6 +3,8 @@ // Ensure that unwinding code paths are eliminated from the output after // optimization. +// CHECK-NOT: {{(call|invoke).*}}should_not_appear_in_output + #![crate_type = "lib"] use std::any::Any; use std::mem::forget; @@ -35,8 +37,6 @@ impl Drop for AssertNeverDrop { } } -// CHECK-LABEL: normal_drop -// CHECK-NOT: should_not_appear_in_output #[no_mangle] pub fn normal_drop(x: ExternDrop) { let guard = AssertNeverDrop; @@ -44,8 +44,6 @@ pub fn normal_drop(x: ExternDrop) { forget(guard); } -// CHECK-LABEL: indirect_drop -// CHECK-NOT: should_not_appear_in_output #[no_mangle] pub fn indirect_drop(x: Box) { let guard = AssertNeverDrop; -- cgit 1.4.1-3-g733a5 From 51203dc1c40393b864af70d0bc50b6c4f4ea34e4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 25 Sep 2021 12:39:20 +0200 Subject: Pin panic-in-drop=abort test to old pass manager --- src/test/codegen/panic-in-drop-abort.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/panic-in-drop-abort.rs b/src/test/codegen/panic-in-drop-abort.rs index 0d19351a33d..39f73c4e396 100644 --- a/src/test/codegen/panic-in-drop-abort.rs +++ b/src/test/codegen/panic-in-drop-abort.rs @@ -1,8 +1,15 @@ -// compile-flags: -Z panic-in-drop=abort -O +// compile-flags: -Z panic-in-drop=abort -O -Z new-llvm-pass-manager=no // Ensure that unwinding code paths are eliminated from the output after // optimization. +// This test uses -Z new-llvm-pass-manager=no, because the expected optimization does not happen +// on targets using SEH exceptions (i.e. MSVC) anymore. The core issue is that Rust promises that +// the drop_in_place() function can't unwind, but implements it in a way that *can*, because we +// currently go out of our way to allow longjmps, which also use the unwinding mechanism on MSVC +// targets. We should either forbid longjmps, or not assume nounwind, making this optimization +// incompatible with the current behavior of running cleanuppads on longjmp unwinding. + // CHECK-NOT: {{(call|invoke).*}}should_not_appear_in_output #![crate_type = "lib"] -- cgit 1.4.1-3-g733a5