Merge pull request #41833 from hborla/redundant-requirement-tweak

[RequirementMachine] Suppress redundant requirement warnings for inferred requirements.

Author: hborla

lib/AST/RequirementMachine/HomotopyReduction.cpp

@@ -136,8 +136,16 @@ void RewriteSystem::propagateRedundantRequirementIDs() {
     MutableTerm lhs(rule.getLHS());
     for (auto ruleID : rewritePath.getRulesInEmptyContext(lhs, *this)) {
       auto &replacement = Rules[ruleID];
-      if (!replacement.isPermanent() &&
-          !replacement.getRequirementID().hasValue()) {
+      if (!replacement.isPermanent()) {
+        // If the replacement rule already has a requirementID, overwrite
+        // it if the existing ID corresponds to an inferred requirement.
+        // This effectively makes the inferred requirement the redundant
+        // one, which makes it easier to suppress redundancy warnings for
+        // inferred requirements later on.
+        auto existingID = replacement.getRequirementID();
+        if (existingID.hasValue() && !WrittenRequirements[*existingID].inferred)
+          continue;
+
         if (Debug.contains(DebugFlags::PropagateRequirementIDs)) {
           llvm::dbgs() << "\n- propagating ID = "
             << requirementID

lib/AST/RequirementMachine/RewriteSystem.cpp

@@ -634,6 +634,10 @@ void RewriteSystem::computeRedundantRequirementDiagnostics(
     auto requirement = WrittenRequirements[requirementID];
     auto pairIt = rulesPerRequirement.find(requirementID);
 
+    // Inferred requirements can be re-stated without warning.
+    if (requirement.inferred)
+      continue;
+
     // If there are no rules for this structural requirement, then
     // the requirement was never added to the rewrite system because
     // it is trivially redundant.

lib/AST/RequirementMachine/Rule.h

@@ -97,7 +97,6 @@ class Rule final {
   }
 
   void setRequirementID(Optional<unsigned> requirementID) {
-    assert(!getRequirementID().hasValue());
     this->requirementID = requirementID;
   }
 

test/Generics/requirement_machine_diagnostics.swift

@@ -178,3 +178,19 @@ class X3 { }
 
 func sameTypeConcrete2<T : P9 & P10>(_: T) where T.B : X3, T.C == T.B, T.C == X3 { }
 // expected-warning@-1{{redundant superclass constraint 'T.B' : 'X3'}}
+
+
+// Redundant requirement warnings are suppressed for inferred requirements.
+
+protocol P11 {
+ associatedtype X
+ associatedtype Y
+ associatedtype Z
+}
+
+func inferred1<T : Hashable>(_: Set<T>) {}
+func inferred2<T>(_: Set<T>) where T: Hashable {}
+func inferred3<T : P11>(_: T) where T.X : Hashable, T.Z == Set<T.Y>, T.X == T.Y {}
+func inferred4<T : P11>(_: T) where T.Z == Set<T.Y>, T.X : Hashable, T.X == T.Y {}
+func inferred5<T : P11>(_: T) where T.Z == Set<T.X>, T.Y : Hashable, T.X == T.Y {}
+func inferred6<T : P11>(_: T) where T.Y : Hashable, T.Z == Set<T.X>, T.X == T.Y {}