pass around MF, not MMI.

llvm-svn: 108949

2 files changed, 5 insertions, 5 deletions

diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index b02e5a35946..955b9fe7469 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -30,17 +30,17 @@ using namespace llvm;
 
 X86MCInstLower::X86MCInstLower(MCContext &ctx, Mangler *mang,
                                X86AsmPrinter &asmprinter)
-: Ctx(ctx), Mang(mang), AsmPrinter(asmprinter), MMI(AsmPrinter.MMI) {}
+: Ctx(ctx), Mang(mang), AsmPrinter(asmprinter), MF(*AsmPrinter.MF) {}
 
 MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const {
-  return MMI->getObjFileInfo<MachineModuleInfoMachO>(); 
+  return MF.getMMI().getObjFileInfo<MachineModuleInfoMachO>();
 }
 
 
 MCSymbol *X86MCInstLower::GetPICBaseSymbol() const {
   const TargetLowering *TLI = AsmPrinter.TM.getTargetLowering();
   return static_cast<const X86TargetLowering*>(TLI)->
-    getPICBaseSymbol(AsmPrinter.MF, Ctx);
+    getPICBaseSymbol(&MF, Ctx);
 }
 
 /// GetSymbolFromOperand - Lower an MO_GlobalAddress or MO_ExternalSymbol
diff --git a/llvm/lib/Target/X86/X86MCInstLower.h b/llvm/lib/Target/X86/X86MCInstLower.h
index 70702bcb62e..2dd65046131 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.h
+++ b/llvm/lib/Target/X86/X86MCInstLower.h
@@ -18,7 +18,7 @@ namespace llvm {
   class MCOperand;
   class MCSymbol;
   class MachineInstr;
-  class MachineModuleInfo;
+  class MachineFunction;
   class MachineModuleInfoMachO;
   class MachineOperand;
   class Mangler;
@@ -29,7 +29,7 @@ class LLVM_LIBRARY_VISIBILITY X86MCInstLower {
   MCContext &Ctx;
   Mangler *Mang;
   X86AsmPrinter &AsmPrinter;
-  MachineModuleInfo *MMI;
+  const MachineFunction &MF;
 public:
   X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter);