replace printBasicBlockLabel with EmitBasicBlockStart,

now that printBasicBlockLabel is only used for starting
a MBB.  This allows elimination of a bunch of arguments.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81684 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/CodeGen/AsmPrinter.h

@@ -350,12 +350,11 @@ namespace llvm {
     /// block label.
     MCSymbol *GetMBBSymbol(unsigned MBBID) const;
     
-    /// printBasicBlockLabel - This method prints the label for the specified
+    /// EmitBasicBlockStart - This method prints the label for the specified
-    /// MachineBasicBlock
+    /// MachineBasicBlock, an alignment (if present) and a comment describing
-    void printBasicBlockLabel(const MachineBasicBlock *MBB,
+    /// it if appropriate.
-                              bool printAlign = false,
+    void EmitBasicBlockStart(const MachineBasicBlock *MBB,
-                              bool printColon = false,
+                              bool printColon = true) const;
-                              bool printComment = true) const;
   protected:
     /// EmitZeros - Emit a block of zeros.
     ///

lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -1644,22 +1644,20 @@ MCSymbol *AsmPrinter::GetMBBSymbol(unsigned MBBID) const {
 }
 
 
-/// printBasicBlockLabel - This method prints the label for the specified
+/// EmitBasicBlockStart - This method prints the label for the specified
-/// MachineBasicBlock
+/// MachineBasicBlock, an alignment (if present) and a comment describing
-void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB,
+/// it if appropriate.
-                                      bool printAlign, bool printColon,
+void AsmPrinter::EmitBasicBlockStart(const MachineBasicBlock *MBB,
-                                      bool printComment) const {
+                                     bool PrintColon) const {
-  if (printAlign) {
+  if (unsigned Align = MBB->getAlignment())
-    unsigned Align = MBB->getAlignment();
-    if (Align)
     EmitAlignment(Log2_32(Align));
-  }
 
   GetMBBSymbol(MBB->getNumber())->print(O, MAI);
   
-  if (printColon)
+  if (PrintColon)
     O << ':';
-  if (printComment) {
+  
+  if (VerboseAsm) {
     if (const BasicBlock *BB = MBB->getBasicBlock())
       if (BB->hasName()) {
         O.PadToColumn(MAI->getCommentColumn());
@@ -1667,7 +1665,6 @@ void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB,
         WriteAsOperand(O, BB, /*PrintType=*/false);
       }
 
-    if (printColon)
     EmitComments(*MBB);
   }
 }

lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp

@@ -282,7 +282,7 @@ bool ARMAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();

lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp

@@ -170,7 +170,7 @@ bool AlphaAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   for (MachineFunction::const_iterator I = MF.begin(), E = MF.end();
        I != E; ++I) {
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();

lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp

@@ -137,7 +137,7 @@ bool BlackfinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
       // This is an entry block or a block that's only reachable via a
       // fallthrough edge. In non-VerboseAsm mode, don't print the label.
     } else {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
 

lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp

@@ -463,7 +463,7 @@ bool LinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();

lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp

@@ -126,7 +126,7 @@ bool MSP430AsmPrinter::runOnMachineFunction(MachineFunction &MF) {
       // This is an entry block or a block that's only reachable via a
       // fallthrough edge. In non-VerboseAsm mode, don't print the label.
     } else {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
 

lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp

@@ -270,7 +270,7 @@ bool MipsAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
 
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
 

lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp

@@ -98,7 +98,7 @@ bool PIC16AsmPrinter::runOnMachineFunction(MachineFunction &MF) {
 
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true);
+      EmitBasicBlockStart(I, false);
       O << '\n';
     }
     

lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp

@@ -670,7 +670,7 @@ bool PPCLinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();
@@ -854,7 +854,7 @@ bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end();

lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp

@@ -122,7 +122,7 @@ bool SparcAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();

lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp

@@ -131,7 +131,7 @@ bool SystemZAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
       // This is an entry block or a block that's only reachable via a
       // fallthrough edge. In non-VerboseAsm mode, don't print the label.
     } else {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
 

lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

@@ -245,7 +245,7 @@ bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
       // This is an entry block or a block that's only reachable via a
       // fallthrough edge. In non-VerboseAsm mode, don't print the label.
     } else {
-      printBasicBlockLabel(I, true, true, VerboseAsm);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end();

lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp

@@ -170,7 +170,7 @@ bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
        I != E; ++I) {
     // Print a label for the basic block if there are any predecessors.
     if (!I->pred_empty()) {
-      printBasicBlockLabel(I, true, true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }
     for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();

lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp

@@ -273,7 +273,7 @@ bool XCoreAsmPrinter::runOnMachineFunction(MachineFunction &MF)
 
     // Print a label for the basic block.
     if (I != MF.begin()) {
-      printBasicBlockLabel(I, true , true);
+      EmitBasicBlockStart(I);
       O << '\n';
     }