[TypeChecker] Add getter/setter methods for generatedConstraints of SolverState

Author: xedin

lib/Sema/CSSolver.cpp

@@ -2410,7 +2410,7 @@ bool ConstraintSystem::solveSimplified(
     }
 
     // Record this as a generated constraint.
-    solverState->generatedConstraints.push_back(constraint);
+    solverState->addGeneratedConstraint(constraint);
 
     if (!solveRec(solutions, allowFreeTypeVariables)) {
       firstSolvedConstraint = constraint;

lib/Sema/ConstraintGraph.cpp

@@ -740,23 +740,8 @@ void ConstraintGraph::removeEdge(Constraint *constraint) {
     }
   }
 
-  size_t index = 0;
-  for (auto generated : CS.solverState->generatedConstraints) {
-    if (generated == constraint) {
-      unsigned last = CS.solverState->generatedConstraints.size()-1;
-      auto lastConstraint = CS.solverState->generatedConstraints[last];
-      if (lastConstraint == generated) {
-        CS.solverState->generatedConstraints.pop_back();
-        break;
-      } else {
-        CS.solverState->generatedConstraints[index] = lastConstraint;
-        CS.solverState->generatedConstraints[last] = constraint;
-        CS.solverState->generatedConstraints.pop_back();
-        break;
-      }
-    }
-    index++;
-  }
+  if (CS.solverState)
+    CS.solverState->removeGeneratedConstraint(constraint);
 
   removeConstraint(constraint);
 }

lib/Sema/ConstraintSystem.h

@@ -1016,9 +1016,6 @@ class ConstraintSystem {
     /// \brief Whether to record failures or not.
     bool recordFixes = false;
 
-    /// The current set of generated constraints.
-    SmallVector<Constraint *, 4> generatedConstraints;
-
     /// \brief The set of type variable bindings that have changed while
     /// processing this constraint system.
     SavedTypeVariableBindings savedBindings;
@@ -1068,6 +1065,38 @@ class ConstraintSystem {
         processor(constraint);
     }
 
+    /// \brief Add new "generated" constraint along the current solver path.
+    ///
+    /// \param constraint The newly generated constraint.
+    void addGeneratedConstraint(Constraint *constraint) {
+      generatedConstraints.push_back(constraint);
+    }
+
+    /// \brief 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) {
+      size_t index = 0;
+      for (auto generated : generatedConstraints) {
+        if (generated == constraint) {
+          unsigned last = generatedConstraints.size() - 1;
+          auto lastConstraint = generatedConstraints[last];
+          if (lastConstraint == generated) {
+            generatedConstraints.pop_back();
+            break;
+          } else {
+            generatedConstraints[index] = lastConstraint;
+            generatedConstraints[last] = constraint;
+            generatedConstraints.pop_back();
+            break;
+          }
+        }
+        index++;
+      }
+    }
+
     /// \brief Restore all of the retired/generated constraints to the state
     /// before given scope. This is required because retired constraints have
     /// to be re-introduced to the system in order of arrival (LIFO) and list
@@ -1110,6 +1139,9 @@ class ConstraintSystem {
     /// are added back to the circulation.
     ConstraintList retiredConstraints;
 
+    /// The current set of generated constraints.
+    SmallVector<Constraint *, 4> generatedConstraints;
+
     /// The collection which holds association between solver scope
     /// and position of the last retired constraint and number of
     /// constraints generated before registration of given scope,
@@ -1585,7 +1617,7 @@ class ConstraintSystem {
 
     // Record this as a newly-generated constraint.
     if (solverState) {
-      solverState->generatedConstraints.push_back(constraint);
+      solverState->addGeneratedConstraint(constraint);
       solverState->retireConstraint(constraint);
     }
   }
@@ -1601,7 +1633,7 @@ class ConstraintSystem {
 
     // Record this as a newly-generated constraint.
     if (solverState)
-      solverState->generatedConstraints.push_back(constraint);
+      solverState->addGeneratedConstraint(constraint);
   }
 
   /// \brief Remove an inactive constraint from the current constraint graph.