Merging upstream version 1.67.1+dfsg1.

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

1 files changed, 30 insertions, 0 deletions

diff --git a/src/test/mir-opt/issue_41110.rs b/src/test/mir-opt/issue_41110.rs
new file mode 100644
index 000000000..638dc601e
--- /dev/null
+++ b/src/test/mir-opt/issue_41110.rs
@@ -0,0 +1,30 @@
+// ignore-wasm32-bare compiled with panic=abort by default
+
+// check that we don't emit multiple drop flags when they are not needed.
+
+
+// EMIT_MIR issue_41110.main.ElaborateDrops.after.mir
+fn main() {
+    let x = S.other(S.id());
+}
+
+// no_mangle to make sure this gets instantiated even in an executable.
+#[no_mangle]
+// EMIT_MIR issue_41110.test.ElaborateDrops.after.mir
+pub fn test() {
+    let u = S;
+    let mut v = S;
+    drop(v);
+    v = u;
+}
+
+struct S;
+impl Drop for S {
+    fn drop(&mut self) {
+    }
+}
+
+impl S {
+    fn id(self) -> Self { self }
+    fn other(self, s: Self) {}
+}