diff --git a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
index 5ccddf57e7ab..252f1c58f1d8 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
@@ -59,7 +59,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
     isImplicitlyPrivate = true;
   
   SmallString<128> Name;
-  Mang->getNameWithPrefix(Name, GV, isImplicitlyPrivate);
+  Mang.getNameWithPrefix(Name, GV, isImplicitlyPrivate);
   
   if (getSubtarget().isTargetCygMing()) {
     X86COFFMachineModuleInfo &COFFMMI = 
@@ -86,7 +86,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
     const MCSymbol *&StubSym = getMachOMMI().getGVStubEntry(Sym);
     if (StubSym == 0) {
       Name.clear();
-      Mang->getNameWithPrefix(Name, GV, false);
+      Mang.getNameWithPrefix(Name, GV, false);
       StubSym = Ctx.GetOrCreateSymbol(Name.str());
     }
     return Sym;
@@ -97,7 +97,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
     const MCSymbol *&StubSym = getMachOMMI().getHiddenGVStubEntry(Sym);
     if (StubSym == 0) {
       Name.clear();
-      Mang->getNameWithPrefix(Name, GV, false);
+      Mang.getNameWithPrefix(Name, GV, false);
       StubSym = Ctx.GetOrCreateSymbol(Name.str());
     }
     return Sym;
@@ -108,7 +108,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
     const MCSymbol *&StubSym = getMachOMMI().getFnStubEntry(Sym);
     if (StubSym == 0) {
       Name.clear();
-      Mang->getNameWithPrefix(Name, GV, false);
+      Mang.getNameWithPrefix(Name, GV, false);
       StubSym = Ctx.GetOrCreateSymbol(Name.str());
     }
     return Sym;
@@ -393,7 +393,7 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
 
 
 void X86AsmPrinter::printInstructionThroughMCStreamer(const MachineInstr *MI) {
-  X86MCInstLower MCInstLowering(OutContext, Mang, *this);
+  X86MCInstLower MCInstLowering(OutContext, *Mang, *this);
   switch (MI->getOpcode()) {
   case TargetInstrInfo::DBG_LABEL:
   case TargetInstrInfo::EH_LABEL:
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h
index fa25b906d543..42442d0a2580 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h
+++ b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h
@@ -27,12 +27,12 @@ namespace llvm {
 /// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst.
 class VISIBILITY_HIDDEN X86MCInstLower {
   MCContext &Ctx;
-  Mangler *Mang;
+  Mangler &Mang;
   X86AsmPrinter &AsmPrinter;
 
   const X86Subtarget &getSubtarget() const;
 public:
-  X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter)
+  X86MCInstLower(MCContext &ctx, Mangler &mang, X86AsmPrinter &asmprinter)
     : Ctx(ctx), Mang(mang), AsmPrinter(asmprinter) {}
   
   void Lower(const MachineInstr *MI, MCInst &OutMI) const;