Merging upstream version 1.67.1+dfsg1.

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

1 files changed, 24 insertions, 0 deletions

diff --git a/src/test/mir-opt/issue_41888.rs b/src/test/mir-opt/issue_41888.rs
new file mode 100644
index 000000000..c1046c14d
--- /dev/null
+++ b/src/test/mir-opt/issue_41888.rs
@@ -0,0 +1,24 @@
+// ignore-wasm32-bare compiled with panic=abort by default
+// check that we clear the "ADT master drop flag" even when there are
+// no fields to be dropped.
+
+// EMIT_MIR issue_41888.main.ElaborateDrops.after.mir
+fn main() {
+    let e;
+    if cond() {
+        e = E::F(K);
+        if let E::F(_k) = e {
+            // older versions of rustc used to not clear the
+            // drop flag for `e` in this path.
+        }
+    }
+}
+
+fn cond() -> bool { false }
+
+struct K;
+
+enum E {
+    F(K),
+    G(Box<E>)
+}