From e15b24e77d5c238d0a9b927530f2cab81db38b52 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 4 Oct 2023 16:50:22 -0700 Subject: [PATCH] Use the name of a function as the name of its file-scope value. (#3262) As requested in #3260. --- .../testdata/array/array_in_place.carbon | 4 +-- .../testdata/array/assign_return_value.carbon | 4 +-- .../testdata/array/function_param.carbon | 4 +-- .../testdata/basics/fail_name_lookup.carbon | 2 +- .../check/testdata/basics/multifile.carbon | 4 +-- .../multifile_raw_and_textual_ir.carbon | 4 +-- .../testdata/basics/numeric_literals.carbon | 2 +- .../testdata/basics/raw_and_textual_ir.carbon | 2 +- .../check/testdata/basics/textual_ir.carbon | 2 +- .../check/testdata/const/collapse.carbon | 2 +- .../check/testdata/const/fail_collapse.carbon | 2 +- .../in_place_tuple_initialization.carbon | 6 ++-- .../function/call/empty_struct.carbon | 4 +-- .../testdata/function/call/empty_tuple.carbon | 4 +-- .../function/call/fail_not_callable.carbon | 2 +- .../function/call/fail_param_count.carbon | 8 ++--- .../function/call/fail_param_type.carbon | 4 +-- .../call/fail_return_type_mismatch.carbon | 4 +-- .../check/testdata/function/call/i32.carbon | 4 +-- .../function/call/more_param_ir.carbon | 4 +-- .../testdata/function/call/params_one.carbon | 4 +-- .../function/call/params_one_comma.carbon | 4 +-- .../testdata/function/call/params_two.carbon | 4 +-- .../function/call/params_two_comma.carbon | 4 +-- .../testdata/function/call/params_zero.carbon | 4 +-- .../function/call/return_implicit.carbon | 4 +-- .../function/declaration/simple.carbon | 4 +-- .../fail_param_name_conflict.carbon | 2 +- .../testdata/function/definition/order.carbon | 6 ++-- .../function/definition/params_one.carbon | 2 +- .../definition/params_one_comma.carbon | 2 +- .../function/definition/params_two.carbon | 2 +- .../definition/params_two_comma.carbon | 2 +- .../function/definition/params_zero.carbon | 2 +- .../definition/same_param_name.carbon | 4 +-- toolchain/check/testdata/if/else.carbon | 8 ++--- .../if/fail_reachable_fallthrough.carbon | 6 ++-- toolchain/check/testdata/if/fail_scope.carbon | 2 +- toolchain/check/testdata/if/no_else.carbon | 6 ++-- .../if/unreachable_fallthrough.carbon | 2 +- .../check/testdata/if_expression/basic.carbon | 2 +- .../if_expression/constant_condition.carbon | 8 ++--- .../if_expression/control_flow.carbon | 6 ++-- .../testdata/if_expression/nested.carbon | 2 +- .../testdata/if_expression/struct.carbon | 4 +-- .../testdata/index/expression_category.carbon | 6 ++-- .../index/fail_empty_tuple_access.carbon | 4 +-- .../index/fail_expression_category.carbon | 4 +-- .../testdata/index/fail_invalid_base.carbon | 2 +- .../testdata/index/fail_name_not_found.carbon | 2 +- .../index/fail_non_tuple_access.carbon | 2 +- .../index/tuple_return_value_access.carbon | 4 +-- .../ir/duplicate_name_same_line.carbon | 2 +- .../testdata/namespace/fail_duplicate.carbon | 4 +-- .../check/testdata/namespace/function.carbon | 8 ++--- .../check/testdata/namespace/nested.carbon | 6 ++-- toolchain/check/testdata/operators/and.carbon | 6 ++-- .../testdata/operators/assignment.carbon | 2 +- .../check/testdata/operators/binary_op.carbon | 2 +- .../fail_assigment_to_non_assignable.carbon | 4 +-- .../operators/fail_type_mismatch.carbon | 2 +- .../fail_type_mismatch_assignment.carbon | 2 +- .../operators/fail_type_mismatch_once.carbon | 2 +- toolchain/check/testdata/operators/or.carbon | 6 ++-- .../check/testdata/operators/unary_op.carbon | 2 +- .../testdata/pointer/address_of_deref.carbon | 2 +- .../testdata/pointer/address_of_lvalue.carbon | 2 +- toolchain/check/testdata/pointer/basic.carbon | 2 +- .../pointer/fail_address_of_value.carbon | 16 ++++----- .../fail_dereference_not_pointer.carbon | 2 +- .../pointer/fail_type_mismatch.carbon | 2 +- .../testdata/pointer/nested_const.carbon | 2 +- toolchain/check/testdata/pointer/types.carbon | 4 +-- .../testdata/return/code_after_return.carbon | 2 +- .../return/code_after_return_value.carbon | 2 +- .../return/fail_missing_return.carbon | 2 +- .../fail_missing_return_empty_tuple.carbon | 2 +- .../testdata/return/fail_type_mismatch.carbon | 2 +- .../return/fail_value_disallowed.carbon | 2 +- .../testdata/return/fail_value_missing.carbon | 2 +- .../missing_return_no_return_type.carbon | 2 +- .../check/testdata/return/no_value.carbon | 2 +- toolchain/check/testdata/return/struct.carbon | 2 +- toolchain/check/testdata/return/tuple.carbon | 2 +- toolchain/check/testdata/return/value.carbon | 2 +- .../struct/fail_access_into_invalid.carbon | 2 +- .../struct/literal_member_access.carbon | 4 +-- .../struct/nested_struct_in_place.carbon | 4 +-- .../tuples/nested_tuple_in_place.carbon | 6 ++-- toolchain/check/testdata/var/decl.carbon | 2 +- .../check/testdata/var/decl_with_init.carbon | 2 +- .../testdata/var/fail_duplicate_decl.carbon | 2 +- .../var/fail_init_type_mismatch.carbon | 2 +- .../testdata/var/fail_init_with_self.carbon | 2 +- .../var/fail_lookup_outside_scope.carbon | 2 +- .../var/fail_storage_is_literal.carbon | 2 +- .../var/global_lookup_in_scope.carbon | 2 +- toolchain/check/testdata/var/lookup.carbon | 2 +- toolchain/sem_ir/formatter.cpp | 34 ++++++++++++------- 99 files changed, 187 insertions(+), 177 deletions(-) diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index 3d21dfcc3bcb..be1ce7023b26 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -11,8 +11,8 @@ fn G() { } // CHECK:STDOUT: file "array_in_place.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index 04c3953053d3..daa2fc6ee5e3 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -11,8 +11,8 @@ fn Run() { } // CHECK:STDOUT: file "assign_return_value.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @Run +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %Run = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> (i32,) { diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index 5b6a848ceb78..c29e113505b9 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -13,8 +13,8 @@ fn G() -> i32 { } // CHECK:STDOUT: file "function_param.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc11 = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%arr: [i32; 3], %i: i32) -> i32 { diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index 82eaf341c956..d6736265b0e7 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_name_lookup.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/basics/multifile.carbon b/toolchain/check/testdata/basics/multifile.carbon index 3347f8c10108..9d16515d36bc 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -11,7 +11,7 @@ fn A() {} fn B() {} // CHECK:STDOUT: file "a.carbon" { -// CHECK:STDOUT: %.loc1 = fn_decl @A +// CHECK:STDOUT: %A = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -19,7 +19,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: file "b.carbon" { -// CHECK:STDOUT: %.loc1 = fn_decl @B +// CHECK:STDOUT: %B = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() { diff --git a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon index 5bda8f220213..c9142680e902 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -47,7 +47,7 @@ fn B() {} // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: file "a.carbon" { -// CHECK:STDOUT: %.loc1 = fn_decl @A +// CHECK:STDOUT: %A = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -87,7 +87,7 @@ fn B() {} // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: file "b.carbon" { -// CHECK:STDOUT: %.loc1 = fn_decl @B +// CHECK:STDOUT: %B = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() { diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 50c1d29f6187..706e0a5a8747 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -26,7 +26,7 @@ fn F() { } // CHECK:STDOUT: file "numeric_literals.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index bb299739451e..ea6ea9aef695 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -106,7 +106,7 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: file "raw_and_textual_ir.carbon" { -// CHECK:STDOUT: %.loc11 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%n: i32) -> %return: (i32, f64) { diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index bca57cb9342d..bd4fbe0971bd 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -13,7 +13,7 @@ fn Foo(n: i32) -> (i32, f64) { } // CHECK:STDOUT: file "textual_ir.carbon" { -// CHECK:STDOUT: %.loc11 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%n: i32) -> %return: (i32, f64) { diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 79c8e35c71aa..418353067b6f 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -13,7 +13,7 @@ fn F(p: const i32**) -> const (const i32)** { } // CHECK:STDOUT: file "collapse.carbon" { -// CHECK:STDOUT: %.loc11 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%p: const i32**) -> const i32** { diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index 7db5475eb171..d17fcfec4084 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -15,7 +15,7 @@ fn G(p: const (const i32)**) -> i32** { } // CHECK:STDOUT: file "fail_collapse.carbon" { -// CHECK:STDOUT: %.loc10 = fn_decl @G +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p: const i32**) -> i32** { diff --git a/toolchain/check/testdata/expression_category/in_place_tuple_initialization.carbon b/toolchain/check/testdata/expression_category/in_place_tuple_initialization.carbon index 311c1024e5a4..3c8bb603f9cd 100644 --- a/toolchain/check/testdata/expression_category/in_place_tuple_initialization.carbon +++ b/toolchain/check/testdata/expression_category/in_place_tuple_initialization.carbon @@ -17,9 +17,9 @@ fn H() -> i32 { } // CHECK:STDOUT: file "in_place_tuple_initialization.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G -// CHECK:STDOUT: %.loc15 = fn_decl @H +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %H = fn_decl @H // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32); diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index 7191ee498a08..5c47aa2593d2 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -13,8 +13,8 @@ fn Main() { } // CHECK:STDOUT: file "empty_struct.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Echo -// CHECK:STDOUT: %.loc11 = fn_decl @Main +// CHECK:STDOUT: %Echo = fn_decl @Echo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: {}) -> {} { diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index baf5e0af77b5..878e7019e1a5 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -13,8 +13,8 @@ fn Main() { } // CHECK:STDOUT: file "empty_tuple.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Echo -// CHECK:STDOUT: %.loc11 = fn_decl @Main +// CHECK:STDOUT: %Echo = fn_decl @Echo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: ()) -> () { diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index d7d2c623ccbc..71d16f5705b2 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -15,7 +15,7 @@ fn Run() { } // CHECK:STDOUT: file "fail_not_callable.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Run +// CHECK:STDOUT: %Run = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index ec860b99a9b1..a3adfcef47b9 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -56,10 +56,10 @@ fn Main() { } // CHECK:STDOUT: file "fail_param_count.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Run0 -// CHECK:STDOUT: %.loc8 = fn_decl @Run1 -// CHECK:STDOUT: %.loc9 = fn_decl @Run2 -// CHECK:STDOUT: %.loc11 = fn_decl @Main +// CHECK:STDOUT: %Run0 = fn_decl @Run0 +// CHECK:STDOUT: %Run1 = fn_decl @Run1 +// CHECK:STDOUT: %Run2 = fn_decl @Run2 +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run0() { diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index 2b463626461e..9b12f8a4c9d0 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -17,8 +17,8 @@ fn Main() { } // CHECK:STDOUT: file "fail_param_type.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Run -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Run = fn_decl @Run +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run(%a: i32) { diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index 862745836350..3c574c098fca 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -14,8 +14,8 @@ fn Run() { } // CHECK:STDOUT: file "fail_return_type_mismatch.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Run +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Run = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() -> f64 { diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 07f8ce94bd1e..6e23c96eed36 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -13,8 +13,8 @@ fn Main() { } // CHECK:STDOUT: file "i32.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Echo -// CHECK:STDOUT: %.loc11 = fn_decl @Main +// CHECK:STDOUT: %Echo = fn_decl @Echo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: i32) -> i32 { diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index 1f95563f7340..69b47111c95d 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -12,8 +12,8 @@ fn Main() { } // CHECK:STDOUT: file "more_param_ir.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32, %c: i32) { diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 6c975b62e2df..49631efdfff8 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -11,8 +11,8 @@ fn Main() { } // CHECK:STDOUT: file "params_one.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index e24cc3099ad9..7329151160a5 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -12,8 +12,8 @@ fn Main() { } // CHECK:STDOUT: file "params_one_comma.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index 13fe46412ff8..72c28c51cac2 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -11,8 +11,8 @@ fn Main() { } // CHECK:STDOUT: file "params_two.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index efa1c51a7c0e..6099775a8c96 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -12,8 +12,8 @@ fn Main() { } // CHECK:STDOUT: file "params_two_comma.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 756123b458d0..fe2f345d0d9a 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -11,8 +11,8 @@ fn Main() { } // CHECK:STDOUT: file "params_zero.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index b4ff2370afb2..19a5a325d335 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -12,8 +12,8 @@ fn Main() { } // CHECK:STDOUT: file "return_implicit.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @MakeImplicitEmptyTuple -// CHECK:STDOUT: %.loc10 = fn_decl @Main +// CHECK:STDOUT: %MakeImplicitEmptyTuple = fn_decl @MakeImplicitEmptyTuple +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MakeImplicitEmptyTuple() { diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index f53df3c71ef8..e9e52868f4af 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -9,8 +9,8 @@ fn F(); fn G() { F(); } // CHECK:STDOUT: file "simple.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); diff --git a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon index b60e763ee3c8..a9030b820108 100644 --- a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon @@ -13,7 +13,7 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: file "fail_param_name_conflict.carbon" { -// CHECK:STDOUT: %.loc13 = fn_decl @Bar +// CHECK:STDOUT: %Bar = fn_decl @Bar // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Bar(%a.loc13_8: i32, %a.loc13_16: i32) { diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index c364d8ee18b5..9a03243aa4b8 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -9,9 +9,9 @@ fn Bar() {} fn Baz() {} // CHECK:STDOUT: file "order.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc8 = fn_decl @Bar -// CHECK:STDOUT: %.loc9 = fn_decl @Baz +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Bar = fn_decl @Bar +// CHECK:STDOUT: %Baz = fn_decl @Baz // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 3a03ee62dc7e..f0d25f62f73d 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -7,7 +7,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: file "params_one.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index 31adaac31763..7550ce647e65 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -7,7 +7,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: file "params_one_comma.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index 64255a8a812b..07e41bd70ca8 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -7,7 +7,7 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: file "params_two.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 30fea711a0e0..9a06850c6f1a 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -7,7 +7,7 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: file "params_two_comma.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index c675d9f37949..eeb6d7d2cc78 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -7,7 +7,7 @@ fn Foo() {} // CHECK:STDOUT: file "params_zero.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo +// CHECK:STDOUT: %Foo = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/definition/same_param_name.carbon b/toolchain/check/testdata/function/definition/same_param_name.carbon index 1de3baa962cf..2cbc7faf009d 100644 --- a/toolchain/check/testdata/function/definition/same_param_name.carbon +++ b/toolchain/check/testdata/function/definition/same_param_name.carbon @@ -8,8 +8,8 @@ fn Foo(a: i32) {} fn Bar(a: i32) {} // CHECK:STDOUT: file "same_param_name.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Foo -// CHECK:STDOUT: %.loc8 = fn_decl @Bar +// CHECK:STDOUT: %Foo = fn_decl @Foo +// CHECK:STDOUT: %Bar = fn_decl @Bar // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 5a81f96c4d44..f778ba2e9231 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -18,10 +18,10 @@ fn If(b: bool) { } // CHECK:STDOUT: file "else.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc8 = fn_decl @G -// CHECK:STDOUT: %.loc9 = fn_decl @H -// CHECK:STDOUT: %.loc11 = fn_decl @If +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %H = fn_decl @H +// CHECK:STDOUT: %If = fn_decl @If // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index 986e4aeaeb24..aece667e690a 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -34,9 +34,9 @@ fn If3(b: bool) -> i32 { } // CHECK:STDOUT: file "fail_reachable_fallthrough.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @If1 -// CHECK:STDOUT: %.loc17 = fn_decl @If2 -// CHECK:STDOUT: %.loc27 = fn_decl @If3 +// CHECK:STDOUT: %If1 = fn_decl @If1 +// CHECK:STDOUT: %If2 = fn_decl @If2 +// CHECK:STDOUT: %If3 = fn_decl @If3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @If1(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 48de82da72c6..659a6ecee88b 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -16,7 +16,7 @@ fn VarScope(b: bool) -> i32 { } // CHECK:STDOUT: file "fail_scope.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @VarScope +// CHECK:STDOUT: %VarScope = fn_decl @VarScope // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @VarScope(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 908d74c5203f..f16e6d3a929c 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -15,9 +15,9 @@ fn If(b: bool) { } // CHECK:STDOUT: file "no_else.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc8 = fn_decl @G -// CHECK:STDOUT: %.loc10 = fn_decl @If +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %If = fn_decl @If // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index 3663aafcba87..cefbc6ff3aef 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -14,7 +14,7 @@ fn If(b: bool) -> i32 { } // CHECK:STDOUT: file "unreachable_fallthrough.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @If +// CHECK:STDOUT: %If = fn_decl @If // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @If(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if_expression/basic.carbon b/toolchain/check/testdata/if_expression/basic.carbon index a8238c1e1f27..7016c33dd41f 100644 --- a/toolchain/check/testdata/if_expression/basic.carbon +++ b/toolchain/check/testdata/if_expression/basic.carbon @@ -9,7 +9,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { } // CHECK:STDOUT: file "basic.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%b: bool, %n: i32, %m: i32) -> i32 { diff --git a/toolchain/check/testdata/if_expression/constant_condition.carbon b/toolchain/check/testdata/if_expression/constant_condition.carbon index e8700a1f6aca..98d61733e776 100644 --- a/toolchain/check/testdata/if_expression/constant_condition.carbon +++ b/toolchain/check/testdata/if_expression/constant_condition.carbon @@ -16,10 +16,10 @@ fn G() -> i32 { } // CHECK:STDOUT: file "constant_condition.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @A -// CHECK:STDOUT: %.loc8 = fn_decl @B -// CHECK:STDOUT: %.loc10 = fn_decl @F -// CHECK:STDOUT: %.loc14 = fn_decl @G +// CHECK:STDOUT: %A = fn_decl @A +// CHECK:STDOUT: %B = fn_decl @B +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { diff --git a/toolchain/check/testdata/if_expression/control_flow.carbon b/toolchain/check/testdata/if_expression/control_flow.carbon index fbf519af04ee..cc6934ffd97f 100644 --- a/toolchain/check/testdata/if_expression/control_flow.carbon +++ b/toolchain/check/testdata/if_expression/control_flow.carbon @@ -12,9 +12,9 @@ fn F(b: bool) -> i32 { } // CHECK:STDOUT: file "control_flow.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @A -// CHECK:STDOUT: %.loc8 = fn_decl @B -// CHECK:STDOUT: %.loc10 = fn_decl @F +// CHECK:STDOUT: %A = fn_decl @A +// CHECK:STDOUT: %B = fn_decl @B +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { diff --git a/toolchain/check/testdata/if_expression/nested.carbon b/toolchain/check/testdata/if_expression/nested.carbon index bff6c7c6628f..dc827087d406 100644 --- a/toolchain/check/testdata/if_expression/nested.carbon +++ b/toolchain/check/testdata/if_expression/nested.carbon @@ -9,7 +9,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { } // CHECK:STDOUT: file "nested.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: bool, %b: bool, %c: bool) -> i32 { diff --git a/toolchain/check/testdata/if_expression/struct.carbon b/toolchain/check/testdata/if_expression/struct.carbon index 8c2efb4a303f..794eb6de8833 100644 --- a/toolchain/check/testdata/if_expression/struct.carbon +++ b/toolchain/check/testdata/if_expression/struct.carbon @@ -12,8 +12,8 @@ fn F(cond: bool) { } // CHECK:STDOUT: file "struct.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @G -// CHECK:STDOUT: %.loc9 = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%s: {.a: i32, .b: i32}); diff --git a/toolchain/check/testdata/index/expression_category.carbon b/toolchain/check/testdata/index/expression_category.carbon index 20509672eda6..ba49cae31205 100644 --- a/toolchain/check/testdata/index/expression_category.carbon +++ b/toolchain/check/testdata/index/expression_category.carbon @@ -25,9 +25,9 @@ fn ValueBinding(b: [i32; 3]) { } // CHECK:STDOUT: file "expression_category.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G -// CHECK:STDOUT: %.loc17 = fn_decl @ValueBinding +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %ValueBinding = fn_decl @ValueBinding // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: [i32; 3]; diff --git a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon index f866455c821f..d5eefe8dfb8b 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -14,8 +14,8 @@ fn Run() { } // CHECK:STDOUT: file "fail_empty_tuple_access.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @Run +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %Run = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/index/fail_expression_category.carbon b/toolchain/check/testdata/index/fail_expression_category.carbon index 199cd3ae3e28..cc959bb2c921 100644 --- a/toolchain/check/testdata/index/fail_expression_category.carbon +++ b/toolchain/check/testdata/index/fail_expression_category.carbon @@ -30,8 +30,8 @@ fn G(b: [i32; 3]) { } // CHECK:STDOUT: file "fail_expression_category.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: [i32; 3]; diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index f86ead4e2486..0a948802e722 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -35,7 +35,7 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: %a: ref i32 = var "a" // CHECK:STDOUT: %.loc15: i32 = int_literal 0 // CHECK:STDOUT: assign %a, -// CHECK:STDOUT: %.loc20 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: %b: ref i32 = var "b" // CHECK:STDOUT: %.loc21: i32 = int_literal 1 // CHECK:STDOUT: assign %b, diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index 86de6eeaeb12..eb2a24e7cc42 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_name_not_found.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index 3d69df461fff..f667924cb25e 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_non_tuple_access.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/index/tuple_return_value_access.carbon b/toolchain/check/testdata/index/tuple_return_value_access.carbon index 1045368444ca..87753cf64aaa 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -11,8 +11,8 @@ fn Run() -> i32 { } // CHECK:STDOUT: file "tuple_return_value_access.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @Run +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %Run = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> (i32,) { diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index fcf062fbf217..04ad1e11b8ce 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -7,7 +7,7 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } } // CHECK:STDOUT: file "duplicate_name_same_line.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @A +// CHECK:STDOUT: %A = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index 3e0935bea38a..8a5e7c287991 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -19,8 +19,8 @@ fn Foo.Baz() { } // CHECK:STDOUT: file "fail_duplicate.carbon" { -// CHECK:STDOUT: %.loc7 = namespace {.Baz = %.loc9} -// CHECK:STDOUT: %.loc9 = fn_decl @Baz +// CHECK:STDOUT: %.loc7 = namespace {.Baz = %Baz} +// CHECK:STDOUT: %Baz = fn_decl @Baz // CHECK:STDOUT: %.loc18 = fn_decl @.1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 141a7fb25e27..deb9e9d196c1 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -18,10 +18,10 @@ fn Bar() { } // CHECK:STDOUT: file "function.carbon" { -// CHECK:STDOUT: %.loc7 = namespace {.Baz = %.loc13} -// CHECK:STDOUT: %.loc10 = fn_decl @Baz.1 -// CHECK:STDOUT: %.loc13 = fn_decl @Baz.2 -// CHECK:STDOUT: %.loc16 = fn_decl @Bar +// CHECK:STDOUT: %.loc7 = namespace {.Baz = %Baz.loc13} +// CHECK:STDOUT: %Baz.loc10 = fn_decl @Baz.1 +// CHECK:STDOUT: %Baz.loc13 = fn_decl @Baz.2 +// CHECK:STDOUT: %Bar = fn_decl @Bar // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Baz.1() { diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index 04b7c8bae4e8..26c3d8a0c88d 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -16,9 +16,9 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: file "nested.carbon" { // CHECK:STDOUT: %.loc7 = namespace {.Bar = %.loc8} -// CHECK:STDOUT: %.loc8 = namespace {.Wiz = %.loc10, .Baz = %.loc13} -// CHECK:STDOUT: %.loc10 = fn_decl @Wiz -// CHECK:STDOUT: %.loc13 = fn_decl @Baz +// CHECK:STDOUT: %.loc8 = namespace {.Wiz = %Wiz, .Baz = %Baz} +// CHECK:STDOUT: %Wiz = fn_decl @Wiz +// CHECK:STDOUT: %Baz = fn_decl @Baz // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Wiz() { diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index f57965feaee3..7bebfd9275b6 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -12,9 +12,9 @@ fn And() -> bool { } // CHECK:STDOUT: file "and.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc8 = fn_decl @G -// CHECK:STDOUT: %.loc10 = fn_decl @And +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %And = fn_decl @And // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index 60f8dfc8d5e4..43ccaad0fc72 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -23,7 +23,7 @@ fn Main() { } // CHECK:STDOUT: file "assignment.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/operators/binary_op.carbon b/toolchain/check/testdata/operators/binary_op.carbon index 0765814e5fd4..37c1a6c6d936 100644 --- a/toolchain/check/testdata/operators/binary_op.carbon +++ b/toolchain/check/testdata/operators/binary_op.carbon @@ -9,7 +9,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "binary_op.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/operators/fail_assigment_to_non_assignable.carbon b/toolchain/check/testdata/operators/fail_assigment_to_non_assignable.carbon index c26f16fe5f48..25b6a9515a86 100644 --- a/toolchain/check/testdata/operators/fail_assigment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assigment_to_non_assignable.carbon @@ -46,8 +46,8 @@ fn Main() { } // CHECK:STDOUT: file "fail_assigment_to_non_assignable.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32; diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index 66fbdbd11f35..d60c95774396 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -12,7 +12,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "fail_type_mismatch.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index be7a16c774fb..57a309c08215 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -13,7 +13,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_type_mismatch_assignment.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon index da7fcb2c9520..dda7e90d102a 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon @@ -14,7 +14,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "fail_type_mismatch_once.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index fb300d0f8015..99586a18a97a 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -12,9 +12,9 @@ fn Or() -> bool { } // CHECK:STDOUT: file "or.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc8 = fn_decl @G -// CHECK:STDOUT: %.loc10 = fn_decl @Or +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %Or = fn_decl @Or // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index ae03882c74b7..f1be86e63b07 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -9,7 +9,7 @@ fn Not(b: bool) -> bool { } // CHECK:STDOUT: file "unary_op.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Not +// CHECK:STDOUT: %Not = fn_decl @Not // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Not(%b: bool) -> bool { diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 79cac718f10f..b15e20bd79cd 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -10,7 +10,7 @@ fn F() -> i32 { } // CHECK:STDOUT: file "address_of_deref.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index 5a4f825771db..628747d3726d 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -17,7 +17,7 @@ fn F() { } // CHECK:STDOUT: file "address_of_lvalue.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 4188583ed4bd..021f5435707f 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -12,7 +12,7 @@ fn F() -> i32 { } // CHECK:STDOUT: file "basic.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 05606ca6253c..b67f6c3d063f 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -83,14 +83,14 @@ fn AddressOfParameter(param: i32) { } // CHECK:STDOUT: file "fail_address_of_value.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @G -// CHECK:STDOUT: %.loc9 = fn_decl @H -// CHECK:STDOUT: %.loc11 = fn_decl @AddressOfLiteral -// CHECK:STDOUT: %.loc38 = fn_decl @AddressOfOperator -// CHECK:STDOUT: %.loc53 = fn_decl @AddressOfCall -// CHECK:STDOUT: %.loc60 = fn_decl @AddressOfType -// CHECK:STDOUT: %.loc71 = fn_decl @AddressOfTupleElementValue -// CHECK:STDOUT: %.loc78 = fn_decl @AddressOfParameter +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %H = fn_decl @H +// CHECK:STDOUT: %AddressOfLiteral = fn_decl @AddressOfLiteral +// CHECK:STDOUT: %AddressOfOperator = fn_decl @AddressOfOperator +// CHECK:STDOUT: %AddressOfCall = fn_decl @AddressOfCall +// CHECK:STDOUT: %AddressOfType = fn_decl @AddressOfType +// CHECK:STDOUT: %AddressOfTupleElementValue = fn_decl @AddressOfTupleElementValue +// CHECK:STDOUT: %AddressOfParameter = fn_decl @AddressOfParameter // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32; diff --git a/toolchain/check/testdata/pointer/fail_dereference_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_dereference_not_pointer.carbon index 665034a11655..d67c8550d2a0 100644 --- a/toolchain/check/testdata/pointer/fail_dereference_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_dereference_not_pointer.carbon @@ -20,7 +20,7 @@ fn Deref(n: i32) { } // CHECK:STDOUT: file "fail_dereference_not_pointer.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Deref +// CHECK:STDOUT: %Deref = fn_decl @Deref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Deref(%n: i32) { diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 9230d0e23321..9af0ebe2f4dc 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -12,7 +12,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { } // CHECK:STDOUT: file "fail_type_mismatch.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @ConstMismatch +// CHECK:STDOUT: %ConstMismatch = fn_decl @ConstMismatch // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ConstMismatch(%p: const {}*) -> const ({}*) { diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index fca2a8469ccd..626e3fa234f0 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -10,7 +10,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { } // CHECK:STDOUT: file "nested_const.carbon" { -// CHECK:STDOUT: %.loc8 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%p: const (const (const i32*)*)) -> const i32 { diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 8e06f993dd5e..5988cff41a76 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -13,8 +13,8 @@ fn ConstPtr(p: const i32*) -> (const i32)* { } // CHECK:STDOUT: file "types.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Ptr -// CHECK:STDOUT: %.loc11 = fn_decl @ConstPtr +// CHECK:STDOUT: %Ptr = fn_decl @Ptr +// CHECK:STDOUT: %ConstPtr = fn_decl @ConstPtr // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Ptr(%p: i32*) -> i32* { diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index b2db31b91e80..cd53fe6340bd 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -10,7 +10,7 @@ fn Main() { } // CHECK:STDOUT: file "code_after_return.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index 0f436ba00223..14964062f20a 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -17,7 +17,7 @@ fn F(b: bool) -> i32 { } // CHECK:STDOUT: file "code_after_return_value.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 6d283dda4d9a..50318b091e5d 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -11,7 +11,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "fail_missing_return.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index 4cd994def2a3..02e3b832afa4 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -11,7 +11,7 @@ fn F() -> () { } // CHECK:STDOUT: file "fail_missing_return_empty_tuple.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> () { diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 57ae3a243b6c..f8af2478d583 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -12,7 +12,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "fail_type_mismatch.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index 33c656599f9c..0878e01b4da4 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -15,7 +15,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_value_disallowed.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 6d53be28cda4..caef25c7d7d2 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -12,7 +12,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "fail_value_missing.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/return/missing_return_no_return_type.carbon b/toolchain/check/testdata/return/missing_return_no_return_type.carbon index 7e623ede798c..d10c305ea7c0 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -8,7 +8,7 @@ fn F() { } // CHECK:STDOUT: file "missing_return_no_return_type.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index 0c320fb7c8a2..21133156dfdf 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -9,7 +9,7 @@ fn Main() { } // CHECK:STDOUT: file "no_value.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index 669b5dccbfb3..a5c934c03784 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -9,7 +9,7 @@ fn Main() -> {.a: i32} { } // CHECK:STDOUT: file "struct.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> {.a: i32} { diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index d9b7bb9e1717..466cb9cba797 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -10,7 +10,7 @@ fn Main() -> (i32, i32) { } // CHECK:STDOUT: file "tuple.carbon" { -// CHECK:STDOUT: %.loc8 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> %return: (i32, i32) { diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index 2207412d3f43..398c50d78688 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -9,7 +9,7 @@ fn Main() -> i32 { } // CHECK:STDOUT: file "value.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 23b0a5abb93c..c42ffff794e0 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -11,7 +11,7 @@ fn F() { a.b; } // CHECK:STDOUT: file "fail_access_into_invalid.carbon" { -// CHECK:STDOUT: %.loc11 = fn_decl @F +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index ddc7f6ada94f..c1c89c9dbac3 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -11,8 +11,8 @@ fn F() -> i32 { } // CHECK:STDOUT: file "literal_member_access.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @G -// CHECK:STDOUT: %.loc9 = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %return: {.x: i32, .y: i32, .z: i32}; diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index af7464f039f1..90dc8d1d9c0e 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -11,8 +11,8 @@ fn G() { } // CHECK:STDOUT: file "nested_struct_in_place.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon index 5bb96c5d968d..91be9259bf59 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -15,9 +15,9 @@ fn H() { } // CHECK:STDOUT: file "nested_tuple_in_place.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @F -// CHECK:STDOUT: %.loc9 = fn_decl @G -// CHECK:STDOUT: %.loc13 = fn_decl @H +// CHECK:STDOUT: %F = fn_decl @F +// CHECK:STDOUT: %G = fn_decl @G +// CHECK:STDOUT: %H = fn_decl @H // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/var/decl.carbon b/toolchain/check/testdata/var/decl.carbon index 13dadd2b41af..095703eec4d8 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -9,7 +9,7 @@ fn Main() { } // CHECK:STDOUT: file "decl.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index c54d8642428a..89dcbbce2bb3 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -9,7 +9,7 @@ fn Main() { } // CHECK:STDOUT: file "decl_with_init.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index a9cbbb5f30b5..b03d6d3486df 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -17,7 +17,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_duplicate_decl.carbon" { -// CHECK:STDOUT: %.loc8 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 060ea122b6db..d94fb83fa79b 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_init_type_mismatch.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index ad93a98c61e6..5ca47124b9c4 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_init_with_self.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index 24b885b7e85c..8fd29871f794 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -14,7 +14,7 @@ fn Main() { var y: i32 = x; // CHECK:STDOUT: file "fail_lookup_outside_scope.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: %y: ref i32 = var "y" // CHECK:STDOUT: assign %y, // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 011c079a742a..57bd1cce35b6 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -12,7 +12,7 @@ fn Main() { } // CHECK:STDOUT: file "fail_storage_is_literal.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index 5fe4f700100f..0007b865467c 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: %x: ref i32 = var "x" // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc7 -// CHECK:STDOUT: %.loc9 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index b950944542cc..8905e2e12d6d 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -10,7 +10,7 @@ fn Main() { } // CHECK:STDOUT: file "lookup.carbon" { -// CHECK:STDOUT: %.loc7 = fn_decl @Main +// CHECK:STDOUT: %Main = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index dd330a9a7112..fb950dcfccd0 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -334,7 +334,20 @@ class NodeNamer { if (!node_id.is_valid()) { continue; } + auto node = semantics_ir_.GetNode(node_id); + auto add_node_name = [&](std::string name) { + nodes[node_id.index] = {scope_idx, scope.nodes.AllocateName( + *this, node.parse_node(), name)}; + }; + auto add_node_name_id = [&](StringId name_id) { + if (name_id.is_valid()) { + add_node_name(semantics_ir_.GetString(name_id).str()); + } else { + add_node_name(""); + } + }; + switch (node.kind()) { case NodeKind::Branch: { auto dest_id = node.GetAsBranch(); @@ -356,23 +369,21 @@ class NodeNamer { CollectNamesInBlock(scope_idx, block_id); break; } + case NodeKind::FunctionDeclaration: { + add_node_name_id( + semantics_ir_.GetFunction(node.GetAsFunctionDeclaration()) + .name_id); + continue; + } case NodeKind::Parameter: { - auto name_id = node.GetAsParameter(); - nodes[node_id.index] = { - scope_idx, - scope.nodes.AllocateName(*this, node.parse_node(), - semantics_ir_.GetString(name_id).str())}; + add_node_name_id(node.GetAsParameter()); continue; } case NodeKind::VarStorage: { // TODO: Eventually this name will be optional, and we'll want to // provide something like `var` as a default. However, that's not // possible right now so cannot be tested. - auto name_id = node.GetAsVarStorage(); - nodes[node_id.index] = { - scope_idx, - scope.nodes.AllocateName(*this, node.parse_node(), - semantics_ir_.GetString(name_id).str())}; + add_node_name_id(node.GetAsVarStorage()); continue; } default: { @@ -382,8 +393,7 @@ class NodeNamer { // Sequentially number all remaining values. if (node.kind().value_kind() != NodeValueKind::None) { - nodes[node_id.index] = { - scope_idx, scope.nodes.AllocateName(*this, node.parse_node())}; + add_node_name(""); } } }