Unify initialization and conversion logic (#3255)

Combine the initialization, implicit conversion, and value category
conversion functions into a single function.

This substantially reduces the duplication between these steps, and
ensures that we support the same set of conversions in all these
contexts. This also fixes some issues where we would not use the proper
value representation for tuples and structs after performing implicit
conversions.
This commit is contained in:
Richard Smith
2023-10-02 21:53:52 +00:00
committed by GitHub
parent 7899154a21
commit fea6cf88fc
74 changed files with 1646 additions and 1074 deletions
+3 -4
View File
@@ -24,19 +24,18 @@ fn G() {
// CHECK:STDOUT: %.loc10_29: type = array_type %.loc10_28, (i32, i32, i32)
// CHECK:STDOUT: %v: ref [(i32, i32, i32); 2] = var "v"
// CHECK:STDOUT: %.loc10_42.3: ref (i32, i32, i32) = splice_block %.loc10_42.2 {
// CHECK:STDOUT: %.loc10_7: ref [(i32, i32, i32); 2] = splice_block %v {}
// CHECK:STDOUT: %.loc10_42.1: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_42.2: ref (i32, i32, i32) = array_index %.loc10_7, %.loc10_42.1
// CHECK:STDOUT: %.loc10_42.2: ref (i32, i32, i32) = array_index %v, %.loc10_42.1
// CHECK:STDOUT: }
// CHECK:STDOUT: %.loc10_35: init (i32, i32, i32) = call @F() to %.loc10_42.3
// CHECK:STDOUT: %.loc10_42.6: ref (i32, i32, i32) = splice_block %.loc10_42.5 {
// CHECK:STDOUT: %.loc10_42.4: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_42.5: ref (i32, i32, i32) = array_index %.loc10_7, %.loc10_42.4
// CHECK:STDOUT: %.loc10_42.5: ref (i32, i32, i32) = array_index %v, %.loc10_42.4
// CHECK:STDOUT: }
// CHECK:STDOUT: %.loc10_40: init (i32, i32, i32) = call @F() to %.loc10_42.6
// CHECK:STDOUT: %.loc10_42.7: type = tuple_type ((i32, i32, i32), (i32, i32, i32))
// CHECK:STDOUT: %.loc10_42.8: ((i32, i32, i32), (i32, i32, i32)) = tuple_literal (%.loc10_35, %.loc10_40)
// CHECK:STDOUT: %.loc10_42.9: init [(i32, i32, i32); 2] = array_init %.loc10_42.8, (%.loc10_35, %.loc10_40) to %.loc10_7
// CHECK:STDOUT: %.loc10_42.9: init [(i32, i32, i32); 2] = array_init %.loc10_42.8, (%.loc10_35, %.loc10_40) to %v
// CHECK:STDOUT: assign %v, %.loc10_42.9
// CHECK:STDOUT: return
// CHECK:STDOUT: }
+2 -3
View File
@@ -33,11 +33,10 @@ fn Run() {
// CHECK:STDOUT: %.loc10_22.3: ref (i32,) = temporary %.loc10_22.2, %.loc10_22.1
// CHECK:STDOUT: %.loc10_22.4: ref i32 = tuple_access %.loc10_22.3, member0
// CHECK:STDOUT: %.loc10_22.5: i32 = bind_value %.loc10_22.4
// CHECK:STDOUT: %.loc10_7: ref [i32; 1] = splice_block %t {}
// CHECK:STDOUT: %.loc10_22.6: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_22.7: ref i32 = array_index %.loc10_7, %.loc10_22.6
// CHECK:STDOUT: %.loc10_22.7: ref i32 = array_index %t, %.loc10_22.6
// CHECK:STDOUT: %.loc10_22.8: init i32 = initialize_from %.loc10_22.5 to %.loc10_22.7
// CHECK:STDOUT: %.loc10_22.9: init [i32; 1] = array_init %.loc10_22.3, (%.loc10_22.8) to %.loc10_7
// CHECK:STDOUT: %.loc10_22.9: init [i32; 1] = array_init %.loc10_22.3, (%.loc10_22.8) to %t
// CHECK:STDOUT: assign %t, %.loc10_22.9
// CHECK:STDOUT: return
// CHECK:STDOUT: }
+13 -14
View File
@@ -15,34 +15,33 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc7_27: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_30: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_33: i32 = int_literal 3
// CHECK:STDOUT: %.loc7_34: (i32, i32, i32) = tuple_literal (%.loc7_27, %.loc7_30, %.loc7_33)
// CHECK:STDOUT: %.loc7_35.1: ref i32 = tuple_access %a, member0
// CHECK:STDOUT: %.loc7_35.2: init i32 = initialize_from %.loc7_27 to %.loc7_35.1
// CHECK:STDOUT: %.loc7_35.3: ref i32 = tuple_access %a, member1
// CHECK:STDOUT: %.loc7_35.4: init i32 = initialize_from %.loc7_30 to %.loc7_35.3
// CHECK:STDOUT: %.loc7_35.5: ref i32 = tuple_access %a, member2
// CHECK:STDOUT: %.loc7_35.6: init i32 = initialize_from %.loc7_33 to %.loc7_35.5
// CHECK:STDOUT: %.loc7_35.7: init (i32, i32, i32) = tuple_init %.loc7_34, (%.loc7_35.2, %.loc7_35.4, %.loc7_35.6)
// CHECK:STDOUT: assign %a, %.loc7_35.7
// CHECK:STDOUT: %.loc7_34.1: (i32, i32, i32) = tuple_literal (%.loc7_27, %.loc7_30, %.loc7_33)
// CHECK:STDOUT: %.loc7_34.2: ref i32 = tuple_access %a, member0
// CHECK:STDOUT: %.loc7_34.3: init i32 = initialize_from %.loc7_27 to %.loc7_34.2
// CHECK:STDOUT: %.loc7_34.4: ref i32 = tuple_access %a, member1
// CHECK:STDOUT: %.loc7_34.5: init i32 = initialize_from %.loc7_30 to %.loc7_34.4
// CHECK:STDOUT: %.loc7_34.6: ref i32 = tuple_access %a, member2
// CHECK:STDOUT: %.loc7_34.7: init i32 = initialize_from %.loc7_33 to %.loc7_34.6
// CHECK:STDOUT: %.loc7_34.8: init (i32, i32, i32) = tuple_init %.loc7_34.1, (%.loc7_34.3, %.loc7_34.5, %.loc7_34.7)
// CHECK:STDOUT: assign %a, %.loc7_34.8
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, i32
// CHECK:STDOUT: %b: ref [i32; 3] = var "b"
// CHECK:STDOUT: %.loc7_5.1: ref i32 = tuple_access %a, member0
// CHECK:STDOUT: %.loc7_5.2: i32 = bind_value %.loc7_5.1
// CHECK:STDOUT: %.loc8_5: ref [i32; 3] = splice_block %b {}
// CHECK:STDOUT: %.loc7_5.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc7_5.4: ref i32 = array_index %.loc8_5, %.loc7_5.3
// CHECK:STDOUT: %.loc7_5.4: ref i32 = array_index %b, %.loc7_5.3
// CHECK:STDOUT: %.loc7_5.5: init i32 = initialize_from %.loc7_5.2 to %.loc7_5.4
// CHECK:STDOUT: %.loc7_5.6: ref i32 = tuple_access %a, member1
// CHECK:STDOUT: %.loc7_5.7: i32 = bind_value %.loc7_5.6
// CHECK:STDOUT: %.loc7_5.8: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_5.9: ref i32 = array_index %.loc8_5, %.loc7_5.8
// CHECK:STDOUT: %.loc7_5.9: ref i32 = array_index %b, %.loc7_5.8
// CHECK:STDOUT: %.loc7_5.10: init i32 = initialize_from %.loc7_5.7 to %.loc7_5.9
// CHECK:STDOUT: %.loc7_5.11: ref i32 = tuple_access %a, member2
// CHECK:STDOUT: %.loc7_5.12: i32 = bind_value %.loc7_5.11
// CHECK:STDOUT: %.loc7_5.13: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_5.14: ref i32 = array_index %.loc8_5, %.loc7_5.13
// CHECK:STDOUT: %.loc7_5.14: ref i32 = array_index %b, %.loc7_5.13
// CHECK:STDOUT: %.loc7_5.15: init i32 = initialize_from %.loc7_5.12 to %.loc7_5.14
// CHECK:STDOUT: %.loc7_5.16: init [i32; 3] = array_init %a, (%.loc7_5.5, %.loc7_5.10, %.loc7_5.15) to %.loc8_5
// CHECK:STDOUT: %.loc7_5.16: init [i32; 3] = array_init %a, (%.loc7_5.5, %.loc7_5.10, %.loc7_5.15) to %b
// CHECK:STDOUT: assign %b, %.loc7_5.16
// CHECK:STDOUT: }
+18 -21
View File
@@ -15,11 +15,10 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc7_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (i32)
// CHECK:STDOUT: %.loc7_22.2: (i32,) = tuple_literal (%.loc7_20)
// CHECK:STDOUT: %.loc7_5: ref [i32; 1] = splice_block %a {}
// CHECK:STDOUT: %.loc7_22.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc7_22.4: ref i32 = array_index %.loc7_5, %.loc7_22.3
// CHECK:STDOUT: %.loc7_22.4: ref i32 = array_index %a, %.loc7_22.3
// CHECK:STDOUT: %.loc7_22.5: init i32 = initialize_from %.loc7_20 to %.loc7_22.4
// CHECK:STDOUT: %.loc7_22.6: init [i32; 1] = array_init %.loc7_22.2, (%.loc7_22.5) to %.loc7_5
// CHECK:STDOUT: %.loc7_22.6: init [i32; 1] = array_init %.loc7_22.2, (%.loc7_22.5) to %a
// CHECK:STDOUT: assign %a, %.loc7_22.6
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 2
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, f64
@@ -28,33 +27,31 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc8_26: f64 = real_literal 22e-1
// CHECK:STDOUT: %.loc8_30.1: type = tuple_type (f64, f64)
// CHECK:STDOUT: %.loc8_30.2: (f64, f64) = tuple_literal (%.loc8_20, %.loc8_26)
// CHECK:STDOUT: %.loc8_5: ref [f64; 2] = splice_block %b {}
// CHECK:STDOUT: %.loc8_30.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc8_30.4: ref f64 = array_index %.loc8_5, %.loc8_30.3
// CHECK:STDOUT: %.loc8_30.4: ref f64 = array_index %b, %.loc8_30.3
// CHECK:STDOUT: %.loc8_30.5: init f64 = initialize_from %.loc8_20 to %.loc8_30.4
// CHECK:STDOUT: %.loc8_30.6: i32 = int_literal 1
// CHECK:STDOUT: %.loc8_30.7: ref f64 = array_index %.loc8_5, %.loc8_30.6
// CHECK:STDOUT: %.loc8_30.7: ref f64 = array_index %b, %.loc8_30.6
// CHECK:STDOUT: %.loc8_30.8: init f64 = initialize_from %.loc8_26 to %.loc8_30.7
// CHECK:STDOUT: %.loc8_30.9: init [f64; 2] = array_init %.loc8_30.2, (%.loc8_30.5, %.loc8_30.8) to %.loc8_5
// CHECK:STDOUT: %.loc8_30.9: init [f64; 2] = array_init %.loc8_30.2, (%.loc8_30.5, %.loc8_30.8) to %b
// CHECK:STDOUT: assign %b, %.loc8_30.9
// CHECK:STDOUT: %.loc9_10.1: type = tuple_type ()
// CHECK:STDOUT: %.loc9_10.2: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_13: i32 = int_literal 5
// CHECK:STDOUT: %.loc9_14: type = array_type %.loc9_13, ()
// CHECK:STDOUT: %c: ref [(); 5] = var "c"
// CHECK:STDOUT: %.loc9_20: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_24: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_28: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_32: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_36: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_20.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_24.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_28.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_32.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_36.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_38.1: type = tuple_type ((), (), (), (), ())
// CHECK:STDOUT: %.loc9_38.2: ((), (), (), (), ()) = tuple_literal (%.loc9_20, %.loc9_24, %.loc9_28, %.loc9_32, %.loc9_36)
// CHECK:STDOUT: %.loc9_38.3: init () = tuple_init %.loc9_20, ()
// CHECK:STDOUT: %.loc9_38.4: init () = tuple_init %.loc9_24, ()
// CHECK:STDOUT: %.loc9_38.5: init () = tuple_init %.loc9_28, ()
// CHECK:STDOUT: %.loc9_38.6: init () = tuple_init %.loc9_32, ()
// CHECK:STDOUT: %.loc9_38.7: init () = tuple_init %.loc9_36, ()
// CHECK:STDOUT: %.loc9_5: ref [(); 5] = splice_block %c {}
// CHECK:STDOUT: %.loc9_38.8: init [(); 5] = array_init %.loc9_38.2, (%.loc9_38.3, %.loc9_38.4, %.loc9_38.5, %.loc9_38.6, %.loc9_38.7) to %.loc9_5
// CHECK:STDOUT: assign %c, %.loc9_38.8
// CHECK:STDOUT: %.loc9_38.2: ((), (), (), (), ()) = tuple_literal (%.loc9_20.1, %.loc9_24.1, %.loc9_28.1, %.loc9_32.1, %.loc9_36.1)
// CHECK:STDOUT: %.loc9_20.2: init () = tuple_init %.loc9_20.1, ()
// CHECK:STDOUT: %.loc9_24.2: init () = tuple_init %.loc9_24.1, ()
// CHECK:STDOUT: %.loc9_28.2: init () = tuple_init %.loc9_28.1, ()
// CHECK:STDOUT: %.loc9_32.2: init () = tuple_init %.loc9_32.1, ()
// CHECK:STDOUT: %.loc9_36.2: init () = tuple_init %.loc9_36.1, ()
// CHECK:STDOUT: %.loc9_38.3: init [(); 5] = array_init %.loc9_38.2, (%.loc9_20.2, %.loc9_24.2, %.loc9_28.2, %.loc9_32.2, %.loc9_36.2) to %c
// CHECK:STDOUT: assign %c, %.loc9_38.3
// CHECK:STDOUT: }
+7 -9
View File
@@ -35,10 +35,9 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %.loc10_32: String = string_literal "World"
// CHECK:STDOUT: %.loc10_39.1: type = tuple_type (i32, String, String)
// CHECK:STDOUT: %.loc10_39.2: (i32, String, String) = tuple_literal (%.loc10_20, %.loc10_23, %.loc10_32)
// CHECK:STDOUT: %.loc10_39.3: ref [i32; 3] = temporary_storage
// CHECK:STDOUT: %.loc10_39.4: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_39.5: ref i32 = array_index %.loc10_39.3, %.loc10_39.4
// CHECK:STDOUT: %.loc10_39.6: init i32 = initialize_from %.loc10_20 to %.loc10_39.5
// CHECK:STDOUT: %.loc10_39.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_39.4: ref i32 = array_index %a, %.loc10_39.3
// CHECK:STDOUT: %.loc10_39.5: init i32 = initialize_from %.loc10_20 to %.loc10_39.4
// CHECK:STDOUT: assign %a, <error>
// CHECK:STDOUT: %.loc15_29.1: type = tuple_type (type, type, type)
// CHECK:STDOUT: %.loc15_29.2: (type, type, type) = tuple_literal (i32, String, String)
@@ -48,11 +47,10 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %b: ref [i32; 3] = var "b"
// CHECK:STDOUT: %.loc15_5.1: ref i32 = tuple_access %t1, member0
// CHECK:STDOUT: %.loc15_5.2: i32 = bind_value %.loc15_5.1
// CHECK:STDOUT: %.loc15_5.3: ref [i32; 3] = temporary_storage
// CHECK:STDOUT: %.loc15_5.4: i32 = int_literal 0
// CHECK:STDOUT: %.loc15_5.5: ref i32 = array_index %.loc15_5.3, %.loc15_5.4
// CHECK:STDOUT: %.loc15_5.6: init i32 = initialize_from %.loc15_5.2 to %.loc15_5.5
// CHECK:STDOUT: %.loc15_5.7: ref String = tuple_access %t1, member1
// CHECK:STDOUT: %.loc15_5.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc15_5.4: ref i32 = array_index %b, %.loc15_5.3
// CHECK:STDOUT: %.loc15_5.5: init i32 = initialize_from %.loc15_5.2 to %.loc15_5.4
// CHECK:STDOUT: %.loc15_5.6: ref String = tuple_access %t1, member1
// CHECK:STDOUT: assign %b, <error>
// CHECK:STDOUT: %.loc21_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc21_15: type = array_type %.loc21_14, i32
+10 -11
View File
@@ -21,34 +21,33 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: %.loc7_44: i32 = int_literal 9
// CHECK:STDOUT: %.loc7_45.1: type = tuple_type (i32, i32, i32, i32, i32, i32, i32, i32, i32)
// CHECK:STDOUT: %.loc7_45.2: (i32, i32, i32, i32, i32, i32, i32, i32, i32) = tuple_literal (%.loc7_20, %.loc7_23, %.loc7_26, %.loc7_29, %.loc7_32, %.loc7_35, %.loc7_38, %.loc7_41, %.loc7_44)
// CHECK:STDOUT: %.loc7_5: ref [i32; 9] = splice_block %a {}
// CHECK:STDOUT: %.loc7_45.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc7_45.4: ref i32 = array_index %.loc7_5, %.loc7_45.3
// CHECK:STDOUT: %.loc7_45.4: ref i32 = array_index %a, %.loc7_45.3
// CHECK:STDOUT: %.loc7_45.5: init i32 = initialize_from %.loc7_20 to %.loc7_45.4
// CHECK:STDOUT: %.loc7_45.6: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_45.7: ref i32 = array_index %.loc7_5, %.loc7_45.6
// CHECK:STDOUT: %.loc7_45.7: ref i32 = array_index %a, %.loc7_45.6
// CHECK:STDOUT: %.loc7_45.8: init i32 = initialize_from %.loc7_23 to %.loc7_45.7
// CHECK:STDOUT: %.loc7_45.9: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_45.10: ref i32 = array_index %.loc7_5, %.loc7_45.9
// CHECK:STDOUT: %.loc7_45.10: ref i32 = array_index %a, %.loc7_45.9
// CHECK:STDOUT: %.loc7_45.11: init i32 = initialize_from %.loc7_26 to %.loc7_45.10
// CHECK:STDOUT: %.loc7_45.12: i32 = int_literal 3
// CHECK:STDOUT: %.loc7_45.13: ref i32 = array_index %.loc7_5, %.loc7_45.12
// CHECK:STDOUT: %.loc7_45.13: ref i32 = array_index %a, %.loc7_45.12
// CHECK:STDOUT: %.loc7_45.14: init i32 = initialize_from %.loc7_29 to %.loc7_45.13
// CHECK:STDOUT: %.loc7_45.15: i32 = int_literal 4
// CHECK:STDOUT: %.loc7_45.16: ref i32 = array_index %.loc7_5, %.loc7_45.15
// CHECK:STDOUT: %.loc7_45.16: ref i32 = array_index %a, %.loc7_45.15
// CHECK:STDOUT: %.loc7_45.17: init i32 = initialize_from %.loc7_32 to %.loc7_45.16
// CHECK:STDOUT: %.loc7_45.18: i32 = int_literal 5
// CHECK:STDOUT: %.loc7_45.19: ref i32 = array_index %.loc7_5, %.loc7_45.18
// CHECK:STDOUT: %.loc7_45.19: ref i32 = array_index %a, %.loc7_45.18
// CHECK:STDOUT: %.loc7_45.20: init i32 = initialize_from %.loc7_35 to %.loc7_45.19
// CHECK:STDOUT: %.loc7_45.21: i32 = int_literal 6
// CHECK:STDOUT: %.loc7_45.22: ref i32 = array_index %.loc7_5, %.loc7_45.21
// CHECK:STDOUT: %.loc7_45.22: ref i32 = array_index %a, %.loc7_45.21
// CHECK:STDOUT: %.loc7_45.23: init i32 = initialize_from %.loc7_38 to %.loc7_45.22
// CHECK:STDOUT: %.loc7_45.24: i32 = int_literal 7
// CHECK:STDOUT: %.loc7_45.25: ref i32 = array_index %.loc7_5, %.loc7_45.24
// CHECK:STDOUT: %.loc7_45.25: ref i32 = array_index %a, %.loc7_45.24
// CHECK:STDOUT: %.loc7_45.26: init i32 = initialize_from %.loc7_41 to %.loc7_45.25
// CHECK:STDOUT: %.loc7_45.27: i32 = int_literal 8
// CHECK:STDOUT: %.loc7_45.28: ref i32 = array_index %.loc7_5, %.loc7_45.27
// CHECK:STDOUT: %.loc7_45.28: ref i32 = array_index %a, %.loc7_45.27
// CHECK:STDOUT: %.loc7_45.29: init i32 = initialize_from %.loc7_44 to %.loc7_45.28
// CHECK:STDOUT: %.loc7_45.30: init [i32; 9] = array_init %.loc7_45.2, (%.loc7_45.5, %.loc7_45.8, %.loc7_45.11, %.loc7_45.14, %.loc7_45.17, %.loc7_45.20, %.loc7_45.23, %.loc7_45.26, %.loc7_45.29) to %.loc7_5
// CHECK:STDOUT: %.loc7_45.30: init [i32; 9] = array_init %.loc7_45.2, (%.loc7_45.5, %.loc7_45.8, %.loc7_45.11, %.loc7_45.14, %.loc7_45.17, %.loc7_45.20, %.loc7_45.23, %.loc7_45.26, %.loc7_45.29) to %a
// CHECK:STDOUT: assign %a, %.loc7_45.30
// CHECK:STDOUT: }