Skip to content

Commit 2352e93

Browse files
zygoloidzygoloid
authored
Remove now-unused StringType instruction. (#5964)
1 parent b72c11e commit 2352e93

File tree

80 files changed

+881
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+881
-916
lines changed

‎toolchain/check/testdata/alias/export_name.carbon‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var d: D* = &c;
110110
// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded
111111
// CHECK:STDOUT: %Main.D: type = import_ref Main//base, D, loaded [concrete = constants.%C]
112112
// CHECK:STDOUT: %Main.import_ref.8f2: <witness> = import_ref Main//base, loc4_10, loaded [concrete = constants.%complete_type]
113-
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst17 [no loc], unloaded
113+
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst16 [no loc], unloaded
114114
// CHECK:STDOUT: }
115115
// CHECK:STDOUT:
116116
// CHECK:STDOUT: file {
@@ -141,7 +141,7 @@ var d: D* = &c;
141141
// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [concrete = constants.%C]
142142
// CHECK:STDOUT: %Main.D = import_ref Main//base, D, unloaded
143143
// CHECK:STDOUT: %Main.import_ref.8f2: <witness> = import_ref Main//base, loc4_10, loaded [concrete = constants.%complete_type]
144-
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst17 [no loc], unloaded
144+
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst16 [no loc], unloaded
145145
// CHECK:STDOUT: }
146146
// CHECK:STDOUT:
147147
// CHECK:STDOUT: file {
@@ -172,8 +172,8 @@ var d: D* = &c;
172172
// CHECK:STDOUT:
173173
// CHECK:STDOUT: imports {
174174
// CHECK:STDOUT: %Main.D: type = import_ref Main//export, D, loaded [concrete = constants.%C]
175-
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//export, inst23 [indirect], loaded [concrete = constants.%complete_type]
176-
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded
175+
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//export, inst22 [indirect], loaded [concrete = constants.%complete_type]
176+
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst23 [indirect], unloaded
177177
// CHECK:STDOUT: }
178178
// CHECK:STDOUT:
179179
// CHECK:STDOUT: file {
@@ -256,8 +256,8 @@ var d: D* = &c;
256256
// CHECK:STDOUT: imports {
257257
// CHECK:STDOUT: %Main.D: type = import_ref Main//export, D, loaded [concrete = constants.%C]
258258
// CHECK:STDOUT: %Main.C: type = import_ref Main//export_orig, C, loaded [concrete = constants.%C]
259-
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//export_orig, inst23 [indirect], loaded [concrete = constants.%complete_type]
260-
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_orig, inst24 [indirect], unloaded
259+
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//export_orig, inst22 [indirect], loaded [concrete = constants.%complete_type]
260+
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_orig, inst23 [indirect], unloaded
261261
// CHECK:STDOUT: }
262262
// CHECK:STDOUT:
263263
// CHECK:STDOUT: file {

‎toolchain/check/testdata/alias/import.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ var c: () = a_alias_alias;
119119
// CHECK:STDOUT: %Main.c_alias: type = import_ref Main//class1, c_alias, loaded [concrete = constants.%C]
120120
// CHECK:STDOUT: %Main.a = import_ref Main//class1, a, unloaded
121121
// CHECK:STDOUT: %Main.import_ref.8f2: <witness> = import_ref Main//class1, loc4_10, loaded [concrete = constants.%complete_type]
122-
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//class1, inst17 [no loc], unloaded
122+
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//class1, inst16 [no loc], unloaded
123123
// CHECK:STDOUT: }
124124
// CHECK:STDOUT:
125125
// CHECK:STDOUT: file {
@@ -165,8 +165,8 @@ var c: () = a_alias_alias;
165165
// CHECK:STDOUT: imports {
166166
// CHECK:STDOUT: %Main.c_alias_alias: type = import_ref Main//class2, c_alias_alias, loaded [concrete = constants.%C]
167167
// CHECK:STDOUT: %Main.b = import_ref Main//class2, b, unloaded
168-
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//class2, inst24 [indirect], loaded [concrete = constants.%complete_type]
169-
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//class2, inst25 [indirect], unloaded
168+
// CHECK:STDOUT: %Main.import_ref.8db: <witness> = import_ref Main//class2, inst23 [indirect], loaded [concrete = constants.%complete_type]
169+
// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//class2, inst24 [indirect], unloaded
170170
// CHECK:STDOUT: }
171171
// CHECK:STDOUT:
172172
// CHECK:STDOUT: file {

‎toolchain/check/testdata/alias/import_access.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var inst: Test.A = {};
9696
// CHECK:STDOUT: %Test.C = import_ref Test//def, C, unloaded
9797
// CHECK:STDOUT: %Test.A: type = import_ref Test//def, A, loaded [concrete = constants.%C]
9898
// CHECK:STDOUT: %Test.import_ref.8f2: <witness> = import_ref Test//def, loc4_10, loaded [concrete = constants.%complete_type]
99-
// CHECK:STDOUT: %Test.import_ref.2c4 = import_ref Test//def, inst17 [no loc], unloaded
99+
// CHECK:STDOUT: %Test.import_ref.2c4 = import_ref Test//def, inst16 [no loc], unloaded
100100
// CHECK:STDOUT: }
101101
// CHECK:STDOUT:
102102
// CHECK:STDOUT: file {

‎toolchain/check/testdata/alias/import_order.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var a_val: a = {.v = b_val.v};
9898
// CHECK:STDOUT: %Main.c: type = import_ref Main//a, c, loaded [concrete = constants.%C]
9999
// CHECK:STDOUT: %Main.d: type = import_ref Main//a, d, loaded [concrete = constants.%C]
100100
// CHECK:STDOUT: %Main.import_ref.146: <witness> = import_ref Main//a, loc4_22, loaded [concrete = constants.%complete_type]
101-
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst17 [no loc], unloaded
101+
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded
102102
// CHECK:STDOUT: %Main.import_ref.f99: %C.elem = import_ref Main//a, loc4_16, loaded [concrete = %.2fc]
103103
// CHECK:STDOUT: %.2fc: %C.elem = field_decl v, element0 [concrete]
104104
// CHECK:STDOUT: }

‎toolchain/check/testdata/basics/include_in_dumps.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,18 +210,18 @@ fn F(c: C) { c.(I.Op)(); }
210210
// CHECK:STDOUT: import Core//prelude/...
211211
// CHECK:STDOUT: }
212212
// CHECK:STDOUT: %Main.import_ref.8f2: <witness> = import_ref Main//included_with_range, loc16_1, loaded [concrete = constants.%complete_type]
213-
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//included_with_range, inst44 [no loc], unloaded
214-
// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//included_with_range, inst20 [no loc], unloaded
213+
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//included_with_range, inst43 [no loc], unloaded
214+
// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//included_with_range, inst19 [no loc], unloaded
215215
// CHECK:STDOUT: %Main.import_ref.9cd: %I.assoc_type = import_ref Main//included_with_range, loc8_22, loaded [concrete = constants.%assoc0]
216216
// CHECK:STDOUT: %Main.Op.ca5 = import_ref Main//included_with_range, Op, unloaded
217217
// CHECK:STDOUT: %Main.import_ref.7d9: %I.Op.type = import_ref Main//included_with_range, loc8_22, loaded [concrete = constants.%I.Op]
218-
// CHECK:STDOUT: %Main.import_ref.5dd: %I.type = import_ref Main//included_with_range, inst20 [no loc], loaded [symbolic = constants.%Self.826]
218+
// CHECK:STDOUT: %Main.import_ref.5dd: %I.type = import_ref Main//included_with_range, inst19 [no loc], loaded [symbolic = constants.%Self.826]
219219
// CHECK:STDOUT: %Main.import_ref.d7a: <witness> = import_ref Main//included_with_range, loc13_15, loaded [concrete = constants.%I.impl_witness]
220220
// CHECK:STDOUT: %Main.import_ref.29a: type = import_ref Main//included_with_range, loc13_8, loaded [concrete = constants.%C]
221221
// CHECK:STDOUT: %Main.import_ref.301: type = import_ref Main//included_with_range, loc13_13, loaded [concrete = constants.%I.type]
222222
// CHECK:STDOUT: %Main.import_ref.34c = import_ref Main//included_with_range, loc12_9, unloaded
223223
// CHECK:STDOUT: %Main.import_ref.0ed: type = import_ref Main//included_with_range, loc12_9, loaded [concrete = constants.%C]
224-
// CHECK:STDOUT: %Main.import_ref.cb9: type = import_ref Main//included_with_range, inst63 [no loc], loaded [concrete = constants.%Destroy.type]
224+
// CHECK:STDOUT: %Main.import_ref.cb9: type = import_ref Main//included_with_range, inst62 [no loc], loaded [concrete = constants.%Destroy.type]
225225
// CHECK:STDOUT: %Main.import_ref.003: %C.as.I.impl.Op.type = import_ref Main//included_with_range, loc14_25, loaded [concrete = constants.%C.as.I.impl.Op]
226226
// CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%Main.import_ref.003), @C.as.I.impl [concrete]
227227
// CHECK:STDOUT: }

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// CHECK:STDOUT: ir1: {decl_id: inst<none>, is_export: false}
2020
// CHECK:STDOUT: import_ir_insts: {}
2121
// CHECK:STDOUT: name_scopes:
22-
// CHECK:STDOUT: name_scope0: {inst: inst15, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {}}
22+
// CHECK:STDOUT: name_scope0: {inst: inst14, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {}}
2323
// CHECK:STDOUT: entity_names: {}
2424
// CHECK:STDOUT: functions: {}
2525
// CHECK:STDOUT: classes: {}
@@ -47,10 +47,9 @@
4747
// CHECK:STDOUT: 'inst(IntLiteralType)': {kind: IntLiteralType, type: type(TypeType)}
4848
// CHECK:STDOUT: 'inst(NamespaceType)': {kind: NamespaceType, type: type(TypeType)}
4949
// CHECK:STDOUT: 'inst(SpecificFunctionType)': {kind: SpecificFunctionType, type: type(TypeType)}
50-
// CHECK:STDOUT: 'inst(StringType)': {kind: StringType, type: type(TypeType)}
5150
// CHECK:STDOUT: 'inst(VtableType)': {kind: VtableType, type: type(TypeType)}
5251
// CHECK:STDOUT: 'inst(WitnessType)': {kind: WitnessType, type: type(TypeType)}
53-
// CHECK:STDOUT: inst15: {kind: Namespace, arg0: name_scope0, arg1: inst<none>, type: type(inst(NamespaceType))}
52+
// CHECK:STDOUT: inst14: {kind: Namespace, arg0: name_scope0, arg1: inst<none>, type: type(inst(NamespaceType))}
5453
// CHECK:STDOUT: constant_values:
5554
// CHECK:STDOUT: values:
5655
// CHECK:STDOUT: 'inst(TypeType)': concrete_constant(inst(TypeType))
@@ -65,16 +64,15 @@
6564
// CHECK:STDOUT: 'inst(IntLiteralType)': concrete_constant(inst(IntLiteralType))
6665
// CHECK:STDOUT: 'inst(NamespaceType)': concrete_constant(inst(NamespaceType))
6766
// CHECK:STDOUT: 'inst(SpecificFunctionType)': concrete_constant(inst(SpecificFunctionType))
68-
// CHECK:STDOUT: 'inst(StringType)': concrete_constant(inst(StringType))
6967
// CHECK:STDOUT: 'inst(VtableType)': concrete_constant(inst(VtableType))
7068
// CHECK:STDOUT: 'inst(WitnessType)': concrete_constant(inst(WitnessType))
71-
// CHECK:STDOUT: inst15: concrete_constant(inst15)
69+
// CHECK:STDOUT: inst14: concrete_constant(inst14)
7270
// CHECK:STDOUT: symbolic_constants: {}
7371
// CHECK:STDOUT: inst_blocks:
7472
// CHECK:STDOUT: inst_block_empty: {}
7573
// CHECK:STDOUT: exports: {}
7674
// CHECK:STDOUT: imports: {}
7775
// CHECK:STDOUT: global_init: {}
7876
// CHECK:STDOUT: inst_block4:
79-
// CHECK:STDOUT: 0: inst15
77+
// CHECK:STDOUT: 0: inst14
8078
// CHECK:STDOUT: ...

0 commit comments

Comments
 (0)