diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index f0aa304a8bb..6238d16f37f 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1639,8 +1639,8 @@ void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB,
     if (const BasicBlock *BB = MBB->getBasicBlock())
       if (BB->hasName()) {
         O.PadToColumn(TAI->getCommentColumn(), 1);
-        O << TAI->getCommentString() << ' '
-          << MBB->getBasicBlock()->getName();
+        O << TAI->getCommentString() << ' ';
+        WriteAsOperand(O, BB, /*PrintType=*/false);
       }
 
     if (printColon)
diff --git a/test/CodeGen/X86/loop-hoist.ll b/test/CodeGen/X86/loop-hoist.ll
index 4edb0884a6b..cf63f30265a 100644
--- a/test/CodeGen/X86/loop-hoist.ll
+++ b/test/CodeGen/X86/loop-hoist.ll
@@ -4,7 +4,7 @@
 
 ; CHECK: _foo:
 ; CHECK:    L_Arr$non_lazy_ptr
-; CHECK: LBB1_1:	## cond_true
+; CHECK: LBB1_1:	## %cond_true
 
 @Arr = external global [0 x i32]		; <[0 x i32]*> [#uses=1]