bless MIR

RalfJung · RalfJung · commit 1fa720316101 · 2020-08-09T18:54:56.000+02:00
diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit
@@ -30,41 +30,41 @@ fn main() -> () {
 }
 
 alloc0 (static: FOO, size: 8, align: 4) {
-    ╾─alloc21─╼ 03 00 00 00                         │ ╾──╼....
+    ╾─alloc23─╼ 03 00 00 00                         │ ╾──╼....
 }
 
-alloc21 (size: 48, align: 4) {
-    0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc4──╼ 00 00 00 00 │ ....░░░░╾──╼....
-    0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc9──╼ 02 00 00 00 │ ....░░░░╾──╼....
-    0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc19─╼ 03 00 00 00 │ ....*...╾──╼....
+alloc23 (size: 48, align: 4) {
+    0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc8──╼ 00 00 00 00 │ ....░░░░╾──╼....
+    0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc13─╼ 02 00 00 00 │ ....░░░░╾──╼....
+    0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc21─╼ 03 00 00 00 │ ....*...╾──╼....
 }
 
-alloc4 (size: 0, align: 4) {}
+alloc8 (size: 0, align: 4) {}
 
-alloc9 (size: 8, align: 4) {
-    ╾─alloc7──╼ ╾─alloc8──╼                         │ ╾──╼╾──╼
+alloc13 (size: 8, align: 4) {
+    ╾─alloc11─╼ ╾─alloc12─╼                         │ ╾──╼╾──╼
 }
 
-alloc7 (size: 1, align: 1) {
+alloc11 (size: 1, align: 1) {
     05                                              │ .
 }
 
-alloc8 (size: 1, align: 1) {
+alloc12 (size: 1, align: 1) {
     06                                              │ .
 }
 
-alloc19 (size: 12, align: 4) {
-    ╾─a15+0x3─╼ ╾─alloc16─╼ ╾─a18+0x2─╼             │ ╾──╼╾──╼╾──╼
+alloc21 (size: 12, align: 4) {
+    ╾─a17+0x3─╼ ╾─alloc18─╼ ╾─a20+0x2─╼             │ ╾──╼╾──╼╾──╼
 }
 
-alloc15 (size: 4, align: 1) {
+alloc17 (size: 4, align: 1) {
     2a 45 15 6f                                     │ *E.o
 }
 
-alloc16 (size: 1, align: 1) {
+alloc18 (size: 1, align: 1) {
     2a                                              │ *
 }
 
-alloc18 (size: 4, align: 1) {
+alloc20 (size: 4, align: 1) {
     2a 45 15 6f                                     │ *E.o
 }
diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.64bit b/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.64bit
@@ -30,44 +30,44 @@ fn main() -> () {
 }
 
 alloc0 (static: FOO, size: 16, align: 8) {
-    ╾───────alloc21───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
+    ╾───────alloc23───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
 }
 
-alloc21 (size: 72, align: 8) {
-    0x00 │ 00 00 00 00 __ __ __ __ ╾───────alloc4────────╼ │ ....░░░░╾──────╼
+alloc23 (size: 72, align: 8) {
+    0x00 │ 00 00 00 00 __ __ __ __ ╾───────alloc8────────╼ │ ....░░░░╾──────╼
     0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░
-    0x20 │ ╾───────alloc9────────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
-    0x30 │ 01 00 00 00 2a 00 00 00 ╾───────alloc19───────╼ │ ....*...╾──────╼
+    0x20 │ ╾───────alloc13───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
+    0x30 │ 01 00 00 00 2a 00 00 00 ╾───────alloc21───────╼ │ ....*...╾──────╼
     0x40 │ 03 00 00 00 00 00 00 00                         │ ........
 }
 
-alloc4 (size: 0, align: 8) {}
+alloc8 (size: 0, align: 8) {}
 
-alloc9 (size: 16, align: 8) {
-    ╾───────alloc7────────╼ ╾───────alloc8────────╼ │ ╾──────╼╾──────╼
+alloc13 (size: 16, align: 8) {
+    ╾───────alloc11───────╼ ╾───────alloc12───────╼ │ ╾──────╼╾──────╼
 }
 
-alloc7 (size: 1, align: 1) {
+alloc11 (size: 1, align: 1) {
     05                                              │ .
 }
 
-alloc8 (size: 1, align: 1) {
+alloc12 (size: 1, align: 1) {
     06                                              │ .
 }
 
-alloc19 (size: 24, align: 8) {
-    0x00 │ ╾─────alloc15+0x3─────╼ ╾───────alloc16───────╼ │ ╾──────╼╾──────╼
-    0x10 │ ╾─────alloc18+0x2─────╼                         │ ╾──────╼
+alloc21 (size: 24, align: 8) {
+    0x00 │ ╾─────alloc17+0x3─────╼ ╾───────alloc18───────╼ │ ╾──────╼╾──────╼
+    0x10 │ ╾─────alloc20+0x2─────╼                         │ ╾──────╼
 }
 
-alloc15 (size: 4, align: 1) {
+alloc17 (size: 4, align: 1) {
     2a 45 15 6f                                     │ *E.o
 }
 
-alloc16 (size: 1, align: 1) {
+alloc18 (size: 1, align: 1) {
     2a                                              │ *
 }
 
-alloc18 (size: 4, align: 1) {
+alloc20 (size: 4, align: 1) {
     2a 45 15 6f                                     │ *E.o
 }

Original file line number	Diff line number	Diff line change
`@@ -30,41 +30,41 @@ fn main() -> () {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`alloc0 (static: FOO, size: 8, align: 4) {`
`33`		`- ╾─alloc21─╼ 03 00 00 00 │ ╾──╼....`
	`33`	`+ ╾─alloc23─╼ 03 00 00 00 │ ╾──╼....`
`34`	`34`	`}`
`35`	`35`
`36`		`-alloc21 (size: 48, align: 4) {`
`37`		`- 0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc4──╼ 00 00 00 00 │ ....░░░░╾──╼....`
`38`		`- 0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc9──╼ 02 00 00 00 │ ....░░░░╾──╼....`
`39`		`- 0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc19─╼ 03 00 00 00 │ ....*...╾──╼....`
	`36`	`+alloc23 (size: 48, align: 4) {`
	`37`	`+ 0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc8──╼ 00 00 00 00 │ ....░░░░╾──╼....`
	`38`	`+ 0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc13─╼ 02 00 00 00 │ ....░░░░╾──╼....`
	`39`	`+ 0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc21─╼ 03 00 00 00 │ ....*...╾──╼....`
`40`	`40`	`}`
`41`	`41`
`42`		`-alloc4 (size: 0, align: 4) {}`
	`42`	`+alloc8 (size: 0, align: 4) {}`
`43`	`43`
`44`		`-alloc9 (size: 8, align: 4) {`
`45`		`- ╾─alloc7──╼ ╾─alloc8──╼ │ ╾──╼╾──╼`
	`44`	`+alloc13 (size: 8, align: 4) {`
	`45`	`+ ╾─alloc11─╼ ╾─alloc12─╼ │ ╾──╼╾──╼`
`46`	`46`	`}`
`47`	`47`
`48`		`-alloc7 (size: 1, align: 1) {`
	`48`	`+alloc11 (size: 1, align: 1) {`
`49`	`49`	`05 │ .`
`50`	`50`	`}`
`51`	`51`
`52`		`-alloc8 (size: 1, align: 1) {`
	`52`	`+alloc12 (size: 1, align: 1) {`
`53`	`53`	`06 │ .`
`54`	`54`	`}`
`55`	`55`
`56`		`-alloc19 (size: 12, align: 4) {`
`57`		`- ╾─a15+0x3─╼ ╾─alloc16─╼ ╾─a18+0x2─╼ │ ╾──╼╾──╼╾──╼`
	`56`	`+alloc21 (size: 12, align: 4) {`
	`57`	`+ ╾─a17+0x3─╼ ╾─alloc18─╼ ╾─a20+0x2─╼ │ ╾──╼╾──╼╾──╼`
`58`	`58`	`}`
`59`	`59`
`60`		`-alloc15 (size: 4, align: 1) {`
	`60`	`+alloc17 (size: 4, align: 1) {`
`61`	`61`	`2a 45 15 6f │ *E.o`
`62`	`62`	`}`
`63`	`63`
`64`		`-alloc16 (size: 1, align: 1) {`
	`64`	`+alloc18 (size: 1, align: 1) {`
`65`	`65`	`2a │ *`
`66`	`66`	`}`
`67`	`67`
`68`		`-alloc18 (size: 4, align: 1) {`
	`68`	`+alloc20 (size: 4, align: 1) {`
`69`	`69`	`2a 45 15 6f │ *E.o`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,44 +30,44 @@ fn main() -> () {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`alloc0 (static: FOO, size: 16, align: 8) {`
`33`		`- ╾───────alloc21───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........`
	`33`	`+ ╾───────alloc23───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........`
`34`	`34`	`}`
`35`	`35`
`36`		`-alloc21 (size: 72, align: 8) {`
`37`		`- 0x00 │ 00 00 00 00 __ __ __ __ ╾───────alloc4────────╼ │ ....░░░░╾──────╼`
	`36`	`+alloc23 (size: 72, align: 8) {`
	`37`	`+ 0x00 │ 00 00 00 00 __ __ __ __ ╾───────alloc8────────╼ │ ....░░░░╾──────╼`
`38`	`38`	`0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░`
`39`		`- 0x20 │ ╾───────alloc9────────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........`
`40`		`- 0x30 │ 01 00 00 00 2a 00 00 00 ╾───────alloc19───────╼ │ ....*...╾──────╼`
	`39`	`+ 0x20 │ ╾───────alloc13───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........`
	`40`	`+ 0x30 │ 01 00 00 00 2a 00 00 00 ╾───────alloc21───────╼ │ ....*...╾──────╼`
`41`	`41`	`0x40 │ 03 00 00 00 00 00 00 00 │ ........`
`42`	`42`	`}`
`43`	`43`
`44`		`-alloc4 (size: 0, align: 8) {}`
	`44`	`+alloc8 (size: 0, align: 8) {}`
`45`	`45`
`46`		`-alloc9 (size: 16, align: 8) {`
`47`		`- ╾───────alloc7────────╼ ╾───────alloc8────────╼ │ ╾──────╼╾──────╼`
	`46`	`+alloc13 (size: 16, align: 8) {`
	`47`	`+ ╾───────alloc11───────╼ ╾───────alloc12───────╼ │ ╾──────╼╾──────╼`
`48`	`48`	`}`
`49`	`49`
`50`		`-alloc7 (size: 1, align: 1) {`
	`50`	`+alloc11 (size: 1, align: 1) {`
`51`	`51`	`05 │ .`
`52`	`52`	`}`
`53`	`53`
`54`		`-alloc8 (size: 1, align: 1) {`
	`54`	`+alloc12 (size: 1, align: 1) {`
`55`	`55`	`06 │ .`
`56`	`56`	`}`
`57`	`57`
`58`		`-alloc19 (size: 24, align: 8) {`
`59`		`- 0x00 │ ╾─────alloc15+0x3─────╼ ╾───────alloc16───────╼ │ ╾──────╼╾──────╼`
`60`		`- 0x10 │ ╾─────alloc18+0x2─────╼ │ ╾──────╼`
	`58`	`+alloc21 (size: 24, align: 8) {`
	`59`	`+ 0x00 │ ╾─────alloc17+0x3─────╼ ╾───────alloc18───────╼ │ ╾──────╼╾──────╼`
	`60`	`+ 0x10 │ ╾─────alloc20+0x2─────╼ │ ╾──────╼`
`61`	`61`	`}`
`62`	`62`
`63`		`-alloc15 (size: 4, align: 1) {`
	`63`	`+alloc17 (size: 4, align: 1) {`
`64`	`64`	`2a 45 15 6f │ *E.o`
`65`	`65`	`}`
`66`	`66`
`67`		`-alloc16 (size: 1, align: 1) {`
	`67`	`+alloc18 (size: 1, align: 1) {`
`68`	`68`	`2a │ *`
`69`	`69`	`}`
`70`	`70`
`71`		`-alloc18 (size: 4, align: 1) {`
	`71`	`+alloc20 (size: 4, align: 1) {`
`72`	`72`	`2a 45 15 6f │ *E.o`
`73`	`73`	`}`