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 pull request #77174 from slavapestov/fix-undo-order

Browse Source 
Sema: Undo changes in chronological order in SolverTrail::undo()
This commit is contained in:
Slava Pestov
2024-11-20 08:00:53 -05:00
committed by GitHub
parent e6b4e0f9f1 a19c92a4e0
commit a7b1e7854c
7 changed files with 115 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/swift/Sema/ConstraintSystem.h
View File

@@ -555,12 +555,7 @@ public:
/// \param trail The record of state changes.
void mergeEquivalenceClasses(TypeVariableType *other,
constraints::SolverTrail *trail) {
// Merge the equivalence classes corresponding to these two type
// variables. Always merge 'up' the constraint stack, because it is simpler.
if (getID() > other->getImpl().getID()) {
other->getImpl().mergeEquivalenceClasses(getTypeVariable(), trail);
return;
}
ASSERT(getID() < other->getImpl().getID());
auto otherRep = other->getImpl().getRepresentative(trail);
if (trail)