RequirementMachine: Add a dump() method

Author: slavapestov

include/swift/AST/RequirementMachine.h

@@ -13,6 +13,10 @@
 #ifndef SWIFT_REQUIREMENTMACHINE_H
 #define SWIFT_REQUIREMENTMACHINE_H
 
+namespace llvm {
+class raw_ostream;
+}
+
 namespace swift {
 
 class ASTContext;
@@ -53,6 +57,8 @@ class RequirementMachine final {
   bool requiresClass(Type depType) const;
   LayoutConstraint getLayoutConstraint(Type depType) const;
   bool requiresProtocol(Type depType, const ProtocolDecl *proto) const;
+
+  void dump(llvm::raw_ostream &out) const;
 };
 
 } // end namespace swift

lib/AST/GenericSignature.cpp

@@ -316,6 +316,7 @@ bool GenericSignatureImpl::requiresClass(Type type) const {
       llvm::errs() << "Dependent type: "; type.dump(llvm::errs());
       llvm::errs() << "GenericSignatureBuilder says: " << gsbResult << "\n";
       llvm::errs() << "RequirementMachine says: " << rqmResult << "\n";
+      getRequirementMachine()->dump(llvm::errs());
       abort();
     }
 #endif
@@ -417,6 +418,7 @@ bool GenericSignatureImpl::requiresProtocol(Type type,
       llvm::errs() << "\n";
       llvm::errs() << "GenericSignatureBuilder says: " << gsbResult << "\n";
       llvm::errs() << "RequirementMachine says: " << rqmResult << "\n";
+      getRequirementMachine()->dump(llvm::errs());
       abort();
     }
 #endif
@@ -482,6 +484,7 @@ LayoutConstraint GenericSignatureImpl::getLayoutConstraint(Type type) const {
       llvm::errs() << "\n";
       llvm::errs() << "GenericSignatureBuilder says: " << gsbResult << "\n";
       llvm::errs() << "RequirementMachine says: " << rqmResult << "\n";
+      getRequirementMachine()->dump(llvm::errs());
       abort();
     }
 #endif

lib/AST/RequirementMachine/RequirementMachine.cpp

@@ -325,8 +325,7 @@ void RequirementMachine::computeCompletion(CanGenericSignature sig) {
   }
 
   if (Context.LangOpts.DebugRequirementMachine) {
-    Impl->System.dump(llvm::dbgs());
-    Impl->Map.dump(llvm::dbgs());
+    dump(llvm::dbgs());
   }
 
   assert(!Impl->Complete);
@@ -337,6 +336,11 @@ bool RequirementMachine::isComplete() const {
   return Impl->Complete;
 }
 
+void RequirementMachine::dump(llvm::raw_ostream &out) const {
+  Impl->System.dump(out);
+  Impl->Map.dump(out);
+}
+
 bool RequirementMachine::requiresClass(Type depType) const {
   auto term = Impl->Context.getMutableTermForType(depType->getCanonicalType(),
                                                   /*proto=*/nullptr);