Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-10734.rs b/tests/ui/issues/issue-10734.rs
new file mode 100644
index 000000000..723e6ed22
--- /dev/null
+++ b/tests/ui/issues/issue-10734.rs
@@ -0,0 +1,36 @@
+// run-pass
+#![allow(non_upper_case_globals)]
+
+static mut drop_count: usize = 0;
+
+struct Foo {
+    dropped: bool
+}
+
+impl Drop for Foo {
+    fn drop(&mut self) {
+        // Test to make sure we haven't dropped already
+        assert!(!self.dropped);
+        self.dropped = true;
+        // And record the fact that we dropped for verification later
+        unsafe { drop_count += 1; }
+    }
+}
+
+pub fn main() {
+    // An `if true { expr }` statement should compile the same as `{ expr }`.
+    if true {
+        let _a = Foo{ dropped: false };
+    }
+    // Check that we dropped already (as expected from a `{ expr }`).
+    unsafe { assert_eq!(drop_count, 1); }
+
+    // An `if false {} else { expr }` statement should compile the same as `{ expr }`.
+    if false {
+        panic!();
+    } else {
+        let _a = Foo{ dropped: false };
+    }
+    // Check that we dropped already (as expected from a `{ expr }`).
+    unsafe { assert_eq!(drop_count, 2); }
+}