averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ConstraintSystem] Remove recursive solver algorithm and related logic

Browse Source 
`solveRec` is now gone as well as all related logic,
such as attempting type variable and disjunction choices recursively.
This commit is contained in:
Pavel Yaskevich
2018-09-13 01:17:10 -07:00
parent baceb68f85
commit 2eb0e824e4
2 changed files with 1 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Sema/ConstraintSystem.h
View File

@@ -2966,11 +2966,6 @@ private:
bool &addOptionalSupertypeBindings);
PotentialBindings getPotentialBindings(TypeVariableType *typeVar);
bool
tryTypeVariableBindings(TypeVariableType *typeVar,
ArrayRef<ConstraintSystem::PotentialBinding> bindings,
SmallVectorImpl<Solution> &solutions);
private:
/// \brief Add a constraint to the constraint system.
SolutionKind addConstraintImpl(ConstraintKind kind, Type first, Type second,
@@ -2980,33 +2975,6 @@ private:
/// \brief Collect the current inactive disjunction constraints.
void collectDisjunctions(SmallVectorImpl<Constraint *> &disjunctions);
/// \brief Attempt find a solution involving the options in a
/// disjunction.
///
/// \returns true if we failed to find any solutions, false otherwise.
bool solveForDisjunction(Constraint *disjunction,
SmallVectorImpl<Solution> &solutions);
/// \brief Attempt to solve for some subset of the constraints in a
/// disjunction, skipping constraints that we decide do not
/// need to be solved for because they would not result in
/// the best solution to the constraint system.
///
/// \returns true if we failed to find any solutions, false otherwise.
bool solveForDisjunctionChoices(ArrayRef<Constraint *> choices,
ConstraintLocator *disjunctionLocator,
bool isExplicitConversion,
SmallVectorImpl<Solution> &solutions);
/// \brief Attempt to solve constraint system after
/// attempting given disjunction choice.
///
/// \returns If solution(s) could be reached, return best score.
Optional<Score>
solveForDisjunctionChoice(const TypeBinding &choice,
ConstraintLocator *disjunctionLocator,
SmallVectorImpl<Solution> &solutions);
/// \brief Solve the system of constraints after it has already been
/// simplified.
///
@@ -3093,13 +3061,6 @@ public:
FreeTypeVariableBinding allowFreeTypeVariables =
FreeTypeVariableBinding::Disallow);
/// \brief Solve the system of constraints.
///
/// \param solutions The set of solutions to this system of constraints.
///
/// \returns true if there are no solutions
bool solveRec(SmallVectorImpl<Solution> &solutions);
/// \brief Solve the system of constraints.
///
/// \param allowFreeTypeVariables How to bind free type variables in