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

Format the call parameters of a function, not the patterns. (#5342)

Browse Source 
This makes the parameters printed in a SemIR `fn` declaration match the
arguments printed in a SemIR `call` instruction.
This commit is contained in:
Richard Smith
2025-04-22 18:52:21 +00:00
committed by GitHub
parent f5b5731c76
commit ca8df34d0d
355 changed files with 1489 additions and 1490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/function/declaration/fail_param_in_type.carbon
Vendored
+1 -1
View File
@@ -60,5 +60,5 @@ fn F(n: i32, a: array(i32, n)*);
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%n.param_patt: %i32, %a.param_patt: <error>);
// CHECK:STDOUT: fn @F(%n.param: %i32, %a.param: <error>);
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/fail_param_redecl.carbon
Vendored
+1 -1
View File
@@ -61,5 +61,5 @@ fn F(n: i32, n: i32);
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%n.param_patt.loc18_7: %i32, %n.param_patt.loc18_15: %i32);
// CHECK:STDOUT: fn @F(%n.param.loc18_7: %i32, %n.param.loc18_15: %i32);
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/import.carbon
Vendored
+29 -29
View File
@@ -341,9 +341,9 @@ import library "extern_api";
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A();
// CHECK:STDOUT:
// CHECK:STDOUT: fn @B(%b.param_patt: %i32) -> %i32;
// CHECK:STDOUT: fn @B(%b.param: %i32) -> %i32;
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c;
// CHECK:STDOUT: fn @C(%c.param: %tuple.type.a1c) -> %struct_type.c;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D();
// CHECK:STDOUT:
@@ -434,9 +434,9 @@ import library "extern_api";
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @A();
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @B(%b.param_patt: %i32) -> %i32;
// CHECK:STDOUT: extern fn @B(%b.param: %i32) -> %i32;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c;
// CHECK:STDOUT: extern fn @C(%c.param: %tuple.type.a1c) -> %struct_type.c;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D();
// CHECK:STDOUT:
@@ -564,15 +564,15 @@ import library "extern_api";
// CHECK:STDOUT: %e: ref %empty_tuple.type = bind_name e, %e.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A() [from "api.carbon"];
// CHECK:STDOUT: fn @A [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @B(%b.param_patt: %i32) -> %i32 [from "api.carbon"];
// CHECK:STDOUT: fn @B [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c [from "api.carbon"];
// CHECK:STDOUT: fn @C [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D() [from "api.carbon"];
// CHECK:STDOUT: extern fn @D [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @E() [from "api.carbon"];
// CHECK:STDOUT: fn @E [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
@@ -762,15 +762,15 @@ import library "extern_api";
// CHECK:STDOUT: %e: ref %empty_tuple.type = bind_name e, %e.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A() [from "api.carbon"];
// CHECK:STDOUT: fn @A [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @B(%b.param_patt: %i32) -> %i32 [from "api.carbon"];
// CHECK:STDOUT: fn @B [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c [from "api.carbon"];
// CHECK:STDOUT: fn @C [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D() [from "api.carbon"];
// CHECK:STDOUT: extern fn @D [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @E() [from "api.carbon"];
// CHECK:STDOUT: fn @E [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
@@ -960,15 +960,15 @@ import library "extern_api";
// CHECK:STDOUT: %e: ref %empty_tuple.type = bind_name e, %e.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @A();
// CHECK:STDOUT: extern fn @A;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @B(%b.param_patt: %i32) -> %i32;
// CHECK:STDOUT: extern fn @B;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @C(%c.param_patt: %tuple.type.dd4) -> %struct_type.c;
// CHECK:STDOUT: extern fn @C;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D();
// CHECK:STDOUT: extern fn @D;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @E();
// CHECK:STDOUT: extern fn @E;
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
@@ -1132,15 +1132,15 @@ import library "extern_api";
// CHECK:STDOUT: %e: ref %empty_tuple.type = bind_name e, %e.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A() [from "api.carbon"];
// CHECK:STDOUT: fn @A [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @B(%b.param_patt: %i32) -> %i32 [from "api.carbon"];
// CHECK:STDOUT: fn @B [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c [from "api.carbon"];
// CHECK:STDOUT: fn @C [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D() [from "api.carbon"];
// CHECK:STDOUT: extern fn @D [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @E() [from "api.carbon"];
// CHECK:STDOUT: fn @E [from "api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
@@ -1304,15 +1304,15 @@ import library "extern_api";
// CHECK:STDOUT: %e: ref %empty_tuple.type = bind_name e, %e.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @A();
// CHECK:STDOUT: extern fn @A;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @B(%b.param_patt: %i32) -> %i32;
// CHECK:STDOUT: extern fn @B;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @C(%c.param_patt: %tuple.type.a1c) -> %struct_type.c;
// CHECK:STDOUT: extern fn @C;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @D();
// CHECK:STDOUT: extern fn @D;
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @E();
// CHECK:STDOUT: extern fn @E;
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
toolchain/check/testdata/function/declaration/no_prelude/export_name.carbon
Vendored
+2 -2
View File
@@ -73,7 +73,7 @@ var f: () = F();
// CHECK:STDOUT: %F: %F.type = export F, imports.%Main.F [concrete = constants.%F]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() [from "base.carbon"];
// CHECK:STDOUT: fn @F [from "base.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: --- use_export.carbon
// CHECK:STDOUT:
@@ -105,7 +105,7 @@ var f: () = F();
// CHECK:STDOUT: %f: ref %empty_tuple.type = bind_name f, %f.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() [from "export.carbon"];
// CHECK:STDOUT: fn @F [from "export.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
toolchain/check/testdata/function/declaration/no_prelude/extern.carbon
Vendored
+3 -3
View File
@@ -127,7 +127,7 @@ extern library "basic" fn F();
// CHECK:STDOUT: %x: ref %empty_tuple.type = bind_name x, %x.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F() [from "basic.carbon"];
// CHECK:STDOUT: extern fn @F [from "basic.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
// CHECK:STDOUT: !entry:
@@ -212,7 +212,7 @@ extern library "basic" fn F();
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F();
// CHECK:STDOUT:
// CHECK:STDOUT: fn @G[%self.param_patt: %C]();
// CHECK:STDOUT: fn @G(%self.param: %C);
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_extern_library_in_importer.carbon
// CHECK:STDOUT:
@@ -232,5 +232,5 @@ extern library "basic" fn F();
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F() [from "basic.carbon"];
// CHECK:STDOUT: extern fn @F [from "basic.carbon"];
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/extern_library.carbon
Vendored
+5 -5
View File
@@ -190,7 +190,7 @@ extern library "extern_library_owner" fn F() {}
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_extern_library_nonowner.carbon
// CHECK:STDOUT:
@@ -210,7 +210,7 @@ extern library "extern_library_owner" fn F() {}
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_extern_library_nonextern.carbon
// CHECK:STDOUT:
@@ -230,7 +230,7 @@ extern library "extern_library_owner" fn F() {}
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_extern_library_redecl.carbon
// CHECK:STDOUT:
@@ -250,7 +250,7 @@ extern library "extern_library_owner" fn F() {}
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- extern_library_copy.carbon
// CHECK:STDOUT:
@@ -351,7 +351,7 @@ extern library "extern_library_owner" fn F() {}
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() [from "extern_of_import.carbon"];
// CHECK:STDOUT: fn @F [from "extern_of_import.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_extern_library_on_definition.carbon
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/extern_library_for_default.carbon
Vendored
+2 -2
View File
@@ -72,7 +72,7 @@ extern fn F();
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_wrong_library.carbon
// CHECK:STDOUT:
@@ -92,5 +92,5 @@ extern fn F();
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/extern_library_from_default.carbon
Vendored
+2 -2
View File
@@ -70,7 +70,7 @@ extern fn F();
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_wrong_library.carbon
// CHECK:STDOUT:
@@ -90,5 +90,5 @@ extern fn F();
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @F();
// CHECK:STDOUT: extern fn @F;
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/fail_import_incomplete_return.carbon
Vendored
+4 -5
View File
@@ -186,7 +186,6 @@ fn CallFAndGIncomplete() {
// CHECK:STDOUT: %CallFAndGIncomplete: %CallFAndGIncomplete.type = struct_value () [concrete]
// CHECK:STDOUT: %ReturnCUnused.type: type = fn_type @ReturnCUnused [concrete]
// CHECK:STDOUT: %ReturnCUnused: %ReturnCUnused.type = struct_value () [concrete]
// CHECK:STDOUT: %C: type = class_type @C [concrete]
// CHECK:STDOUT: %ReturnCUsed.type: type = fn_type @ReturnCUsed [concrete]
// CHECK:STDOUT: %ReturnCUsed: %ReturnCUsed.type = struct_value () [concrete]
// CHECK:STDOUT: %ReturnDUnused.type: type = fn_type @ReturnDUnused [concrete]
@@ -251,11 +250,11 @@ fn CallFAndGIncomplete() {
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @ReturnCUnused() -> %C [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT: fn @ReturnCUnused [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @ReturnCUsed() -> %C [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT: fn @ReturnCUsed [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @ReturnDUnused() -> %D [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT: fn @ReturnDUnused [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: fn @ReturnDUsed() -> %D [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT: fn @ReturnDUsed [from "fail_incomplete_return.carbon"];
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/fail_pattern_in_signature.carbon
Vendored
+1 -1
View File
@@ -45,5 +45,5 @@ fn F((a: {}, b: {}), c: {});
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%.loc15_19: %tuple.type, %c.param_patt: %empty_struct_type);
// CHECK:STDOUT: fn @F(%c.param: %empty_struct_type);
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/fail_redecl.carbon
Vendored
+2 -2
View File
@@ -130,11 +130,11 @@ fn E() {}
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A();
// CHECK:STDOUT:
// CHECK:STDOUT: fn @B(%x.param_patt: %empty_tuple.type);
// CHECK:STDOUT: fn @B(%x.param.loc21: %empty_tuple.type);
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C.1();
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C.2(%x.param_patt: %empty_tuple.type);
// CHECK:STDOUT: fn @C.2(%x.param: %empty_tuple.type);
// CHECK:STDOUT:
// CHECK:STDOUT: fn @D() {
// CHECK:STDOUT: !entry:
toolchain/check/testdata/function/declaration/no_prelude/fail_todo_no_params.carbon
Vendored
+3 -3
View File
@@ -91,7 +91,7 @@ fn A {
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A();
// CHECK:STDOUT: fn @A;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_todo_brace_body.carbon
// CHECK:STDOUT:
@@ -107,7 +107,7 @@ fn A {
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A() {
// CHECK:STDOUT: fn @A {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
@@ -160,7 +160,7 @@ fn A {
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A[]() -> %empty_tuple.type;
// CHECK:STDOUT: fn @A() -> %empty_tuple.type;
// CHECK:STDOUT:
// CHECK:STDOUT: --- fail_todo_arrow_body.carbon
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/implicit_import.carbon
Vendored
+2 -2
View File
@@ -139,7 +139,7 @@ extern fn A();
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: extern fn @A() [from "extern_api.carbon"];
// CHECK:STDOUT: extern fn @A [from "extern_api.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: --- extern_impl.carbon
// CHECK:STDOUT:
@@ -176,5 +176,5 @@ extern fn A();
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @A() [from "extern_impl.carbon"];
// CHECK:STDOUT: fn @A [from "extern_impl.carbon"];
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/no_prelude/no_definition_in_impl_file.carbon
Vendored
+1 -1
View File
@@ -198,7 +198,7 @@ fn D();
// CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [concrete = constants.%C] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @C() [from "decl_in_api_decl_in_impl.carbon"];
// CHECK:STDOUT: fn @C [from "decl_in_api_decl_in_impl.carbon"];
// CHECK:STDOUT:
// CHECK:STDOUT: --- decl_only_in_impl.carbon
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/param_same_name.carbon
Vendored
+2 -2
View File
@@ -62,7 +62,7 @@ fn G(a: i32);
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%a.param_patt: %i32);
// CHECK:STDOUT: fn @F(%a.param: %i32);
// CHECK:STDOUT:
// CHECK:STDOUT: fn @G(%a.param_patt: %i32);
// CHECK:STDOUT: fn @G(%a.param: %i32);
// CHECK:STDOUT: