Sema: More general dumpActiveScopeChanges()

Author: slavapestov

include/swift/Sema/CSTrail.h

@@ -120,7 +120,10 @@ class SolverTrail {
     /// had prior to this change.
     ///
     /// Changes must be undone in stack order.
-    void undo(ConstraintSystem &cs);
+    void undo(ConstraintSystem &cs) const;
+
+    void dump(llvm::raw_ostream &out, ConstraintSystem &cs,
+              unsigned indent = 0) const;
   };
 
   SolverTrail(ConstraintSystem &cs) : CS(cs) {}
@@ -134,7 +137,7 @@ class SolverTrail {
 
   void dumpActiveScopeChanges(llvm::raw_ostream &out,
                               unsigned fromIndex,
-                              unsigned indent = 0);
+                              unsigned indent = 0) const;
 
   unsigned size() const {
     return Changes.size();

lib/Sema/CSTrail.cpp

@@ -98,7 +98,7 @@ SolverTrail::Change::updatedTypeVariable(
   return result;
 }
 
-void SolverTrail::Change::undo(ConstraintSystem &cs) {
+void SolverTrail::Change::undo(ConstraintSystem &cs) const {
   auto &cg = cs.getConstraintGraph();
 
   switch (Kind) {
@@ -131,6 +131,68 @@ void SolverTrail::Change::undo(ConstraintSystem &cs) {
   }
 }
 
+void SolverTrail::Change::dump(llvm::raw_ostream &out,
+                               ConstraintSystem &cs,
+                               unsigned indent) const {
+  PrintOptions PO;
+  PO.PrintTypesForDebugging = true;
+
+  out.indent(indent);
+
+  switch (Kind) {
+  case ChangeKind::AddedTypeVariable:
+    out << "(added type variable ";
+    TypeVar->print(out, PO);
+    out << ")\n";
+    break;
+
+  case ChangeKind::AddedConstraint:
+    out << "(added constraint ";
+    TheConstraint->print(out, &cs.getASTContext().SourceMgr, indent + 2);
+    out << ")\n";
+    break;
+
+  case ChangeKind::RemovedConstraint:
+    out << "(removed constraint ";
+    TheConstraint->print(out, &cs.getASTContext().SourceMgr, indent + 2);
+    out << ")\n";
+    break;
+
+  case ChangeKind::ExtendedEquivalenceClass: {
+    out << "(equivalence ";
+    EquivClass.TypeVar->print(out, PO);
+    out << " " << EquivClass.PrevSize << ")\n";
+    break;
+   }
+
+  case ChangeKind::BoundTypeVariable:
+    out << "(bound type variable ";
+    Binding.TypeVar->print(out, PO);
+    out << " to fixed type ";
+    Binding.FixedType->print(out, PO);
+    out << ")\n";
+    break;
+
+  case ChangeKind::UpdatedTypeVariable:
+    out << "(updated type variable ";
+    Update.TypeVar->print(out, PO);
+
+    auto parentOrFixed = Update.TypeVar->getImpl().ParentOrFixed;
+    if (auto *parent = parentOrFixed.dyn_cast<TypeVariableType *>()) {
+      out << " to parent ";
+      parent->print(out, PO);
+    }
+    else {
+      out << " to fixed type ";
+      parentOrFixed.get<TypeBase *>()->print(out, PO);
+    }
+    out << " with options 0x";
+    out.write_hex(Update.Options);
+    out << ")\n";
+    break;
+  }
+}
+
 void SolverTrail::recordChange(Change change) {
   if (UndoActive)
     return;
@@ -166,121 +228,13 @@ void SolverTrail::undo(unsigned toIndex) {
 
 void SolverTrail::dumpActiveScopeChanges(llvm::raw_ostream &out,
                                          unsigned fromIndex,
-                                         unsigned indent) {
-  if (Changes.empty())
-    return;
-
-  // Collect Changes for printing.
-  std::map<TypeVariableType *, TypeBase *> tvWithboundTypes;
-  std::vector<TypeVariableType *> addedTypeVars;
-  std::vector<TypeVariableType *> equivTypeVars;
-  std::set<Constraint *> addedConstraints;
-  std::set<Constraint *> removedConstraints;
-  for (unsigned int i = fromIndex; i < Changes.size(); i++) {
-    auto change = Changes[i];
-    switch (change.Kind) {
-    case ChangeKind::BoundTypeVariable:
-      tvWithboundTypes.insert(std::pair<TypeVariableType *, TypeBase *>(
-          change.Binding.TypeVar, change.Binding.FixedType));
-      break;
-    case ChangeKind::AddedTypeVariable:
-      addedTypeVars.push_back(change.TypeVar);
-      break;
-    case ChangeKind::ExtendedEquivalenceClass:
-      equivTypeVars.push_back(change.EquivClass.TypeVar);
-      break;
-    case ChangeKind::AddedConstraint:
-      addedConstraints.insert(change.TheConstraint);
-      break;
-    case ChangeKind::RemovedConstraint:
-      removedConstraints.insert(change.TheConstraint);
-      break;
-    case ChangeKind::UpdatedTypeVariable:
-      // Don't consider changes that don't affect the graph.
-      break;
-    }
-  }
+                                         unsigned indent) const {
+  out.indent(indent);
+  out << "(changes:\n";
 
-  // If there are any constraints that were both added and removed in this set
-  // of Changes, remove them from both.
-  std::set<Constraint *> intersects;
-  set_intersection(addedConstraints.begin(), addedConstraints.end(),
-                   removedConstraints.begin(), removedConstraints.end(),
-                   std::inserter(intersects, intersects.begin()));
-  llvm::set_subtract(addedConstraints, intersects);
-  llvm::set_subtract(removedConstraints, intersects);
+  for (unsigned i = fromIndex; i < Changes.size(); ++i)
+    Changes[i].dump(out, CS, indent + 2);
 
-  // Print out Changes.
-  PrintOptions PO;
-  PO.PrintTypesForDebugging = true;
-  out.indent(indent);
-  out << "(Changes:\n";
-  if (!tvWithboundTypes.empty()) {
-    out.indent(indent + 2);
-    out << "(Newly Bound: \n";
-    for (const auto &tvWithType : tvWithboundTypes) {
-      out.indent(indent + 4);
-      out << "> $T" << tvWithType.first->getImpl().getID() << " := ";
-      tvWithType.second->print(out, PO);
-      out << '\n';
-    }
-    out.indent(indent + 2);
-    out << ")\n";
-  }
-  if (!addedTypeVars.empty()) {
-    out.indent(indent + 2);
-    auto heading = (addedTypeVars.size() > 1) ? "(New Type Variables: \n"
-                                              : "(New Type Variable: \n";
-    out << heading;
-    for (const auto &typeVar : addedTypeVars) {
-      out.indent(indent + 4);
-      out << "> $T" << typeVar->getImpl().getID();
-      out << '\n';
-    }
-    out.indent(indent + 2);
-    out << ")\n";
-  }
-  if (!equivTypeVars.empty()) {
-    out.indent(indent + 2);
-    auto heading = (equivTypeVars.size() > 1) ? "(New Equivalences: \n"
-                                              : "(New Equivalence: \n";
-    out << heading;
-    for (const auto &typeVar : equivTypeVars) {
-      out.indent(indent + 4);
-      out << "> $T" << typeVar->getImpl().getID();
-      out << '\n';
-    }
-    out.indent(indent + 2);
-    out << ")\n";
-  }
-  if (!addedConstraints.empty()) {
-    out.indent(indent + 2);
-    auto heading = (addedConstraints.size() > 1) ? "(Added Constraints: \n"
-                                                 : "(Added Constraint: \n";
-    out << heading;
-    for (const auto &constraint : addedConstraints) {
-      out.indent(indent + 4);
-      out << "> ";
-      constraint->print(out, &CS.getASTContext().SourceMgr, indent + 6);
-      out << '\n';
-    }
-    out.indent(indent + 2);
-    out << ")\n";
-  }
-  if (!removedConstraints.empty()) {
-    out.indent(indent + 2);
-    auto heading = (removedConstraints.size() > 1) ? "(Removed Constraints: \n"
-                                                   : "(Removed Constraint: \n";
-    out << heading;
-    for (const auto &constraint : removedConstraints) {
-      out.indent(indent + 4);
-      out << "> ";
-      constraint->print(out, &CS.getASTContext().SourceMgr, indent + 6);
-      out << '\n';
-    }
-    out.indent(indent + 2);
-    out << ")\n";
-  }
   out.indent(indent);
   out << ")\n";
 }