test-and-fix-multi-level-specific-resolution

Author: danakj

toolchain/check/testdata/generic/extend_type_completion.carbon

@@ -62,18 +62,24 @@ interface J(N:! i32) {
   // CHECK:STDERR:                                     ^
   extend require impls K(array(i32, N));
 }
+interface I(N:! i32) {
+  // CHECK:STDERR: fail_interface_extend_require_impls_does_need_complete_interface.carbon:[[@LINE+3]]:24: note: in `require` used here [ResolvingSpecificHere]
+  // CHECK:STDERR:   extend require impls J(N);
+  // CHECK:STDERR:                        ^~~~
+  extend require impls J(N);
+}
 
-// J extends K so the type of K is completed, but is invalid.
+// I extend J extends K so the type of K is completed, but is invalid.
 //
 // TODO: The error location should be the type, like in the class case above. We
 // need a location for the type in context.bind_name_map() to use as the
 // location to Convert().
 //
 // CHECK:STDERR: fail_interface_extend_require_impls_does_need_complete_interface.carbon:[[@LINE+4]]:1: note: in `require` used here [ResolvingSpecificHere]
-// CHECK:STDERR: var v: J(-1);
+// CHECK:STDERR: var v: I(-1);
 // CHECK:STDERR: ^~~~~~~~~~~~
 // CHECK:STDERR:
-var v: J(-1);
+var v: I(-1);
 
 // --- constraint_require_impls_doesnt_need_complete_interface.carbon
 library "[[@TEST_NAME]]";
@@ -96,13 +102,19 @@ constraint J(N:! i32) {
   // CHECK:STDERR:                                     ^
   extend require impls K(array(i32, N));
 }
+constraint I(N:! i32) {
+  // CHECK:STDERR: fail_constraint_extend_require_impls_does_need_complete_interface.carbon:[[@LINE+3]]:24: note: in `require` used here [ResolvingSpecificHere]
+  // CHECK:STDERR:   extend require impls J(N);
+  // CHECK:STDERR:                        ^~~~
+  extend require impls J(N);
+}
 
-// J extends K so the type of K is completed, but is invalid.
+// I extends J extends K so the type of K is completed, but is invalid.
 // CHECK:STDERR: fail_constraint_extend_require_impls_does_need_complete_interface.carbon:[[@LINE+4]]:1: note: in `require` used here [ResolvingSpecificHere]
-// CHECK:STDERR: var v: J(-1);
+// CHECK:STDERR: var v: I(-1);
 // CHECK:STDERR: ^~~~~~~~~~~~
 // CHECK:STDERR:
-var v: J(-1);
+var v: I(-1);
 
 // --- interface_require_impls_doesnt_need_complete_self.carbon
 library "[[@TEST_NAME]]";

toolchain/check/testdata/impl/import_generic.carbon

@@ -920,9 +920,9 @@ impl forall [T:! type] D as N(T*) {}
 // CHECK:STDOUT:   %Self.binding.as_type: type = symbolic_binding_type Self, 1, %Self.aa1546.1 [symbolic]
 // CHECK:STDOUT:   %ptr.3f2: type = ptr_type %ptr.4f0 [symbolic]
 // CHECK:STDOUT:   %N.type.b8d23b.2: type = facet_type <@N, @N(%ptr.3f2)> [symbolic]
-// CHECK:STDOUT:   %Self.aa1546.2: %N.type.b8d23b.2 = symbolic_binding Self, 1 [symbolic]
 // CHECK:STDOUT:   %I.type.71a: type = facet_type <@I, @I(%ptr.3f2)> [symbolic]
 // CHECK:STDOUT:   %require_complete.08c: <witness> = require_complete_type %I.type.71a [symbolic]
+// CHECK:STDOUT:   %Self.aa1546.2: %N.type.b8d23b.2 = symbolic_binding Self, 1 [symbolic]
 // CHECK:STDOUT:   %require_complete.a37: <witness> = require_complete_type %N.type.b8d23b.2 [symbolic]
 // CHECK:STDOUT:   %I.impl_witness.524: <witness> = impl_witness file.%I.impl_witness_table.loc6, @C.as.I.impl.3f8(%T) [symbolic]
 // CHECK:STDOUT: }
