Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

2 files changed, 86 insertions, 0 deletions

diff --git a/tests/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir b/tests/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir
new file mode 100644
index 000000000..9597a0c83
--- /dev/null
+++ b/tests/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir
@@ -0,0 +1,74 @@
+// MIR for `foo` after PreCodegen
+
+fn foo(_1: Option<String>) -> i32 {
+    debug s => _1;                       // in scope 0 at $DIR/string.rs:+0:12: +0:13
+    let mut _0: i32;                     // return place in scope 0 at $DIR/string.rs:+0:34: +0:37
+    let mut _2: &std::string::String;    // in scope 0 at $DIR/string.rs:+2:14: +2:17
+    let mut _3: &str;                    // in scope 0 at $DIR/string.rs:+2:14: +2:17
+    let mut _4: bool;                    // in scope 0 at $DIR/string.rs:+2:14: +2:17
+    let mut _5: isize;                   // in scope 0 at $DIR/string.rs:+2:9: +2:18
+    let _6: std::option::Option<std::string::String>; // in scope 0 at $DIR/string.rs:+3:9: +3:10
+    let mut _7: bool;                    // in scope 0 at $DIR/string.rs:+5:1: +5:2
+    scope 1 {
+        debug s => _6;                   // in scope 1 at $DIR/string.rs:+3:9: +3:10
+    }
+
+    bb0: {
+        _7 = const false;                // scope 0 at $DIR/string.rs:+1:11: +1:12
+        _7 = const true;                 // scope 0 at $DIR/string.rs:+1:11: +1:12
+        _5 = discriminant(_1);           // scope 0 at $DIR/string.rs:+1:11: +1:12
+        switchInt(move _5) -> [1: bb2, otherwise: bb1]; // scope 0 at $DIR/string.rs:+1:5: +1:12
+    }
+
+    bb1: {
+        StorageLive(_6);                 // scope 0 at $DIR/string.rs:+3:9: +3:10
+        _7 = const false;                // scope 0 at $DIR/string.rs:+3:9: +3:10
+        _6 = move _1;                    // scope 0 at $DIR/string.rs:+3:9: +3:10
+        _0 = const 4321_i32;             // scope 1 at $DIR/string.rs:+3:14: +3:18
+        drop(_6) -> bb6;                 // scope 0 at $DIR/string.rs:+3:17: +3:18
+    }
+
+    bb2: {
+        _2 = &((_1 as Some).0: std::string::String); // scope 0 at $DIR/string.rs:+2:14: +2:17
+        _3 = <String as Deref>::deref(move _2) -> bb3; // scope 0 at $DIR/string.rs:+2:14: +2:17
+                                         // mir::Constant
+                                         // + span: $DIR/string.rs:9:14: 9:17
+                                         // + literal: Const { ty: for<'a> fn(&'a String) -> &'a <String as Deref>::Target {<String as Deref>::deref}, val: Value(<ZST>) }
+    }
+
+    bb3: {
+        _4 = <str as PartialEq>::eq(_3, const "a") -> bb4; // scope 0 at $DIR/string.rs:+2:14: +2:17
+                                         // mir::Constant
+                                         // + span: $DIR/string.rs:9:14: 9:17
+                                         // + literal: Const { ty: for<'a, 'b> fn(&'a str, &'b str) -> bool {<str as PartialEq>::eq}, val: Value(<ZST>) }
+                                         // mir::Constant
+                                         // + span: $DIR/string.rs:9:14: 9:17
+                                         // + literal: Const { ty: &str, val: Value(Slice(..)) }
+    }
+
+    bb4: {
+        switchInt(move _4) -> [0: bb1, otherwise: bb5]; // scope 0 at $DIR/string.rs:+2:14: +2:17
+    }
+
+    bb5: {
+        _0 = const 1234_i32;             // scope 0 at $DIR/string.rs:+2:22: +2:26
+        goto -> bb9;                     // scope 0 at $DIR/string.rs:+2:22: +2:26
+    }
+
+    bb6: {
+        StorageDead(_6);                 // scope 0 at $DIR/string.rs:+3:17: +3:18
+        goto -> bb9;                     // scope 0 at $DIR/string.rs:+3:17: +3:18
+    }
+
+    bb7: {
+        return;                          // scope 0 at $DIR/string.rs:+5:2: +5:2
+    }
+
+    bb8: {
+        drop(_1) -> bb7;                 // scope 0 at $DIR/string.rs:+5:1: +5:2
+    }
+
+    bb9: {
+        switchInt(_7) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2
+    }
+}
diff --git a/tests/mir-opt/deref-patterns/string.rs b/tests/mir-opt/deref-patterns/string.rs
new file mode 100644
index 000000000..3a99c44aa
--- /dev/null
+++ b/tests/mir-opt/deref-patterns/string.rs
@@ -0,0 +1,12 @@
+// compile-flags: -Z mir-opt-level=0 -C panic=abort
+
+#![feature(string_deref_patterns)]
+#![crate_type = "lib"]
+
+// EMIT_MIR string.foo.PreCodegen.after.mir
+pub fn foo(s: Option<String>) -> i32 {
+    match s {
+        Some("a") => 1234,
+        s => 4321,
+    }
+}