summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp7
-rw-r--r--llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp7
-rw-r--r--llvm/lib/Target/X86/X86COFFMachineModuleInfo.h4
3 files changed, 8 insertions, 10 deletions
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index cc80e20fb1c..517d3366c5c 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -59,10 +59,9 @@ MCSymbol *X86AsmPrinter::GetGlobalValueSymbol(const GlobalValue *GV) const {
if (!Subtarget->isTargetCygMing() || !isa<Function>(GV))
return Symb;
- X86COFFMachineModuleInfo &COFFMMI =
- MMI->getObjFileInfo<X86COFFMachineModuleInfo>();
- return COFFMMI.DecorateCygMingName(Symb, OutContext, cast<Function>(GV),
- *TM.getTargetData());
+ return X86COFFMachineModuleInfo::
+ DecorateCygMingName(Symb, OutContext, cast<Function>(GV),
+ *TM.getTargetData());
}
/// runOnMachineFunction - Emit the function body.
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
index 537d44222f0..7b8c479c5b9 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
@@ -63,10 +63,9 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
isa<Function>(MO.getGlobal())) {
const GlobalValue *GV = MO.getGlobal();
MCSymbol *Sym = Mang->getSymbol(GV);
- X86COFFMachineModuleInfo &COFFMMI =
- AsmPrinter.MMI->getObjFileInfo<X86COFFMachineModuleInfo>();
- Sym = COFFMMI.DecorateCygMingName(Sym, Ctx, cast<Function>(GV),
- *AsmPrinter.TM.getTargetData());
+ Sym = X86COFFMachineModuleInfo::
+ DecorateCygMingName(Sym, Ctx, cast<Function>(GV),
+ *AsmPrinter.TM.getTargetData());
Name.append(Sym->getName().begin(), Sym->getName().end());
} else {
const GlobalValue *GV = MO.getGlobal();
diff --git a/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h b/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h
index d07f0733535..27f82874ee7 100644
--- a/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h
+++ b/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h
@@ -30,8 +30,8 @@ public:
X86COFFMachineModuleInfo(const MachineModuleInfo &) {}
virtual ~X86COFFMachineModuleInfo();
- MCSymbol *DecorateCygMingName(MCSymbol *Name, MCContext &Ctx,
- const Function *F, const TargetData &TD);
+ static MCSymbol *DecorateCygMingName(MCSymbol *Name, MCContext &Ctx,
+ const Function *F, const TargetData &TD);
void addExternalFunction(StringRef Name) {
CygMingStubs.insert(Name);
OpenPOWER on IntegriCloud