From 0c13cf36adf5dc7560523c5cde7dfbbe32bdbe9e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 20 Jul 2010 22:26:07 +0000 Subject: [PATCH] pass around MF, not MMI. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108949 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86MCInstLower.cpp | 6 +++--- lib/Target/X86/X86MCInstLower.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Target/X86/X86MCInstLower.cpp b/lib/Target/X86/X86MCInstLower.cpp index b02e5a35946..955b9fe7469 100644 --- a/lib/Target/X86/X86MCInstLower.cpp +++ b/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(); + return MF.getMMI().getObjFileInfo(); } MCSymbol *X86MCInstLower::GetPICBaseSymbol() const { const TargetLowering *TLI = AsmPrinter.TM.getTargetLowering(); return static_cast(TLI)-> - getPICBaseSymbol(AsmPrinter.MF, Ctx); + getPICBaseSymbol(&MF, Ctx); } /// GetSymbolFromOperand - Lower an MO_GlobalAddress or MO_ExternalSymbol diff --git a/lib/Target/X86/X86MCInstLower.h b/lib/Target/X86/X86MCInstLower.h index 70702bcb62e..2dd65046131 100644 --- a/lib/Target/X86/X86MCInstLower.h +++ b/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);