minor tidying, only do work if a function is

actually X86_StdCall or X86_FastCall.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98374 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 4 insertions, 6 deletions

diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index b879d48..cc80e20 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -61,10 +61,8 @@ MCSymbol *X86AsmPrinter::GetGlobalValueSymbol(const GlobalValue *GV) const {
   
   X86COFFMachineModuleInfo &COFFMMI =
     MMI->getObjFileInfo<X86COFFMachineModuleInfo>();
-  COFFMMI.DecorateCygMingName(Symb, OutContext, cast<Function>(GV),
-                              *TM.getTargetData());
-
-  return Symb;
+  return COFFMMI.DecorateCygMingName(Symb, OutContext, cast<Function>(GV),
+                                     *TM.getTargetData());
 }
 
 /// runOnMachineFunction - Emit the function body.
diff --git a/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp b/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
index 8dabaac..537d442 100644
--- a/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
+++ b/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
@@ -65,8 +65,8 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
     MCSymbol *Sym = Mang->getSymbol(GV);
     X86COFFMachineModuleInfo &COFFMMI = 
     AsmPrinter.MMI->getObjFileInfo<X86COFFMachineModuleInfo>();
-    COFFMMI.DecorateCygMingName(Sym, Ctx, cast<Function>(GV),
-                                *AsmPrinter.TM.getTargetData());
+    Sym = COFFMMI.DecorateCygMingName(Sym, Ctx, cast<Function>(GV),
+                                      *AsmPrinter.TM.getTargetData());
     Name.append(Sym->getName().begin(), Sym->getName().end());
   } else {    
     const GlobalValue *GV = MO.getGlobal();