Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-19367.rs b/tests/ui/issues/issue-19367.rs
new file mode 100644
index 000000000..0699533e7
--- /dev/null
+++ b/tests/ui/issues/issue-19367.rs
@@ -0,0 +1,32 @@
+// run-pass
+struct S {
+    o: Option<String>
+}
+
+// Make sure we don't reuse the same alloca when matching
+// on field of struct or tuple which we reassign in the match body.
+
+fn main() {
+    let mut a = (0, Some("right".to_string()));
+    let b = match a.1 {
+        Some(v) => {
+            a.1 = Some("wrong".to_string());
+            v
+        }
+        None => String::new()
+    };
+    println!("{}", b);
+    assert_eq!(b, "right");
+
+
+    let mut s = S{ o: Some("right".to_string()) };
+    let b = match s.o {
+        Some(v) => {
+            s.o = Some("wrong".to_string());
+            v
+        }
+        None => String::new(),
+    };
+    println!("{}", b);
+    assert_eq!(b, "right");
+}