[AST] Don't \n when dumping an abstract ProtocolConformanceRef as part of a larger dump.

Author: huonw

lib/AST/ASTDumper.cpp

@@ -2810,7 +2810,6 @@ static void dumpProtocolConformanceRefRec(
     out.indent(indent) << "(abstract_conformance protocol="
                        << conformance.getAbstract()->getName();
     PrintWithColorRAII(out, ParenthesisColor) << ')';
-    out << '\n';
   }
 }
 
@@ -2923,7 +2922,10 @@ static void dumpProtocolConformanceRec(
   PrintWithColorRAII(out, ParenthesisColor) << ')';
 }
 
-void ProtocolConformanceRef::dump() const { dump(llvm::errs()); }
+void ProtocolConformanceRef::dump() const {
+  dump(llvm::errs());
+  llvm::errs() << '\n';
+}
 
 void ProtocolConformanceRef::dump(llvm::raw_ostream &out,
                                   unsigned indent) const {

test/Driver/debug-generic-signatures.swift

@@ -81,9 +81,9 @@ class Super<T, U> {}
 // CHECK-NEXT:   (assoc_type req=A type=Super<T, U>.A)
 // CHECK-NEXT:   (assoc_type req=B type=Super<T, U>.B)
 // CHECK-NEXT:   (abstract_conformance protocol=P2)
-// CHECK:        (abstract_conformance protocol=P2)
-// CHECK:        conforms_to: T P2
-// CHECK:        conforms_to: U P2)
+// CHECK-NEXT:   (abstract_conformance protocol=P2)
+// CHECK-NEXT:   conforms_to: T P2
+// CHECK-NEXT:   conforms_to: U P2)
 extension Super: P2 where T: P2, U: P2 {
     typealias A = T
     typealias B = T
@@ -114,7 +114,7 @@ extension Super: P2 where T: P2, U: P2 {
 // CHECK-NEXT:       (assoc_type req=A type=Super<T, U>.A)
 // CHECK-NEXT:       (assoc_type req=B type=Super<T, U>.B)
 // CHECK-NEXT:       (abstract_conformance protocol=P2)
-// CHECK:            (abstract_conformance protocol=P2)
-// CHECK:            conforms_to: T P2
-// CHECK:            conforms_to: U P2)))
+// CHECK-NEXT:       (abstract_conformance protocol=P2)
+// CHECK-NEXT:       conforms_to: T P2
+// CHECK-NEXT:       conforms_to: U P2)))
 class Sub: Super<NonRecur, Recur> {}