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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2019-08-17 00:10:12 -07:00
parent c1d8b1b6b4 fc3d9755fb
commit ec6ae95b85
10 changed files with 110 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CSSolver.cpp
View File

@@ -452,6 +452,7 @@ ConstraintSystem::SolverScope::SolverScope(ConstraintSystem &cs)
numSavedBindings = cs.solverState->savedBindings.size();
numConstraintRestrictions = cs.ConstraintRestrictions.size();
numFixes = cs.Fixes.size();
numFixedRequirements = cs.FixedRequirements.size();
numDisjunctionChoices = cs.DisjunctionChoices.size();
numOpenedTypes = cs.OpenedTypes.size();
numOpenedExistentialTypes = cs.OpenedExistentialTypes.size();
@@ -505,6 +506,10 @@ ConstraintSystem::SolverScope::~SolverScope() {
// Remove any opened types.
truncate(cs.OpenedTypes, numOpenedTypes);
// Remove any conformances solver had to fix along
// the current path.
truncate(cs.FixedRequirements, numFixedRequirements);
// Remove any opened existential types.
truncate(cs.OpenedExistentialTypes, numOpenedExistentialTypes);