@@ -1372,8 +1372,8 @@ impl forall [T:! type] D as N(T*) {}
 // CHECK:STDOUT:   %require_complete.a37d6c.1: <witness> = require_complete_type %N.type.b8d23b.1 [symbolic]
 // CHECK:STDOUT:   %J.impl_witness.b5245e.1: <witness> = impl_witness file.%J.impl_witness_table.loc29, @D.as.J.impl.3b0484.1(%T) [symbolic]
 // CHECK:STDOUT:   %N.type.b8d23b.2: type = facet_type <@N, @N(%ptr)> [symbolic]
-// CHECK:STDOUT:   %Self.aa1546.2: %N.type.b8d23b.2 = symbolic_binding Self, 1 [symbolic]
 // CHECK:STDOUT:   %require_complete.d4d: <witness> = require_complete_type %J.type.4fa [symbolic]
+// CHECK:STDOUT:   %Self.aa1546.2: %N.type.b8d23b.2 = symbolic_binding Self, 1 [symbolic]
 // CHECK:STDOUT:   %require_complete.a37d6c.2: <witness> = require_complete_type %N.type.b8d23b.2 [symbolic]
 // CHECK:STDOUT:   %J.impl_witness.b5245e.2: <witness> = impl_witness file.%J.impl_witness_table.loc39, @D.as.J.impl.3b0484.2(%T) [symbolic]
 // CHECK:STDOUT: }

toolchain/check/type_completion.cpp

@@ -124,6 +124,7 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
                                      MakeDiagnosticBuilderFn diagnoser)
     -> bool {
   llvm::SmallVector<SemIR::FacetTypeId> work = {facet_type.facet_type_id};
+  llvm::SmallVector<SemIR::SpecificId> resolve;
   while (!work.empty()) {
     auto next_facet_type_id = work.pop_back_val();
     const auto& facet_type_info = context.facet_types().Get(next_facet_type_id);
@@ -132,7 +133,7 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
       SemIR::SpecificId specific_id;
       SemIR::RequireImplsBlockId requires_block_id;
     };
-    llvm::SmallVector<SpecificForRequires> specifics;
+    llvm::SmallVector<SpecificForRequires> specific_requires;
 
     for (auto extends : facet_type_info.extend_constraints) {
       auto interface_id = extends.interface_id;
@@ -146,11 +147,9 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
         return false;
       }
       if (interface.generic_id.has_value()) {
-        specifics.push_back(
+        specific_requires.push_back(
             {extends.specific_id, interface.require_impls_block_id});
-      }
-      if (extends.specific_id.has_value()) {
-        ResolveSpecificDefinition(context, loc_id, extends.specific_id);
+        resolve.push_back(extends.specific_id);
       }
     }
 
@@ -167,11 +166,9 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
         return false;
       }
       if (constraint.generic_id.has_value()) {
-        specifics.push_back(
+        specific_requires.push_back(
             {extends.specific_id, constraint.require_impls_block_id});
-      }
-      if (extends.specific_id.has_value()) {
-        ResolveSpecificDefinition(context, loc_id, extends.specific_id);
+        resolve.push_back(extends.specific_id);
       }
     }
 
@@ -182,7 +179,7 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
     // declaration since `extend require` can only be applied to `Self`, so the
     // self-type in these `require` declarations never uses any generic
     // parameters.
-    for (auto [specific_id, requires_block_id] : specifics) {
+    for (auto [specific_id, requires_block_id] : specific_requires) {
       for (auto require_impls_id :
            context.require_impls_blocks().Get(requires_block_id)) {
         const auto& require = context.require_impls().Get(require_impls_id);
@@ -203,6 +200,10 @@ static auto RequireCompleteFacetType(Context& context, SemIR::LocId loc_id,
     }
   }
 
+  for (auto specific_id : resolve) {
+    ResolveSpecificDefinition(context, loc_id, specific_id);
+  }
+
   return true;
 }