Skip to content

Commit c9bb6b1

Browse files
jonmeowjonmeow
authored
Use an import_ir prefix and handle special IR values (#6176)
This is to try to improve clarity of values printed when debugging, with [special values as requested](https://discord.com/channels/655572317891461132/655578254970716160/1424792667338051756).
1 parent 49213b1 commit c9bb6b1

File tree

9 files changed

+238
-218
lines changed

9 files changed

+238
-218
lines changed

‎toolchain/check/testdata/basics/raw_sem_ir/builtins.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// CHECK:STDOUT: filename: builtins.carbon
1616
// CHECK:STDOUT: sem_ir:
1717
// CHECK:STDOUT: import_irs:
18-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
19-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
18+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
19+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
2020
// CHECK:STDOUT: import_ir_insts: {}
2121
// CHECK:STDOUT: clang_decls: {}
2222
// CHECK:STDOUT: name_scopes:

‎toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ fn G(x: Cpp.X) {
3333
// CHECK:STDOUT: filename: import.carbon
3434
// CHECK:STDOUT: sem_ir:
3535
// CHECK:STDOUT: import_irs:
36-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
37-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
36+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
37+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
3838
// CHECK:STDOUT: import_ir_insts:
39-
// CHECK:STDOUT: import_ir_inst0: {ir_id: ir1, clang_source_loc_id: clang_source_loc0}
39+
// CHECK:STDOUT: import_ir_inst0: {ir_id: import_ir(Cpp), clang_source_loc_id: clang_source_loc0}
4040
// CHECK:STDOUT: clang_decls:
4141
// CHECK:STDOUT: clang_decl_id0: {key: "<translation unit>", inst_id: ir0.inst16}
4242
// CHECK:STDOUT: clang_decl_id1: {key: "struct X {}", inst_id: ir0.inst18}

‎toolchain/check/testdata/basics/raw_sem_ir/multifile.carbon‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ fn B() {
3131
// CHECK:STDOUT: filename: a.carbon
3232
// CHECK:STDOUT: sem_ir:
3333
// CHECK:STDOUT: import_irs:
34-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
35-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
34+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
35+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
3636
// CHECK:STDOUT: import_ir_insts: {}
3737
// CHECK:STDOUT: clang_decls: {}
3838
// CHECK:STDOUT: name_scopes:
@@ -88,12 +88,12 @@ fn B() {
8888
// CHECK:STDOUT: filename: b.carbon
8989
// CHECK:STDOUT: sem_ir:
9090
// CHECK:STDOUT: import_irs:
91-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
92-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
93-
// CHECK:STDOUT: ir2: {decl_id: ir1.inst15, is_export: false}
91+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
92+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
93+
// CHECK:STDOUT: import_ir2: {decl_id: ir1.inst15, is_export: false}
9494
// CHECK:STDOUT: import_ir_insts:
95-
// CHECK:STDOUT: import_ir_inst0: {ir_id: ir2, inst_id: ir0.inst15}
96-
// CHECK:STDOUT: import_ir_inst1: {ir_id: ir2, inst_id: ir0.inst15}
95+
// CHECK:STDOUT: import_ir_inst0: {ir_id: import_ir2, inst_id: ir0.inst15}
96+
// CHECK:STDOUT: import_ir_inst1: {ir_id: import_ir2, inst_id: ir0.inst15}
9797
// CHECK:STDOUT: clang_decls: {}
9898
// CHECK:STDOUT: name_scopes:
9999
// CHECK:STDOUT: name_scope0: {inst: inst14, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {name1: ir1.inst16, name0: ir1.inst17}}

‎toolchain/check/testdata/basics/raw_sem_ir/multifile_with_textual_ir.carbon‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ fn B() {
3131
// CHECK:STDOUT: filename: a.carbon
3232
// CHECK:STDOUT: sem_ir:
3333
// CHECK:STDOUT: import_irs:
34-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
35-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
34+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
35+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
3636
// CHECK:STDOUT: import_ir_insts: {}
3737
// CHECK:STDOUT: clang_decls: {}
3838
// CHECK:STDOUT: name_scopes:
@@ -107,12 +107,12 @@ fn B() {
107107
// CHECK:STDOUT: filename: b.carbon
108108
// CHECK:STDOUT: sem_ir:
109109
// CHECK:STDOUT: import_irs:
110-
// CHECK:STDOUT: ir0: {decl_id: inst<none>, is_export: false}
111-
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
112-
// CHECK:STDOUT: ir2: {decl_id: ir1.inst15, is_export: false}
110+
// CHECK:STDOUT: 'import_ir(ApiForImpl)': {decl_id: inst<none>, is_export: false}
111+
// CHECK:STDOUT: 'import_ir(Cpp)': {decl_id: inst<none>, is_export: false}
112+
// CHECK:STDOUT: import_ir2: {decl_id: ir1.inst15, is_export: false}
113113
// CHECK:STDOUT: import_ir_insts:
114-
// CHECK:STDOUT: import_ir_inst0: {ir_id: ir2, inst_id: ir0.inst15}
115-
// CHECK:STDOUT: import_ir_inst1: {ir_id: ir2, inst_id: ir0.inst15}
114+
// CHECK:STDOUT: import_ir_inst0: {ir_id: import_ir2, inst_id: ir0.inst15}
115+
// CHECK:STDOUT: import_ir_inst1: {ir_id: import_ir2, inst_id: ir0.inst15}
116116
// CHECK:STDOUT: clang_decls: {}
117117
// CHECK:STDOUT: name_scopes:
118118
// CHECK:STDOUT: name_scope0: {inst: inst14, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {name1: ir1.inst16, name0: ir1.inst17}}

0 commit comments

Comments
 (0)