Merge pull request #68055 from slavapestov/rdar113943346

RequirementMachine: Fix potential 'pollution' from installing an invalid requirement machine

Author: slavapestov

lib/AST/RequirementMachine/HomotopyReduction.cpp

@@ -646,7 +646,10 @@ void RewriteSystem::minimizeRewriteSystem(const PropertyMap &map) {
 }
 
 /// Returns flags indicating if the rewrite system has unresolved or
-/// conflicting rules in our minimization domain.
+/// conflicting rules in our minimization domain. If these flags are
+/// set, we do not install this rewrite system in the rewrite context
+/// after minimization. Instead, we will rebuild a new rewrite system
+/// from the minimized requirements.
 GenericSignatureErrors RewriteSystem::getErrors() const {
   assert(Complete);
   assert(Minimized);
@@ -668,10 +671,19 @@ GenericSignatureErrors RewriteSystem::getErrors() const {
     if (rule.isConflicting() || rule.isRecursive())
       result |= GenericSignatureErrorFlags::HasInvalidRequirements;
 
-    if (!rule.isRedundant())
-      if (auto property = rule.isPropertyRule())
+    if (!rule.isRedundant()) {
+      if (auto property = rule.isPropertyRule()) {
         if (property->getKind() == Symbol::Kind::ConcreteConformance)
           result |= GenericSignatureErrorFlags::HasConcreteConformances;
+
+        if (property->hasSubstitutions()) {
+          for (auto t : property->getSubstitutions()) {
+            if (t.containsUnresolvedSymbols())
+              result |= GenericSignatureErrorFlags::HasInvalidRequirements;
+          }
+        }
+      }
+    }
   }
 
   return result;

test/Generics/rdar113943346.swift

@@ -0,0 +1,22 @@
+// RUN: %target-typecheck-verify-swift
+
+struct G<T, U, V> {}
+
+struct Foo<T> {}
+
+// The first extension has the same generic signature as the
+// second extension, because we drop the invalid requirement.
+//
+// But the rewrite system used for minimization with the first
+// extension should not be installed in the rewrite context,
+// because of this invalid requirement.
+
+extension G where T == Foo<V.Bar>, U == Foo<Int> {}
+// expected-error@-1 {{'Bar' is not a member type of type 'V'}}
+
+extension G where U == Foo<Int> {
+  func f() {
+    print(T.self)
+    print(U.self)
+  }
+}