Merging upstream version 1.69.0+dfsg1.

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

3 files changed, 76 insertions, 0 deletions

diff --git a/tests/ui/drop/issue-2735-2.rs b/tests/ui/drop/issue-2735-2.rs
new file mode 100644
index 000000000..70ebce9d3
--- /dev/null
+++ b/tests/ui/drop/issue-2735-2.rs
@@ -0,0 +1,27 @@
+// run-pass
+#![allow(non_camel_case_types)]
+
+use std::cell::Cell;
+
+// This test should behave exactly like issue-2735-3
+struct defer<'a> {
+    b: &'a Cell<bool>,
+}
+
+impl<'a> Drop for defer<'a> {
+    fn drop(&mut self) {
+        self.b.set(true);
+    }
+}
+
+fn defer(b: &Cell<bool>) -> defer {
+    defer {
+        b: b
+    }
+}
+
+pub fn main() {
+    let dtor_ran = &Cell::new(false);
+    let _  = defer(dtor_ran);
+    assert!(dtor_ran.get());
+}
diff --git a/tests/ui/drop/issue-2735-3.rs b/tests/ui/drop/issue-2735-3.rs
new file mode 100644
index 000000000..233015378
--- /dev/null
+++ b/tests/ui/drop/issue-2735-3.rs
@@ -0,0 +1,27 @@
+// run-pass
+#![allow(non_camel_case_types)]
+
+use std::cell::Cell;
+
+// This test should behave exactly like issue-2735-2
+struct defer<'a> {
+    b: &'a Cell<bool>,
+}
+
+impl<'a> Drop for defer<'a> {
+    fn drop(&mut self) {
+        self.b.set(true);
+    }
+}
+
+fn defer(b: &Cell<bool>) -> defer {
+    defer {
+        b: b
+    }
+}
+
+pub fn main() {
+    let dtor_ran = &Cell::new(false);
+    defer(dtor_ran);
+    assert!(dtor_ran.get());
+}
diff --git a/tests/ui/drop/issue-2735.rs b/tests/ui/drop/issue-2735.rs
new file mode 100644
index 000000000..20d3949a9
--- /dev/null
+++ b/tests/ui/drop/issue-2735.rs
@@ -0,0 +1,22 @@
+// run-pass
+#![allow(dead_code)]
+#![allow(non_camel_case_types)]
+
+// pretty-expanded FIXME #23616
+
+trait hax {
+    fn dummy(&self) { }
+}
+impl<A> hax for A { }
+
+fn perform_hax<T: 'static>(x: Box<T>) -> Box<dyn hax+'static> {
+    Box::new(x) as Box<dyn hax+'static>
+}
+
+fn deadcode() {
+    perform_hax(Box::new("deadcode".to_string()));
+}
+
+pub fn main() {
+    perform_hax(Box::new(42));
+}