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

Sema: Record pack expansion environments in the trail

Browse Source
This commit is contained in:
Slava Pestov
2024-10-01 14:44:26 -04:00
parent 9afb1a960b
commit f51bf3cf9d
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSSolver.cpp
View File

@@ -341,7 +341,7 @@ void ConstraintSystem::applySolution(const Solution &solution) {
// Register the solutions's pack expansion environments.
for (const auto &expansion : solution.PackExpansionEnvironments) {
PackExpansionEnvironments.insert(expansion);
recordPackExpansionEnvironment(expansion.first, expansion.second);
}
// Register the solutions's pack environments.
@@ -672,7 +672,6 @@ ConstraintSystem::SolverScope::SolverScope(ConstraintSystem &cs)
numTypeVariables = cs.TypeVariables.size();
numFixes = cs.Fixes.size();
numPackExpansionEnvironments = cs.PackExpansionEnvironments.size();
numPackEnvironments = cs.PackEnvironments.size();
numPackElementGenericEnvironments = cs.PackElementGenericEnvironments.size();
numDefaultedConstraints = cs.DefaultedConstraints.size();
@@ -731,9 +730,6 @@ ConstraintSystem::SolverScope::~SolverScope() {
// constraints introduced by the current scope.
cs.solverState->rollback(this);
// Remove any pack expansion environments.
truncate(cs.PackExpansionEnvironments, numPackExpansionEnvironments);
// Remove any pack environments.
truncate(cs.PackEnvironments, numPackEnvironments);