From 662316c997e4eb8c3fdec6999b3e9da03620847a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 14 Sep 2009 03:15:54 +0000 Subject: [PATCH] PIC16 does allow colon after MBB labels, simplify EmitBasicBlockStart. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81755 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/AsmPrinter.h | 3 +-- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 ++----- lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index 65090adfc68..decbea73197 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -353,8 +353,7 @@ namespace llvm { /// EmitBasicBlockStart - This method prints the label for the specified /// MachineBasicBlock, an alignment (if present) and a comment describing /// it if appropriate. - void EmitBasicBlockStart(const MachineBasicBlock *MBB, - bool printColon = true) const; + void EmitBasicBlockStart(const MachineBasicBlock *MBB) const; protected: /// EmitZeros - Emit a block of zeros. /// diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 6249cda695b..265a837822f 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1648,15 +1648,12 @@ MCSymbol *AsmPrinter::GetMBBSymbol(unsigned MBBID) const { /// EmitBasicBlockStart - This method prints the label for the specified /// MachineBasicBlock, an alignment (if present) and a comment describing /// it if appropriate. -void AsmPrinter::EmitBasicBlockStart(const MachineBasicBlock *MBB, - bool PrintColon) const { +void AsmPrinter::EmitBasicBlockStart(const MachineBasicBlock *MBB) const { if (unsigned Align = MBB->getAlignment()) EmitAlignment(Log2_32(Align)); GetMBBSymbol(MBB->getNumber())->print(O, MAI); - - if (PrintColon) - O << ':'; + O << ':'; if (VerboseAsm) { if (const BasicBlock *BB = MBB->getBasicBlock()) diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp index 523c27cefe7..795b79ad53b 100644 --- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp +++ b/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()) { - EmitBasicBlockStart(I, false); + EmitBasicBlockStart(I); O << '\n'; }