[CS] A couple of cleanups (swiftlang#31155)

[CS] A couple of cleanups

Author: hamishknight

lib/Sema/CSSimplify.cpp

@@ -10087,22 +10087,13 @@ void ConstraintSystem::simplifyDisjunctionChoice(Constraint *choice) {
   case ConstraintSystem::SolutionKind::Error:
     if (!failedConstraint)
       failedConstraint = choice;
-    if (solverState)
-      solverState->retireConstraint(choice);
     break;
 
   case ConstraintSystem::SolutionKind::Solved:
-    if (solverState)
-      solverState->retireConstraint(choice);
     break;
 
   case ConstraintSystem::SolutionKind::Unsolved:
-    InactiveConstraints.push_back(choice);
-    CG.addConstraint(choice);
+    addUnsolvedConstraint(choice);
     break;
   }
-
-  // Record this as a generated constraint.
-  if (solverState)
-    solverState->addGeneratedConstraint(choice);
 }

lib/Sema/ConstraintGraph.cpp

@@ -1165,8 +1165,8 @@ bool ConstraintGraph::contractEdges() {
         log << "\n";
       }
 
-      // Merge the edges and remove the constraint.
-      removeEdge(constraint);
+      // Merge the edges and retire the constraint.
+      CS.retireConstraint(constraint);
       if (rep1 != rep2)
         CS.mergeEquivalenceClasses(rep1, rep2, /*updateWorkList*/ false);
       didContractEdges = true;
@@ -1175,35 +1175,6 @@ bool ConstraintGraph::contractEdges() {
   return didContractEdges;
 }
 
-void ConstraintGraph::removeEdge(Constraint *constraint) {
-  bool isExistingConstraint = false;
-
-  for (auto &active : CS.ActiveConstraints) {
-    if (&active == constraint) {
-      CS.ActiveConstraints.erase(constraint);
-      isExistingConstraint = true;
-      break;
-    }
-  }
-
-  for (auto &inactive : CS.InactiveConstraints) {
-    if (&inactive == constraint) {
-      CS.InactiveConstraints.erase(constraint);
-      isExistingConstraint = true;
-      break;
-    }
-  }
-
-  if (CS.solverState) {
-    if (isExistingConstraint)
-      CS.solverState->retireConstraint(constraint);
-    else
-      CS.solverState->removeGeneratedConstraint(constraint);
-  }
-
-  removeConstraint(constraint);
-}
-
 void ConstraintGraph::optimize() {
   // Merge equivalence classes until a fixed point is reached.
   while (contractEdges()) {}

lib/Sema/ConstraintGraph.h

@@ -333,10 +333,6 @@ class ConstraintGraph {
   /// classes until a fixed point is reached.
   bool contractEdges();
 
-  /// To support edge contraction, remove a constraint from both the constraint
-  /// graph and its enclosing constraint system.
-  void removeEdge(Constraint *constraint);
-
   /// The constraint system.
   ConstraintSystem &CS;
 

lib/Sema/ConstraintSystem.h

@@ -1932,24 +1932,6 @@ class ConstraintSystem {
       generatedConstraints.push_back(constraint);
     }
 
-    /// Erase given constraint from the list of generated constraints
-    /// along the current solver path. Note that this operation doesn't
-    /// guarantee any ordering of the after it's application.
-    ///
-    /// \param constraint The constraint to erase.
-    void removeGeneratedConstraint(Constraint *constraint) {
-      for (auto *&generated : generatedConstraints) {
-        // When we find the constraint we're erasing, overwrite its
-        // value with the last element in the generated constraints
-        // vector and then pop that element from the vector.
-        if (generated == constraint) {
-          generated = generatedConstraints.back();
-          generatedConstraints.pop_back();
-          return;
-        }
-      }
-    }
-
     /// Register given scope to be tracked by the current solver state,
     /// this helps to make sure that all of the retired/generated constraints
     /// are dealt with correctly when the life time of the scope ends.
@@ -2954,14 +2936,8 @@ class ConstraintSystem {
   /// Add a new constraint that we know fails.
   void addNewFailingConstraint(Constraint *constraint) {
     assert(shouldAddNewFailingConstraint());
+    assert(!constraint->isActive());
     failedConstraint = constraint;
-    failedConstraint->setActive(false);
-
-    // Record this as a newly-generated constraint.
-    if (solverState) {
-      solverState->addGeneratedConstraint(constraint);
-      solverState->retireConstraint(constraint);
-    }
   }
 
   /// Add a newly-generated constraint that is known not to be solvable
@@ -4215,7 +4191,8 @@ class ConstraintSystem {
     /// The set of potential bindings.
     SmallVector<PotentialBinding, 4> Bindings;
 
-    /// Whether this type variable is fully bound by one of its constraints.
+    /// Whether these bindings should be delayed until the rest of the
+    /// constraint system is considered "fully bound".
     bool FullyBound = false;
 
     /// Whether the bindings of this type involve other type variables.