Skip to content

Commit

Permalink
Update testdata to reflect changes
Browse files Browse the repository at this point in the history
  • Loading branch information
josh11b committed Nov 20, 2024
1 parent f079e01 commit d605bf2
Show file tree
Hide file tree
Showing 185 changed files with 8,497 additions and 8,426 deletions.
82 changes: 41 additions & 41 deletions toolchain/check/testdata/array/array_vs_tuple.carbon
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ fn G() {
// CHECK:STDOUT: %Convert.type.2: type = fn_type @Convert.1, @ImplicitAs(i32) [template]
// CHECK:STDOUT: %Convert.type.15: type = fn_type @Convert.11 [template]
// CHECK:STDOUT: %Convert.15: %Convert.type.15 = struct_value () [template]
// CHECK:STDOUT: %.38: <witness> = interface_witness (%Convert.15) [template]
// CHECK:STDOUT: %.39: <bound method> = bound_method %.4, %Convert.15 [template]
// CHECK:STDOUT: %.40: i32 = int_value 1 [template]
// CHECK:STDOUT: %.41: <bound method> = bound_method %.5, %Convert.15 [template]
// CHECK:STDOUT: %.42: i32 = int_value 2 [template]
// CHECK:STDOUT: %.43: <bound method> = bound_method %.1, %Convert.15 [template]
// CHECK:STDOUT: %.44: i32 = int_value 3 [template]
// CHECK:STDOUT: %array: %.2 = tuple_value (%.40, %.42, %.44) [template]
// CHECK:STDOUT: %.40: <witness> = interface_witness (%Convert.15) [template]
// CHECK:STDOUT: %.41: <bound method> = bound_method %.4, %Convert.15 [template]
// CHECK:STDOUT: %.42: i32 = int_value 1 [template]
// CHECK:STDOUT: %.43: <bound method> = bound_method %.5, %Convert.15 [template]
// CHECK:STDOUT: %.44: i32 = int_value 2 [template]
// CHECK:STDOUT: %.45: <bound method> = bound_method %.1, %Convert.15 [template]
// CHECK:STDOUT: %.46: i32 = int_value 3 [template]
// CHECK:STDOUT: %array: %.2 = tuple_value (%.42, %.44, %.46) [template]
// CHECK:STDOUT: %tuple.type.2: type = tuple_type (type, type, type) [template]
// CHECK:STDOUT: %tuple.type.3: type = tuple_type (i32, i32, i32) [template]
// CHECK:STDOUT: %tuple: %tuple.type.3 = tuple_value (%.40, %.42, %.44) [template]
// CHECK:STDOUT: %tuple: %tuple.type.3 = tuple_value (%.42, %.44, %.46) [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
Expand Down Expand Up @@ -74,27 +74,27 @@ fn G() {
// CHECK:STDOUT: %.loc13_25: Core.IntLiteral = int_value 2 [template = constants.%.5]
// CHECK:STDOUT: %.loc13_28: Core.IntLiteral = int_value 3 [template = constants.%.1]
// CHECK:STDOUT: %.loc13_29.1: %tuple.type.1 = tuple_literal (%.loc13_22, %.loc13_25, %.loc13_28)
// CHECK:STDOUT: %.loc13_29.2: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.3: <bound method> = bound_method %.loc13_22, %.loc13_29.2 [template = constants.%.39]
// CHECK:STDOUT: %int.convert_checked.loc13_29.1: init i32 = call %.loc13_29.3(%.loc13_22) [template = constants.%.40]
// CHECK:STDOUT: %.loc13_29.4: init i32 = converted %.loc13_22, %int.convert_checked.loc13_29.1 [template = constants.%.40]
// CHECK:STDOUT: %.loc13_29.2: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.3: <bound method> = bound_method %.loc13_22, %.loc13_29.2 [template = constants.%.41]
// CHECK:STDOUT: %int.convert_checked.loc13_29.1: init i32 = call %.loc13_29.3(%.loc13_22) [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.4: init i32 = converted %.loc13_22, %int.convert_checked.loc13_29.1 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.5: i32 = int_value 0 [template = constants.%.6]
// CHECK:STDOUT: %.loc13_29.6: ref i32 = array_index %a.var, %.loc13_29.5
// CHECK:STDOUT: %.loc13_29.7: init i32 = initialize_from %.loc13_29.4 to %.loc13_29.6 [template = constants.%.40]
// CHECK:STDOUT: %.loc13_29.8: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.9: <bound method> = bound_method %.loc13_25, %.loc13_29.8 [template = constants.%.41]
// CHECK:STDOUT: %int.convert_checked.loc13_29.2: init i32 = call %.loc13_29.9(%.loc13_25) [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.10: init i32 = converted %.loc13_25, %int.convert_checked.loc13_29.2 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.11: i32 = int_value 1 [template = constants.%.40]
// CHECK:STDOUT: %.loc13_29.7: init i32 = initialize_from %.loc13_29.4 to %.loc13_29.6 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.8: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.9: <bound method> = bound_method %.loc13_25, %.loc13_29.8 [template = constants.%.43]
// CHECK:STDOUT: %int.convert_checked.loc13_29.2: init i32 = call %.loc13_29.9(%.loc13_25) [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.10: init i32 = converted %.loc13_25, %int.convert_checked.loc13_29.2 [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.11: i32 = int_value 1 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.12: ref i32 = array_index %a.var, %.loc13_29.11
// CHECK:STDOUT: %.loc13_29.13: init i32 = initialize_from %.loc13_29.10 to %.loc13_29.12 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.14: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.15: <bound method> = bound_method %.loc13_28, %.loc13_29.14 [template = constants.%.43]
// CHECK:STDOUT: %int.convert_checked.loc13_29.3: init i32 = call %.loc13_29.15(%.loc13_28) [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.16: init i32 = converted %.loc13_28, %int.convert_checked.loc13_29.3 [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.17: i32 = int_value 2 [template = constants.%.42]
// CHECK:STDOUT: %.loc13_29.13: init i32 = initialize_from %.loc13_29.10 to %.loc13_29.12 [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.14: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc13_29.15: <bound method> = bound_method %.loc13_28, %.loc13_29.14 [template = constants.%.45]
// CHECK:STDOUT: %int.convert_checked.loc13_29.3: init i32 = call %.loc13_29.15(%.loc13_28) [template = constants.%.46]
// CHECK:STDOUT: %.loc13_29.16: init i32 = converted %.loc13_28, %int.convert_checked.loc13_29.3 [template = constants.%.46]
// CHECK:STDOUT: %.loc13_29.17: i32 = int_value 2 [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.18: ref i32 = array_index %a.var, %.loc13_29.17
// CHECK:STDOUT: %.loc13_29.19: init i32 = initialize_from %.loc13_29.16 to %.loc13_29.18 [template = constants.%.44]
// CHECK:STDOUT: %.loc13_29.19: init i32 = initialize_from %.loc13_29.16 to %.loc13_29.18 [template = constants.%.46]
// CHECK:STDOUT: %.loc13_29.20: init %.2 = array_init (%.loc13_29.7, %.loc13_29.13, %.loc13_29.19) to %a.var [template = constants.%array]
// CHECK:STDOUT: %.loc13_30: init %.2 = converted %.loc13_29.1, %.loc13_29.20 [template = constants.%array]
// CHECK:STDOUT: assign %a.var, %.loc13_30
Expand All @@ -115,24 +115,24 @@ fn G() {
// CHECK:STDOUT: %.loc14_32: Core.IntLiteral = int_value 2 [template = constants.%.5]
// CHECK:STDOUT: %.loc14_35: Core.IntLiteral = int_value 3 [template = constants.%.1]
// CHECK:STDOUT: %.loc14_36.1: %tuple.type.1 = tuple_literal (%.loc14_29, %.loc14_32, %.loc14_35)
// CHECK:STDOUT: %.loc14_36.2: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.3: <bound method> = bound_method %.loc14_29, %.loc14_36.2 [template = constants.%.39]
// CHECK:STDOUT: %int.convert_checked.loc14_36.1: init i32 = call %.loc14_36.3(%.loc14_29) [template = constants.%.40]
// CHECK:STDOUT: %.loc14_36.4: init i32 = converted %.loc14_29, %int.convert_checked.loc14_36.1 [template = constants.%.40]
// CHECK:STDOUT: %.loc14_36.2: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.3: <bound method> = bound_method %.loc14_29, %.loc14_36.2 [template = constants.%.41]
// CHECK:STDOUT: %int.convert_checked.loc14_36.1: init i32 = call %.loc14_36.3(%.loc14_29) [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.4: init i32 = converted %.loc14_29, %int.convert_checked.loc14_36.1 [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.5: ref i32 = tuple_access %b.var, element0
// CHECK:STDOUT: %.loc14_36.6: init i32 = initialize_from %.loc14_36.4 to %.loc14_36.5 [template = constants.%.40]
// CHECK:STDOUT: %.loc14_36.7: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.8: <bound method> = bound_method %.loc14_32, %.loc14_36.7 [template = constants.%.41]
// CHECK:STDOUT: %int.convert_checked.loc14_36.2: init i32 = call %.loc14_36.8(%.loc14_32) [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.9: init i32 = converted %.loc14_32, %int.convert_checked.loc14_36.2 [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.6: init i32 = initialize_from %.loc14_36.4 to %.loc14_36.5 [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.7: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.8: <bound method> = bound_method %.loc14_32, %.loc14_36.7 [template = constants.%.43]
// CHECK:STDOUT: %int.convert_checked.loc14_36.2: init i32 = call %.loc14_36.8(%.loc14_32) [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.9: init i32 = converted %.loc14_32, %int.convert_checked.loc14_36.2 [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.10: ref i32 = tuple_access %b.var, element1
// CHECK:STDOUT: %.loc14_36.11: init i32 = initialize_from %.loc14_36.9 to %.loc14_36.10 [template = constants.%.42]
// CHECK:STDOUT: %.loc14_36.12: %Convert.type.2 = interface_witness_access constants.%.38, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.13: <bound method> = bound_method %.loc14_35, %.loc14_36.12 [template = constants.%.43]
// CHECK:STDOUT: %int.convert_checked.loc14_36.3: init i32 = call %.loc14_36.13(%.loc14_35) [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.14: init i32 = converted %.loc14_35, %int.convert_checked.loc14_36.3 [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.11: init i32 = initialize_from %.loc14_36.9 to %.loc14_36.10 [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.12: %Convert.type.2 = interface_witness_access constants.%.40, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc14_36.13: <bound method> = bound_method %.loc14_35, %.loc14_36.12 [template = constants.%.45]
// CHECK:STDOUT: %int.convert_checked.loc14_36.3: init i32 = call %.loc14_36.13(%.loc14_35) [template = constants.%.46]
// CHECK:STDOUT: %.loc14_36.14: init i32 = converted %.loc14_35, %int.convert_checked.loc14_36.3 [template = constants.%.46]
// CHECK:STDOUT: %.loc14_36.15: ref i32 = tuple_access %b.var, element2
// CHECK:STDOUT: %.loc14_36.16: init i32 = initialize_from %.loc14_36.14 to %.loc14_36.15 [template = constants.%.44]
// CHECK:STDOUT: %.loc14_36.16: init i32 = initialize_from %.loc14_36.14 to %.loc14_36.15 [template = constants.%.46]
// CHECK:STDOUT: %.loc14_36.17: init %tuple.type.3 = tuple_init (%.loc14_36.6, %.loc14_36.11, %.loc14_36.16) to %b.var [template = constants.%tuple]
// CHECK:STDOUT: %.loc14_37: init %tuple.type.3 = converted %.loc14_36.1, %.loc14_36.17 [template = constants.%tuple]
// CHECK:STDOUT: assign %b.var, %.loc14_37
Expand Down
36 changes: 18 additions & 18 deletions toolchain/check/testdata/array/assign_return_value.carbon
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ fn Run() {
// CHECK:STDOUT: %Convert.type.2: type = fn_type @Convert.1, @ImplicitAs(i32) [template]
// CHECK:STDOUT: %Convert.type.15: type = fn_type @Convert.11 [template]
// CHECK:STDOUT: %Convert.15: %Convert.type.15 = struct_value () [template]
// CHECK:STDOUT: %.33: <witness> = interface_witness (%Convert.15) [template]
// CHECK:STDOUT: %.34: <bound method> = bound_method %.1, %Convert.15 [template]
// CHECK:STDOUT: %.35: i32 = int_value 0 [template]
// CHECK:STDOUT: %tuple: %tuple.type.2 = tuple_value (%.35) [template]
// CHECK:STDOUT: %.35: <witness> = interface_witness (%Convert.15) [template]
// CHECK:STDOUT: %.36: <bound method> = bound_method %.1, %Convert.15 [template]
// CHECK:STDOUT: %.37: i32 = int_value 0 [template]
// CHECK:STDOUT: %tuple: %tuple.type.2 = tuple_value (%.37) [template]
// CHECK:STDOUT: %Run.type: type = fn_type @Run [template]
// CHECK:STDOUT: %Run: %Run.type = struct_value () [template]
// CHECK:STDOUT: %.36: Core.IntLiteral = int_value 1 [template]
// CHECK:STDOUT: %.37: type = array_type %.36, i32 [template]
// CHECK:STDOUT: %.38: Core.IntLiteral = int_value 1 [template]
// CHECK:STDOUT: %.39: type = array_type %.38, i32 [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
Expand Down Expand Up @@ -73,11 +73,11 @@ fn Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %.loc11_28: Core.IntLiteral = int_value 0 [template = constants.%.1]
// CHECK:STDOUT: %.loc11_30.1: %tuple.type.3 = tuple_literal (%.loc11_28)
// CHECK:STDOUT: %.loc11_30.2: %Convert.type.2 = interface_witness_access constants.%.33, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc11_30.3: <bound method> = bound_method %.loc11_28, %.loc11_30.2 [template = constants.%.34]
// CHECK:STDOUT: %int.convert_checked: init i32 = call %.loc11_30.3(%.loc11_28) [template = constants.%.35]
// CHECK:STDOUT: %.loc11_30.4: i32 = value_of_initializer %int.convert_checked [template = constants.%.35]
// CHECK:STDOUT: %.loc11_30.5: i32 = converted %.loc11_28, %.loc11_30.4 [template = constants.%.35]
// CHECK:STDOUT: %.loc11_30.2: %Convert.type.2 = interface_witness_access constants.%.35, element0 [template = constants.%Convert.15]
// CHECK:STDOUT: %.loc11_30.3: <bound method> = bound_method %.loc11_28, %.loc11_30.2 [template = constants.%.36]
// CHECK:STDOUT: %int.convert_checked: init i32 = call %.loc11_30.3(%.loc11_28) [template = constants.%.37]
// CHECK:STDOUT: %.loc11_30.4: i32 = value_of_initializer %int.convert_checked [template = constants.%.37]
// CHECK:STDOUT: %.loc11_30.5: i32 = converted %.loc11_28, %.loc11_30.4 [template = constants.%.37]
// CHECK:STDOUT: %tuple: %tuple.type.2 = tuple_value (%.loc11_30.5) [template = constants.%tuple]
// CHECK:STDOUT: %.loc11_31: %tuple.type.2 = converted %.loc11_30.1, %tuple [template = constants.%tuple]
// CHECK:STDOUT: return %.loc11_31
Expand All @@ -86,23 +86,23 @@ fn Run() {
// CHECK:STDOUT: fn @Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32]
// CHECK:STDOUT: %.loc14_16: Core.IntLiteral = int_value 1 [template = constants.%.36]
// CHECK:STDOUT: %.loc14_16: Core.IntLiteral = int_value 1 [template = constants.%.38]
// CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %int.make_type_32 [template = i32]
// CHECK:STDOUT: %.loc14_11.2: type = converted %int.make_type_32, %.loc14_11.1 [template = i32]
// CHECK:STDOUT: %.loc14_17: type = array_type %.loc14_16, i32 [template = constants.%.37]
// CHECK:STDOUT: %t.var: ref %.37 = var t
// CHECK:STDOUT: %t: ref %.37 = bind_name t, %t.var
// CHECK:STDOUT: %.loc14_17: type = array_type %.loc14_16, i32 [template = constants.%.39]
// CHECK:STDOUT: %t.var: ref %.39 = var t
// CHECK:STDOUT: %t: ref %.39 = bind_name t, %t.var
// CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [template = constants.%F]
// CHECK:STDOUT: %F.call: init %tuple.type.2 = call %F.ref()
// CHECK:STDOUT: %.loc14_22.1: ref %tuple.type.2 = temporary_storage
// CHECK:STDOUT: %.loc14_22.2: ref %tuple.type.2 = temporary %.loc14_22.1, %F.call
// CHECK:STDOUT: %.loc14_22.3: ref i32 = tuple_access %.loc14_22.2, element0
// CHECK:STDOUT: %.loc14_22.4: i32 = bind_value %.loc14_22.3
// CHECK:STDOUT: %.loc14_22.5: i32 = int_value 0 [template = constants.%.35]
// CHECK:STDOUT: %.loc14_22.5: i32 = int_value 0 [template = constants.%.37]
// CHECK:STDOUT: %.loc14_22.6: ref i32 = array_index %t.var, %.loc14_22.5
// CHECK:STDOUT: %.loc14_22.7: init i32 = initialize_from %.loc14_22.4 to %.loc14_22.6
// CHECK:STDOUT: %.loc14_22.8: init %.37 = array_init (%.loc14_22.7) to %t.var
// CHECK:STDOUT: %.loc14_24: init %.37 = converted %F.call, %.loc14_22.8
// CHECK:STDOUT: %.loc14_22.8: init %.39 = array_init (%.loc14_22.7) to %t.var
// CHECK:STDOUT: %.loc14_24: init %.39 = converted %F.call, %.loc14_22.8
// CHECK:STDOUT: assign %t.var, %.loc14_24
// CHECK:STDOUT: return
// CHECK:STDOUT: }
Expand Down
Loading

0 comments on commit d605bf2

Please sign in to comment.