@@ -45,13 +45,12 @@ impl C as J {}
4545library "[[@TEST_NAME]]" ;
4646
4747interface J ;
48- interface K { let X:! type ; }
4948class C {}
5049
5150// CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE+7]]:19: error: member access into object of incomplete type `J` [IncompleteTypeInMemberAccess]
5251// CHECK:STDERR: impl C as J where .X = ();
5352// CHECK:STDERR: ^~
54- // CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE-7 ]]:1: note: interface was forward declared here [InterfaceForwardDeclaredHere]
53+ // CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE-6 ]]:1: note: interface was forward declared here [InterfaceForwardDeclaredHere]
5554// CHECK:STDERR: interface J;
5655// CHECK:STDERR: ^~~~~~~~~~~~
5756// CHECK:STDERR:
@@ -60,7 +59,7 @@ impl C as J where .X = ();
6059// CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE+7]]:19: error: member access into object of incomplete type `J` [IncompleteTypeInMemberAccess]
6160// CHECK:STDERR: impl C as J where .X = () {}
6261// CHECK:STDERR: ^~
63- // CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE-16 ]]:1: note: interface was forward declared here [InterfaceForwardDeclaredHere]
62+ // CHECK:STDERR: fail_class_with_rewrite.carbon:[[@LINE-15 ]]:1: note: interface was forward declared here [InterfaceForwardDeclaredHere]
6463// CHECK:STDERR: interface J;
6564// CHECK:STDERR: ^~~~~~~~~~~~
6665// CHECK:STDERR:
@@ -202,10 +201,6 @@ impl C as I where .Self impls Incomplete {
202201// CHECK:STDOUT:
203202// CHECK:STDOUT: constants {
204203// CHECK:STDOUT: %J.type: type = facet_type <@J> [concrete]
205- // CHECK:STDOUT: %K.type: type = facet_type <@K> [concrete]
206- // CHECK:STDOUT: %Self: %K.type = symbolic_binding Self, 0 [symbolic]
207- // CHECK:STDOUT: %K.assoc_type: type = assoc_entity_type @K [concrete]
208- // CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, @K.%X [concrete]
209204// CHECK:STDOUT: %C: type = class_type @C [concrete]
210205// CHECK:STDOUT: %empty_struct_type: type = struct_type {} [concrete]
211206// CHECK:STDOUT: %complete_type: <witness> = complete_type_witness %empty_struct_type [concrete]
@@ -217,30 +212,28 @@ impl C as I where .Self impls Incomplete {
217212// CHECK:STDOUT: file {
218213// CHECK:STDOUT: package: <namespace> = namespace [concrete] {
219214// CHECK:STDOUT: .J = %J.decl
220- // CHECK:STDOUT: .K = %K.decl
221215// CHECK:STDOUT: .C = %C.decl
222216// CHECK:STDOUT: }
223217// CHECK:STDOUT: %J.decl: type = interface_decl @J [concrete = constants.%J.type] {} {}
224- // CHECK:STDOUT: %K.decl: type = interface_decl @K [concrete = constants.%K.type] {} {}
225218// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
226219// CHECK:STDOUT: impl_decl @C.as.<error>.impl [concrete] {} {
227- // CHECK:STDOUT: %C.ref.loc14 : type = name_ref C, file.%C.decl [concrete = constants.%C]
228- // CHECK:STDOUT: %J.ref.loc14 : type = name_ref J, file.%J.decl [concrete = constants.%J.type]
220+ // CHECK:STDOUT: %C.ref.loc13 : type = name_ref C, file.%C.decl [concrete = constants.%C]
221+ // CHECK:STDOUT: %J.ref.loc13 : type = name_ref J, file.%J.decl [concrete = constants.%J.type]
229222// CHECK:STDOUT: %.Self.2: %J.type = symbolic_binding .Self [symbolic_self = constants.%.Self]
230- // CHECK:STDOUT: %.Self.ref.loc14 : %J.type = name_ref .Self, %.Self.2 [symbolic_self = constants.%.Self]
231- // CHECK:STDOUT: %.loc14_25 : %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple]
232- // CHECK:STDOUT: %.loc14_13 : type = where_expr %.Self.2 [concrete = <error>] {
223+ // CHECK:STDOUT: %.Self.ref.loc13 : %J.type = name_ref .Self, %.Self.2 [symbolic_self = constants.%.Self]
224+ // CHECK:STDOUT: %.loc13_25 : %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple]
225+ // CHECK:STDOUT: %.loc13_13 : type = where_expr %.Self.2 [concrete = <error>] {
233226// CHECK:STDOUT: requirement_base_facet_type constants.%J.type
234227// CHECK:STDOUT: requirement_rewrite <error>, <error>
235228// CHECK:STDOUT: }
236229// CHECK:STDOUT: }
237230// CHECK:STDOUT: impl_decl @C.as.<error>.impl [concrete] {} {
238- // CHECK:STDOUT: %C.ref.loc23 : type = name_ref C, file.%C.decl [concrete = constants.%C]
239- // CHECK:STDOUT: %J.ref.loc23 : type = name_ref J, file.%J.decl [concrete = constants.%J.type]
231+ // CHECK:STDOUT: %C.ref.loc22 : type = name_ref C, file.%C.decl [concrete = constants.%C]
232+ // CHECK:STDOUT: %J.ref.loc22 : type = name_ref J, file.%J.decl [concrete = constants.%J.type]
240233// CHECK:STDOUT: %.Self.1: %J.type = symbolic_binding .Self [symbolic_self = constants.%.Self]
241- // CHECK:STDOUT: %.Self.ref.loc23 : %J.type = name_ref .Self, %.Self.1 [symbolic_self = constants.%.Self]
242- // CHECK:STDOUT: %.loc23_25 : %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple]
243- // CHECK:STDOUT: %.loc23_13 : type = where_expr %.Self.1 [concrete = <error>] {
234+ // CHECK:STDOUT: %.Self.ref.loc22 : %J.type = name_ref .Self, %.Self.1 [symbolic_self = constants.%.Self]
235+ // CHECK:STDOUT: %.loc22_25 : %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple]
236+ // CHECK:STDOUT: %.loc22_13 : type = where_expr %.Self.1 [concrete = <error>] {
244237// CHECK:STDOUT: requirement_base_facet_type constants.%J.type
245238// CHECK:STDOUT: requirement_rewrite <error>, <error>
246239// CHECK:STDOUT: }
@@ -249,25 +242,7 @@ impl C as I where .Self impls Incomplete {
249242// CHECK:STDOUT:
250243// CHECK:STDOUT: interface @J;
251244// CHECK:STDOUT:
252- // CHECK:STDOUT: interface @K {
253- // CHECK:STDOUT: %Self: %K.type = symbolic_binding Self, 0 [symbolic = constants.%Self]
254- // CHECK:STDOUT: %X: type = assoc_const_decl @X [concrete] {
255- // CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, @K.%X [concrete = constants.%assoc0]
256- // CHECK:STDOUT: }
257- // CHECK:STDOUT:
258- // CHECK:STDOUT: !members:
259- // CHECK:STDOUT: .Self = %Self
260- // CHECK:STDOUT: .X = @X.%assoc0
261- // CHECK:STDOUT: witness = (%X)
262- // CHECK:STDOUT:
263- // CHECK:STDOUT: !requires:
264- // CHECK:STDOUT: }
265- // CHECK:STDOUT:
266- // CHECK:STDOUT: generic assoc_const @X(@K.%Self: %K.type) {
267- // CHECK:STDOUT: assoc_const X:! type;
268- // CHECK:STDOUT: }
269- // CHECK:STDOUT:
270- // CHECK:STDOUT: impl @C.as.<error>.impl: %C.ref.loc14 as %.loc14_13 {
245+ // CHECK:STDOUT: impl @C.as.<error>.impl: %C.ref.loc13 as %.loc13_13 {
271246// CHECK:STDOUT: !members:
272247// CHECK:STDOUT: witness = <error>
273248// CHECK:STDOUT: }
@@ -280,8 +255,6 @@ impl C as I where .Self impls Incomplete {
280255// CHECK:STDOUT: .Self = constants.%C
281256// CHECK:STDOUT: }
282257// CHECK:STDOUT:
283- // CHECK:STDOUT: specific @X(constants.%Self) {}
284- // CHECK:STDOUT:
285258// CHECK:STDOUT: --- fail_class_with_qualified_rewrite.carbon
286259// CHECK:STDOUT:
287260// CHECK:STDOUT: constants {
0 commit comments