Add a distinct semir file separator. (#3438)

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
+4 -1
View File
@@ -9,11 +9,13 @@ fn F() -> i32 {
return *&*&n;
}
// CHECK:STDOUT: --- address_of_deref.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc9: type = ptr_type i32
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "address_of_deref.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -31,3 +33,4 @@ fn F() -> i32 {
// CHECK:STDOUT: %.loc9_10.2: i32 = bind_value %.loc9_10.1
// CHECK:STDOUT: return %.loc9_10.2
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -16,6 +16,8 @@ fn F() {
var t1: i32* = &t[1];
}
// CHECK:STDOUT: --- address_of_lvalue.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc8: type = ptr_type {.a: i32, .b: i32}
// CHECK:STDOUT: %.loc14_19.1: type = tuple_type (type, type)
@@ -23,7 +25,7 @@ fn F() {
// CHECK:STDOUT: %.loc14_19.3: type = ptr_type (i32, i32)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "address_of_lvalue.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -95,3 +97,4 @@ fn F() {
// CHECK:STDOUT: assign %t1.var, %.loc16_18
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -11,7 +11,9 @@ fn F() -> i32 {
return *p;
}
// CHECK:STDOUT: file "basic.carbon" {
// CHECK:STDOUT: --- basic.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -33,3 +35,4 @@ fn F() -> i32 {
// CHECK:STDOUT: %.loc11_10.2: i32 = bind_value %.loc11_10.1
// CHECK:STDOUT: return %.loc11_10.2
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -18,12 +18,14 @@ fn Test() {
&(&undeclared);
}
// CHECK:STDOUT: --- fail_address_of_error.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc11: type = ptr_type <error>
// CHECK:STDOUT: %.loc18: type = ptr_type <error>*
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_address_of_error.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Test: <function> = fn_decl @Test
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -36,3 +38,4 @@ fn Test() {
// CHECK:STDOUT: %.loc18_3: <error>** = address_of %.loc18_5
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -82,6 +82,8 @@ fn AddressOfParam(param: i32) {
var param_addr: i32* = &param;
}
// CHECK:STDOUT: --- fail_address_of_value.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc15: type = ptr_type i32
// CHECK:STDOUT: %.loc19: type = ptr_type bool
@@ -93,7 +95,7 @@ fn AddressOfParam(param: i32) {
// CHECK:STDOUT: %.loc64: type = ptr_type type
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_address_of_value.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: %H: <function> = fn_decl @H
// CHECK:STDOUT: %AddressOfLiteral: <function> = fn_decl @AddressOfLiteral
@@ -186,3 +188,4 @@ fn AddressOfParam(param: i32) {
// CHECK:STDOUT: assign %param_addr.var, %.loc82_26
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -9,8 +9,11 @@
// CHECK:STDERR: ^~~~~~~~~~
let n: i32 = *undeclared;
// CHECK:STDOUT: file "fail_deref_error.carbon" {
// CHECK:STDOUT: --- fail_deref_error.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %undeclared.ref: <error> = name_ref undeclared, <error>
// CHECK:STDOUT: %.loc10: ref <error> = deref <error>
// CHECK:STDOUT: %n: i32 = bind_name n, <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -11,7 +11,9 @@ fn A() {
*A;
}
// CHECK:STDOUT: file "fail_deref_function.carbon" {
// CHECK:STDOUT: --- fail_deref_function.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %A: <function> = fn_decl @A
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -21,3 +23,4 @@ fn A() {
// CHECK:STDOUT: %.loc11: ref <error> = deref <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -13,7 +13,9 @@ fn F() {
*A;
}
// CHECK:STDOUT: file "fail_deref_namespace.carbon" {
// CHECK:STDOUT: --- fail_deref_namespace.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc7: <namespace> = namespace {}
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
@@ -24,3 +26,4 @@ fn F() {
// CHECK:STDOUT: %.loc13: ref <error> = deref <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -19,12 +19,14 @@ fn Deref(n: i32) {
*{};
}
// CHECK:STDOUT: --- fail_deref_not_pointer.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc15: type = tuple_type ()
// CHECK:STDOUT: %.loc19: type = struct_type {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_deref_not_pointer.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Deref: <function> = fn_decl @Deref
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -42,3 +44,4 @@ fn Deref(n: i32) {
// CHECK:STDOUT: %.loc19_3: ref <error> = deref %.loc19_5.3
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -12,8 +12,11 @@
// CHECK:STDERR: ^
var p: *i32;
// CHECK:STDOUT: file "fail_deref_type.carbon" {
// CHECK:STDOUT: --- fail_deref_type.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %.loc13: ref <error> = deref i32
// CHECK:STDOUT: %p.var: ref <error> = var p
// CHECK:STDOUT: %p: ref <error> = bind_name p, %p.var
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -11,11 +11,13 @@ fn ConstMismatch(p: const {}*) -> const ({}*) {
return p;
}
// CHECK:STDOUT: --- fail_type_mismatch.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc7: type = struct_type {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file "fail_type_mismatch.carbon" {
// CHECK:STDOUT: file {
// CHECK:STDOUT: %ConstMismatch: <function> = fn_decl @ConstMismatch
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -24,3 +26,4 @@ fn ConstMismatch(p: const {}*) -> const ({}*) {
// CHECK:STDOUT: %p.ref: const {}* = name_ref p, %p
// CHECK:STDOUT: return <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -9,7 +9,9 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
return **p;
}
// CHECK:STDOUT: file "nested_const.carbon" {
// CHECK:STDOUT: --- nested_const.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -22,3 +24,4 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: %.loc9_10.2: const i32 = bind_value %.loc9_10.1
// CHECK:STDOUT: return %.loc9_10.2
// CHECK:STDOUT: }
// CHECK:STDOUT:
+4 -1
View File
@@ -12,7 +12,9 @@ fn ConstPtr(p: const i32*) -> (const i32)* {
return p;
}
// CHECK:STDOUT: file "types.carbon" {
// CHECK:STDOUT: --- types.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Ptr: <function> = fn_decl @Ptr
// CHECK:STDOUT: %ConstPtr: <function> = fn_decl @ConstPtr
// CHECK:STDOUT: }
@@ -28,3 +30,4 @@ fn ConstPtr(p: const i32*) -> (const i32)* {
// CHECK:STDOUT: %p.ref: const i32* = name_ref p, %p
// CHECK:STDOUT: return %p.ref
// CHECK:STDOUT: }
// CHECK:STDOUT: