carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:24:46 +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/array/array_in_place.carbon
Vendored
+4 -1
View File
@@ -10,6 +10,8 @@ fn G() {
var v: [(i32, i32, i32); 2] = (F(), F());
}
// CHECK:STDOUT: --- array_in_place.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_25.1: type = tuple_type (type, type, type)
// CHECK:STDOUT: %.loc7_25.2: type = tuple_type (i32, i32, i32)
@@ -18,7 +20,7 @@ fn G() {
// CHECK:STDOUT: %.loc10_42: type = tuple_type ((i32, i32, i32), (i32, i32, i32))
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "array_in_place.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: }
@@ -51,3 +53,4 @@ fn G() {
// CHECK:STDOUT: assign %v.var, %.loc10_42.9
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/assign_return_value.carbon
Vendored
+4 -1
View File
@@ -10,13 +10,15 @@ fn Run() {
var t: [i32; 1] = F();
}
// CHECK:STDOUT: --- assign_return_value.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_16.1: type = tuple_type (type)
// CHECK:STDOUT: %.loc7_16.2: type = tuple_type (i32)
// CHECK:STDOUT: %.loc10: type = ptr_type [i32; 1]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "assign_return_value.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %Run: <function> = fn_decl @Run
// CHECK:STDOUT: }
@@ -50,3 +52,4 @@ fn Run() {
// CHECK:STDOUT: assign %t.var, %.loc10_22.10
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/assign_var.carbon
Vendored
+4 -1
View File
@@ -7,6 +7,8 @@
var a: (i32, i32, i32) = (1, 2, 3);
var b: [i32; 3] = a;
// CHECK:STDOUT: --- assign_var.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (type, type, type)
// CHECK:STDOUT: %.loc7_22.2: type = tuple_type (i32, i32, i32)
@@ -14,7 +16,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc8: type = ptr_type [i32; 3]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "assign_var.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32)
// CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.loc7_22.2
// CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a
@@ -56,3 +58,4 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc8_19.17: init [i32; 3] = converted %a.ref, %.loc8_19.16
// CHECK:STDOUT: assign %b.var, %.loc8_19.17
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/base.carbon
Vendored
+4 -1
View File
@@ -8,6 +8,8 @@ var a: [i32; 1] = (1,);
var b: [f64; 2] = (11.1, 2.2,);
var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: --- base.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 1]
// CHECK:STDOUT: %.loc7_22: type = tuple_type (i32)
@@ -18,7 +20,7 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc9_38: type = tuple_type ((), (), (), (), ())
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "base.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
@@ -83,3 +85,4 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc9_38.13: init [(); 5] = converted %.loc9_38.1, %.loc9_38.12
// CHECK:STDOUT: assign %c.var, %.loc9_38.13
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_bound_overflow.carbon
Vendored
+4 -1
View File
@@ -9,9 +9,12 @@
// CHECK:STDERR: ^
var a: [1; 39999999999999999993];
// CHECK:STDOUT: file "fail_bound_overflow.carbon" {
// CHECK:STDOUT: --- fail_bound_overflow.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 39999999999999999993
// CHECK:STDOUT: %a.var: ref <error> = var a
// CHECK:STDOUT: %a: ref <error> = bind_name a, %a.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_incomplete_element.carbon
Vendored
+4 -1
View File
@@ -19,11 +19,13 @@ var a: [Incomplete; 1];
// CHECK:STDERR: ^
var p: Incomplete* = &a[0];
// CHECK:STDOUT: --- fail_incomplete_element.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc20: type = ptr_type <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_incomplete_element.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: class_decl @Incomplete, ()
// CHECK:STDOUT: %Incomplete: type = class_type @Incomplete
// CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete
@@ -42,3 +44,4 @@ var p: Incomplete* = &a[0];
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @Incomplete;
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_invalid_type.carbon
Vendored
+4 -1
View File
@@ -9,14 +9,17 @@
// CHECK:STDERR: ^
var a: [1; 1];
// CHECK:STDOUT: --- fail_invalid_type.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10: type = ptr_type [<error>; 1]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_invalid_type.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, <error>
// CHECK:STDOUT: %a.var: ref [<error>; 1] = var a
// CHECK:STDOUT: %a: ref [<error>; 1] = bind_name a, %a.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_out_of_bound.carbon
Vendored
+4 -1
View File
@@ -9,12 +9,14 @@
// CHECK:STDERR: ^
var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: --- fail_out_of_bound.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10_15: type = ptr_type [i32; 1]
// CHECK:STDOUT: %.loc10_27: type = tuple_type (i32, i32, i32)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_out_of_bound.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
@@ -25,3 +27,4 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: %.loc10_27: (i32, i32, i32) = tuple_literal (%.loc10_20, %.loc10_23, %.loc10_26)
// CHECK:STDOUT: assign %a.var, <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_type_mismatch.carbon
Vendored
+4 -1
View File
@@ -26,6 +26,8 @@ var t2: (i32, i32);
// CHECK:STDERR: ^~
var d: [i32; 3] = t2;
// CHECK:STDOUT: --- fail_type_mismatch.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc10_15: type = ptr_type [i32; 3]
// CHECK:STDOUT: %.1: type = ptr_type String
@@ -38,7 +40,7 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %.loc21_24.2: type = ptr_type (i32, i32)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_type_mismatch.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 3] = var a
@@ -86,3 +88,4 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %t2.ref: ref (i32, i32) = name_ref t2, %t2
// CHECK:STDOUT: assign %d.var, <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/fail_undefined_bound.carbon
Vendored
+4 -1
View File
@@ -9,5 +9,8 @@
// CHECK:STDERR: ^
var a: [i32; ];
// CHECK:STDOUT: file "fail_undefined_bound.carbon" {
// CHECK:STDOUT: --- fail_undefined_bound.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/function_param.carbon
Vendored
+4 -1
View File
@@ -12,12 +12,14 @@ fn G() -> i32 {
return F((1, 2, 3), 1);
}
// CHECK:STDOUT: --- function_param.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7: type = ptr_type [i32; 3]
// CHECK:STDOUT: %.loc12: type = tuple_type (i32, i32, i32)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "function_param.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: }
@@ -59,3 +61,4 @@ fn G() -> i32 {
// CHECK:STDOUT: %.loc12_25.2: i32 = converted %.loc12_11, %.loc12_25.1
// CHECK:STDOUT: return %.loc12_25.2
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/nine_elements.carbon
Vendored
+4 -1
View File
@@ -6,12 +6,14 @@
var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: --- nine_elements.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 9]
// CHECK:STDOUT: %.loc7_45: type = tuple_type (i32, i32, i32, i32, i32, i32, i32, i32, i32)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "nine_elements.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 9
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 9] = var a
@@ -57,3 +59,4 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: %.loc7_45.30: init [i32; 9] = converted %.loc7_45.1, %.loc7_45.29
// CHECK:STDOUT: assign %a.var, %.loc7_45.30
// CHECK:STDOUT: }
// CHECK:STDOUT: