Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/ui/array-slice-vec/slice-panic-2.rs b/tests/ui/array-slice-vec/slice-panic-2.rs
new file mode 100644
index 000000000..d83c611d3
--- /dev/null
+++ b/tests/ui/array-slice-vec/slice-panic-2.rs
@@ -0,0 +1,31 @@
+// run-pass
+// needs-unwind
+
+// ignore-emscripten no threads support
+
+// Test that if a slicing expr[..] fails, the correct cleanups happen.
+
+
+use std::thread;
+
+struct Foo;
+
+static mut DTOR_COUNT: isize = 0;
+
+impl Drop for Foo {
+    fn drop(&mut self) { unsafe { DTOR_COUNT += 1; } }
+}
+
+fn bar() -> usize {
+    panic!();
+}
+
+fn foo() {
+    let x: &[_] = &[Foo, Foo];
+    let _ = &x[3..bar()];
+}
+
+fn main() {
+    let _ = thread::spawn(move|| foo()).join();
+    unsafe { assert_eq!(DTOR_COUNT, 2); }
+}