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

Sema: Record disabled constraints in the trail

Browse Source
This commit is contained in:
Slava Pestov
2024-10-02 15:17:24 -04:00
parent 411c590bc8
commit b2adf51d78
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/CSSolver.cpp
View File

@@ -664,7 +664,6 @@ ConstraintSystem::SolverScope::SolverScope(ConstraintSystem &cs)
numTypeVariables = cs.TypeVariables.size();
numFixes = cs.Fixes.size();
numKeyPaths = cs.KeyPaths.size();
numDisabledConstraints = cs.solverState->getNumDisabledConstraints();
numFavoredConstraints = cs.solverState->getNumFavoredConstraints();
numResultBuilderTransformed = cs.resultBuilderTransformed.size();
numAppliedPropertyWrappers = cs.appliedPropertyWrappers.size();
@@ -1771,10 +1770,12 @@ ConstraintSystem::filterDisjunction(
if (restoreOnFail)
constraintsToRestoreOnFail.push_back(constraint);
if (solverState)
solverState->disableConstraint(constraint);
else
constraint->setDisabled();
if (!constraint->isDisabled()) {
if (solverState)
solverState->disableConstraint(constraint);
else
constraint->setDisabled();
}
}
switch (numEnabledTerms) {