[SIL] NFC: Improved block id printing.

Author: nate-chandler

include/swift/SIL/SILBasicBlock.h

@@ -518,13 +518,13 @@ public SwiftObjectHeader {
 
 #ifndef NDEBUG
   /// Print the ID of the block, bbN.
-  void dumpID() const;
+  void dumpID(bool newline = true) const;
 
   /// Print the ID of the block with \p OS, bbN.
-  void printID(llvm::raw_ostream &OS) const;
+  void printID(llvm::raw_ostream &OS, bool newline = true) const;
 
   /// Print the ID of the block with \p Ctx, bbN.
-  void printID(SILPrintContext &Ctx) const;
+  void printID(SILPrintContext &Ctx, bool newline = true) const;
 #endif
 
   /// getSublistAccess() - returns pointer to member of instruction list

lib/SIL/IR/SILPrinter.cpp

@@ -853,8 +853,11 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
   }
 
 #ifndef NDEBUG
-  void printID(const SILBasicBlock *BB) {
-    *this << Ctx.getID(BB) << "\n";
+  void printID(const SILBasicBlock *BB, bool newline) {
+    *this << Ctx.getID(BB);
+    if (newline) {
+      *this << "\n";
+    }
   }
 #endif
 
@@ -3108,17 +3111,17 @@ void SILBasicBlock::print(SILPrintContext &Ctx) const {
 }
 
 #ifndef NDEBUG
-void SILBasicBlock::dumpID() const {
-  printID(llvm::errs());
+void SILBasicBlock::dumpID(bool newline) const {
+  printID(llvm::errs(), newline);
 }
 
-void SILBasicBlock::printID(llvm::raw_ostream &OS) const {
+void SILBasicBlock::printID(llvm::raw_ostream &OS, bool newline) const {
   SILPrintContext Ctx(OS);
-  printID(Ctx);
+  printID(Ctx, newline);
 }
 
-void SILBasicBlock::printID(SILPrintContext &Ctx) const {
-  SILPrinter(Ctx).printID(this);
+void SILBasicBlock::printID(SILPrintContext &Ctx, bool newline) const {
+  SILPrinter(Ctx).printID(this, newline);
 }
 #endif