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

Add a distinct semir file separator. (#3438)

Browse Source 
This removes the filename from the file-scoped block, and places it
above to make it clear where the full SemIR begins (with multifile,
providing a barrier between).
This commit is contained in:
Jon Ross-Perkins
2023-12-01 00:53:45 +00:00
committed by GitHub
parent 1603edc359
commit aa5bfa564f
250 changed files with 1231 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/function/call/empty_struct.carbon
Vendored
+4 -1
View File
@@ -12,12 +12,14 @@ fn Main() {
Echo({});
}
// CHECK:STDOUT: --- empty_struct.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_13.1: type = struct_type {}
// CHECK:STDOUT: %.loc7_13.2: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "empty_struct.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Echo: <function> = fn_decl @Echo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn Main() {
// CHECK:STDOUT: %.loc12_7: init {} = call %Echo.ref(%.loc12_9.3)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/empty_tuple.carbon
Vendored
+4 -1
View File
@@ -12,11 +12,13 @@ fn Main() {
Echo(());
}
// CHECK:STDOUT: --- empty_tuple.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "empty_tuple.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Echo: <function> = fn_decl @Echo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -36,3 +38,4 @@ fn Main() {
// CHECK:STDOUT: %.loc12_7: init () = call %Echo.ref(%.loc12_9.3)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/fail_not_callable.carbon
Vendored
+4 -1
View File
@@ -11,11 +11,13 @@ fn Run() {
var x: i32 = "hello"();
}
// CHECK:STDOUT: --- fail_not_callable.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.1: type = ptr_type String
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_not_callable.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Run: <function> = fn_decl @Run
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -27,3 +29,4 @@ fn Run() {
// CHECK:STDOUT: assign %x.var, <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/fail_param_count.carbon
Vendored
+4 -1
View File
@@ -55,11 +55,13 @@ fn Main() {
Run2(0);
}
// CHECK:STDOUT: --- fail_param_count.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc18: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_param_count.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Run0: <function> = fn_decl @Run0
// CHECK:STDOUT: %Run1: <function> = fn_decl @Run1
// CHECK:STDOUT: %Run2: <function> = fn_decl @Run2
@@ -103,3 +105,4 @@ fn Main() {
// CHECK:STDOUT: %.loc55_7: init () = call %Run2.ref.loc55(<invalid>)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/fail_param_type.carbon
Vendored
+4 -1
View File
@@ -16,11 +16,13 @@ fn F() {
G(1.0);
}
// CHECK:STDOUT: --- fail_param_type.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc16: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_param_type.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn F() {
// CHECK:STDOUT: %.loc16_4: init () = call %G.ref(<invalid>)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon
Vendored
+4 -1
View File
@@ -13,7 +13,9 @@ fn Run() {
var x: i32 = Foo();
}
// CHECK:STDOUT: file "fail_return_type_mismatch.carbon" {
// CHECK:STDOUT: --- fail_return_type_mismatch.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Run: <function> = fn_decl @Run
// CHECK:STDOUT: }
@@ -33,3 +35,4 @@ fn Run() {
// CHECK:STDOUT: assign %x.var, <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/i32.carbon
Vendored
+4 -1
View File
@@ -12,7 +12,9 @@ fn Main() {
var b: i32 = Echo(1);
}
// CHECK:STDOUT: file "i32.carbon" {
// CHECK:STDOUT: --- i32.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Echo: <function> = fn_decl @Echo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -33,3 +35,4 @@ fn Main() {
// CHECK:STDOUT: assign %b.var, %.loc12_20
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/more_param_ir.carbon
Vendored
+4 -1
View File
@@ -11,11 +11,13 @@ fn Main() {
Foo(1 + 2 + 3, 4 + 5, 6);
}
// CHECK:STDOUT: --- more_param_ir.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc11: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "more_param_ir.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -40,3 +42,4 @@ fn Main() {
// CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref(%.loc11_13, %.loc11_20, %.loc11_25)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/params_one.carbon
Vendored
+4 -1
View File
@@ -10,11 +10,13 @@ fn Main() {
Foo(1);
}
// CHECK:STDOUT: --- params_one.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "params_one.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -31,3 +33,4 @@ fn Main() {
// CHECK:STDOUT: %.loc10_6: init () = call %Foo.ref(%.loc10_7)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/params_one_comma.carbon
Vendored
+4 -1
View File
@@ -11,11 +11,13 @@ fn Main() {
Foo(1,);
}
// CHECK:STDOUT: --- params_one_comma.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "params_one_comma.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -35,3 +37,4 @@ fn Main() {
// CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/params_two.carbon
Vendored
+4 -1
View File
@@ -10,11 +10,13 @@ fn Main() {
Foo(1, 2);
}
// CHECK:STDOUT: --- params_two.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "params_two.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -32,3 +34,4 @@ fn Main() {
// CHECK:STDOUT: %.loc10_6: init () = call %Foo.ref(%.loc10_7, %.loc10_10)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/params_two_comma.carbon
Vendored
+4 -1
View File
@@ -11,11 +11,13 @@ fn Main() {
Foo(1, 2,);
}
// CHECK:STDOUT: --- params_two_comma.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "params_two_comma.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn Main() {
// CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7, %.loc11_10)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/params_zero.carbon
Vendored
+4 -1
View File
@@ -10,11 +10,13 @@ fn Main() {
Foo();
}
// CHECK:STDOUT: --- params_zero.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "params_zero.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -30,3 +32,4 @@ fn Main() {
// CHECK:STDOUT: %.loc10: init () = call %Foo.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/call/return_implicit.carbon
Vendored
+4 -1
View File
@@ -11,11 +11,13 @@ fn Main() {
var b: () = MakeImplicitEmptyTuple();
}
// CHECK:STDOUT: --- return_implicit.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc11: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "return_implicit.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %MakeImplicitEmptyTuple: <function> = fn_decl @MakeImplicitEmptyTuple
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
@@ -36,3 +38,4 @@ fn Main() {
// CHECK:STDOUT: assign %b.var, %.loc11_37
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/declaration/simple.carbon
Vendored
+4 -1
View File
@@ -8,11 +8,13 @@ fn F();
fn G() { F(); }
// CHECK:STDOUT: --- simple.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc9: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "simple.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: }
@@ -25,3 +27,4 @@ fn G() { F(); }
// CHECK:STDOUT: %.loc9: init () = call %F.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon
Vendored
+4 -1
View File
@@ -12,7 +12,9 @@
// CHECK:STDERR: ^
fn Bar(a: i32, a: i32) {}
// CHECK:STDOUT: file "fail_param_name_conflict.carbon" {
// CHECK:STDOUT: --- fail_param_name_conflict.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Bar: <function> = fn_decl @Bar
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -20,3 +22,4 @@ fn Bar(a: i32, a: i32) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/order.carbon
Vendored
+4 -1
View File
@@ -8,7 +8,9 @@ fn Foo() {}
fn Bar() {}
fn Baz() {}
// CHECK:STDOUT: file "order.carbon" {
// CHECK:STDOUT: --- order.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Bar: <function> = fn_decl @Bar
// CHECK:STDOUT: %Baz: <function> = fn_decl @Baz
@@ -28,3 +30,4 @@ fn Baz() {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/params_one.carbon
Vendored
+4 -1
View File
@@ -6,7 +6,9 @@
fn Foo(a: i32) {}
// CHECK:STDOUT: file "params_one.carbon" {
// CHECK:STDOUT: --- params_one.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/params_one_comma.carbon
Vendored
+4 -1
View File
@@ -6,7 +6,9 @@
fn Foo(a: i32,) {}
// CHECK:STDOUT: file "params_one_comma.carbon" {
// CHECK:STDOUT: --- params_one_comma.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32,) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/params_two.carbon
Vendored
+4 -1
View File
@@ -6,7 +6,9 @@
fn Foo(a: i32, b: i32) {}
// CHECK:STDOUT: file "params_two.carbon" {
// CHECK:STDOUT: --- params_two.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/params_two_comma.carbon
Vendored
+4 -1
View File
@@ -6,7 +6,9 @@
fn Foo(a: i32, b: i32,) {}
// CHECK:STDOUT: file "params_two_comma.carbon" {
// CHECK:STDOUT: --- params_two_comma.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32,) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/params_zero.carbon
Vendored
+4 -1
View File
@@ -6,7 +6,9 @@
fn Foo() {}
// CHECK:STDOUT: file "params_zero.carbon" {
// CHECK:STDOUT: --- params_zero.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo() {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/function/definition/same_param_name.carbon
Vendored
+4 -1
View File
@@ -7,7 +7,9 @@
fn Foo(a: i32) {}
fn Bar(a: i32) {}
// CHECK:STDOUT: file "same_param_name.carbon" {
// CHECK:STDOUT: --- same_param_name.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT: %Bar: <function> = fn_decl @Bar
// CHECK:STDOUT: }
@@ -21,3 +23,4 @@ fn Bar(a: i32) {}
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT: