Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use Mangler to remove '1' from linkage name. 

llvm-svn: 75574
This commit is contained in:
Devang Patel 2009-07-14 00:55:28 +00:00
parent e604b776a7
commit cdfc858ec0
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/CodeGen/AsmPrinter.h
View File

@ -333,10 +333,6 @@ namespace llvm {
/// debug tables. /// debug tables.
void printDeclare(const MachineInstr *MI) const; void printDeclare(const MachineInstr *MI) const;
/// getMangler - Return Mangler used by the AsmPrinter. This is used by
/// DWARF debug info generator.
Mangler *getMangler() { return Mang; }
/// postInstructionAction - Handling printing of items after the /// postInstructionAction - Handling printing of items after the
/// instruction iteself has been printed (e.g. comments) /// instruction iteself has been printed (e.g. comments)
void postInstructionAction(const MachineInstr &MI) const { void postInstructionAction(const MachineInstr &MI) const {

17
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -15,7 +15,6 @@
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineModuleInfo.h"
#include "llvm/Support/Timer.h" #include "llvm/Support/Timer.h"
#include "llvm/Support/Mangler.h"
#include "llvm/System/Path.h" #include "llvm/System/Path.h"
#include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetRegisterInfo.h"
@ -786,12 +785,9 @@ DIE *DwarfDebug::CreateGlobalVariableDIE(CompileUnit *DW_Unit,
AddString(GVDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name); AddString(GVDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
std::string LinkageName; std::string LinkageName;
GV.getLinkageName(LinkageName); GV.getLinkageName(LinkageName);
if (!LinkageName.empty()) { if (!LinkageName.empty())
Mangler *Mg = Asm->getMangler();
assert (Mg && "Unable to find Mangler!");
AddString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string, AddString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
Mg->makeNameProper(LinkageName)); LinkageName);
}
AddType(DW_Unit, GVDie, GV.getType()); AddType(DW_Unit, GVDie, GV.getType());
if (!GV.isLocalToUnit()) if (!GV.isLocalToUnit())
AddUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1); AddUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
@ -859,14 +855,9 @@ DIE *DwarfDebug::CreateSubprogramDIE(CompileUnit *DW_Unit,
std::string LinkageName; std::string LinkageName;
SP.getLinkageName(LinkageName); SP.getLinkageName(LinkageName);
if (!LinkageName.empty())
if (!LinkageName.empty()) {
Mangler *Mg = Asm->getMangler();
assert (Mg && "Unable to find Mangler!");
AddString(SPDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string, AddString(SPDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
Mg->makeNameProper(LinkageName)); LinkageName);
}
AddSourceLine(SPDie, &SP); AddSourceLine(SPDie, &SP);
DICompositeType SPTy = SP.getType(); DICompositeType SPTy = SP.getType();