Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 64 insertions, 0 deletions

diff --git a/tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir b/tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir
new file mode 100644
index 000000000..0eff9474c
--- /dev/null
+++ b/tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir
@@ -0,0 +1,64 @@
+// MIR for `main` after ConstProp
+
+fn main() -> () {
+    let mut _0: ();                      // return place in scope 0 at $DIR/const_allocation2.rs:+0:11: +0:11
+    let _1: &[(std::option::Option<i32>, &[&u8])]; // in scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+    let mut _2: &&[(std::option::Option<i32>, &[&u8])]; // in scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+
+    bb0: {
+        StorageLive(_1);                 // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+        StorageLive(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+        _2 = const {alloc1: &&[(Option<i32>, &[&u8])]}; // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+                                         // mir::Constant
+                                         // + span: $DIR/const_allocation2.rs:6:5: 6:8
+                                         // + literal: Const { ty: &&[(Option<i32>, &[&u8])], val: Value(Scalar(alloc1)) }
+        _1 = (*_2);                      // scope 0 at $DIR/const_allocation2.rs:+1:5: +1:8
+        StorageDead(_2);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
+        StorageDead(_1);                 // scope 0 at $DIR/const_allocation2.rs:+1:8: +1:9
+        _0 = const ();                   // scope 0 at $DIR/const_allocation2.rs:+0:11: +2:2
+        return;                          // scope 0 at $DIR/const_allocation2.rs:+2:2: +2:2
+    }
+}
+
+alloc1 (static: FOO, size: 16, align: 8) {
+    ╾───────alloc22───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
+}
+
+alloc22 (size: 72, align: 8) {
+    0x00 │ 00 00 00 00 __ __ __ __ ╾───────alloc9────────╼ │ ....░░░░╾──────╼
+    0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░
+    0x20 │ ╾───────alloc14───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
+    0x30 │ 01 00 00 00 2a 00 00 00 ╾───────alloc20───────╼ │ ....*...╾──────╼
+    0x40 │ 03 00 00 00 00 00 00 00                         │ ........
+}
+
+alloc9 (size: 0, align: 8) {}
+
+alloc14 (size: 16, align: 8) {
+    ╾───────alloc12───────╼ ╾───────alloc13───────╼ │ ╾──────╼╾──────╼
+}
+
+alloc12 (size: 1, align: 1) {
+    05                                              │ .
+}
+
+alloc13 (size: 1, align: 1) {
+    06                                              │ .
+}
+
+alloc20 (size: 24, align: 8) {
+    0x00 │ ╾─────alloc17+0x3─────╼ ╾───────alloc18───────╼ │ ╾──────╼╾──────╼
+    0x10 │ ╾─────alloc19+0x2─────╼                         │ ╾──────╼
+}
+
+alloc17 (size: 4, align: 1) {
+    2a 45 15 6f                                     │ *E.o
+}
+
+alloc18 (size: 1, align: 1) {
+    2a                                              │ *
+}
+
+alloc19 (size: 4, align: 1) {
+    2a 45 15 6f                                     │ *E.o
+}