carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Convert literals to i32 when forming an i32-typed int_literal instruction. (#3814)

Browse Source 
This is temporary: eventually per the design we should be forming
integer literals whose types reflect their values. But for now we should
ensure that values fit within their types.

This also fixes canonicalization of integer constants and hence of array
types, because we no longer have multiple different representations of
each `i32` value depending on the bit-width used for the literal.
This commit is contained in:
Richard Smith
2024-03-26 19:56:11 +00:00
committed by GitHub
parent cae63a2b5b
commit 3763d0130a
27 changed files with 463 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/array/array_vs_tuple.carbon
Vendored
+10 -12
View File
@@ -20,12 +20,10 @@ fn G() {
// CHECK:STDOUT: %.5: i32 = int_literal 2 [template]
// CHECK:STDOUT: %.6: type = tuple_type (i32, i32, i32) [template]
// CHECK:STDOUT: %.7: i32 = int_literal 0 [template]
// CHECK:STDOUT: %.8: i32 = int_literal 1 [template]
// CHECK:STDOUT: %.9: i32 = int_literal 2 [template]
// CHECK:STDOUT: %.10: [i32; 3] = tuple_value (%.4, %.5, %.1) [template]
// CHECK:STDOUT: %.11: type = tuple_type (type, type, type) [template]
// CHECK:STDOUT: %.12: type = ptr_type (i32, i32, i32) [template]
// CHECK:STDOUT: %.13: (i32, i32, i32) = tuple_value (%.4, %.5, %.1) [template]
// CHECK:STDOUT: %.8: [i32; 3] = tuple_value (%.4, %.5, %.1) [template]
// CHECK:STDOUT: %.9: type = tuple_type (type, type, type) [template]
// CHECK:STDOUT: %.10: type = ptr_type (i32, i32, i32) [template]
// CHECK:STDOUT: %.11: (i32, i32, i32) = tuple_value (%.4, %.5, %.1) [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
@@ -48,14 +46,14 @@ fn G() {
// CHECK:STDOUT: %.loc9_29.2: i32 = int_literal 0 [template = constants.%.7]
// CHECK:STDOUT: %.loc9_29.3: ref i32 = array_index %a.var, %.loc9_29.2
// CHECK:STDOUT: %.loc9_29.4: init i32 = initialize_from %.loc9_22 to %.loc9_29.3 [template = constants.%.4]
// CHECK:STDOUT: %.loc9_29.5: i32 = int_literal 1 [template = constants.%.8]
// CHECK:STDOUT: %.loc9_29.5: i32 = int_literal 1 [template = constants.%.4]
// CHECK:STDOUT: %.loc9_29.6: ref i32 = array_index %a.var, %.loc9_29.5
// CHECK:STDOUT: %.loc9_29.7: init i32 = initialize_from %.loc9_25 to %.loc9_29.6 [template = constants.%.5]
// CHECK:STDOUT: %.loc9_29.8: i32 = int_literal 2 [template = constants.%.9]
// CHECK:STDOUT: %.loc9_29.8: i32 = int_literal 2 [template = constants.%.5]
// CHECK:STDOUT: %.loc9_29.9: ref i32 = array_index %a.var, %.loc9_29.8
// CHECK:STDOUT: %.loc9_29.10: init i32 = initialize_from %.loc9_28 to %.loc9_29.9 [template = constants.%.1]
// CHECK:STDOUT: %.loc9_29.11: init [i32; 3] = array_init (%.loc9_29.4, %.loc9_29.7, %.loc9_29.10) to %a.var [template = constants.%.10]
// CHECK:STDOUT: %.loc9_29.12: init [i32; 3] = converted %.loc9_29.1, %.loc9_29.11 [template = constants.%.10]
// CHECK:STDOUT: %.loc9_29.11: init [i32; 3] = array_init (%.loc9_29.4, %.loc9_29.7, %.loc9_29.10) to %a.var [template = constants.%.8]
// CHECK:STDOUT: %.loc9_29.12: init [i32; 3] = converted %.loc9_29.1, %.loc9_29.11 [template = constants.%.8]
// CHECK:STDOUT: assign %a.var, %.loc9_29.12
// CHECK:STDOUT: %.loc10_24.1: (type, type, type) = tuple_literal (i32, i32, i32)
// CHECK:STDOUT: %.loc10_24.2: type = converted %.loc10_24.1, constants.%.6 [template = constants.%.6]
@@ -71,8 +69,8 @@ fn G() {
// CHECK:STDOUT: %.loc10_36.5: init i32 = initialize_from %.loc10_32 to %.loc10_36.4 [template = constants.%.5]
// CHECK:STDOUT: %.loc10_36.6: ref i32 = tuple_access %b.var, element2
// CHECK:STDOUT: %.loc10_36.7: init i32 = initialize_from %.loc10_35 to %.loc10_36.6 [template = constants.%.1]
// CHECK:STDOUT: %.loc10_36.8: init (i32, i32, i32) = tuple_init (%.loc10_36.3, %.loc10_36.5, %.loc10_36.7) to %b.var [template = constants.%.13]
// CHECK:STDOUT: %.loc10_36.9: init (i32, i32, i32) = converted %.loc10_36.1, %.loc10_36.8 [template = constants.%.13]
// CHECK:STDOUT: %.loc10_36.8: init (i32, i32, i32) = tuple_init (%.loc10_36.3, %.loc10_36.5, %.loc10_36.7) to %b.var [template = constants.%.11]
// CHECK:STDOUT: %.loc10_36.9: init (i32, i32, i32) = converted %.loc10_36.1, %.loc10_36.8 [template = constants.%.11]
// CHECK:STDOUT: assign %b.var, %.loc10_36.9
// CHECK:STDOUT: return
// CHECK:STDOUT: }