eliminate the "MBBLabel" MCOperand type, and just use a MCSymbol for

MBB labels like everything else.


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

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp b/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
index ed8207415f..9946506441 100644
--- a/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
+++ b/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
@@ -45,6 +45,16 @@ MCSymbol *X86MCInstLower::GetPICBaseSymbol() const {
   return Ctx.GetOrCreateSymbol(Name.str());
 }
 
+MCOperand X86MCInstLower::LowerMBBOperand(const MachineOperand &MO) const {
+  SmallString<60> Name;
+  raw_svector_ostream(Name) << AsmPrinter.MAI->getPrivateGlobalPrefix() << "BB"
+      << AsmPrinter.getFunctionNumber() << '_' << MO.getMBB()->getNumber();
+
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Name.str());
+  return MCOperand::CreateExpr(MCSymbolRefExpr::Create(Sym, Ctx));
+}
+
+
 
 /// LowerGlobalAddressOperand - Lower an MO_GlobalAddress operand to an
 /// MCOperand.
@@ -331,9 +341,7 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
       MCOp = MCOperand::CreateImm(MO.getImm());
       break;
     case MachineOperand::MO_MachineBasicBlock:
-// FIXME: Kill MBBLabel operand type!
-      MCOp = MCOperand::CreateMBBLabel(AsmPrinter.getFunctionNumber(), 
-                                       MO.getMBB()->getNumber());
+      MCOp = LowerMBBOperand(MO);
       break;
     case MachineOperand::MO_GlobalAddress:
       MCOp = LowerSymbolOperand(MO, GetGlobalAddressSymbol(MO));