--- Merging (from foreign repository) r65475 into '.':
U gcc/llvm-debug.cpp
Use original name if is available.
Thanks Dale!
llvm-svn: 65477
diff --git a/llvm-gcc-4.2/gcc/llvm-debug.cpp b/llvm-gcc-4.2/gcc/llvm-debug.cpp
index bf11d6a..c4ec0ff 100644
--- a/llvm-gcc-4.2/gcc/llvm-debug.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-debug.cpp
@@ -340,8 +340,15 @@
// Gather location information.
expanded_location Loc = expand_location(DECL_SOURCE_LOCATION(decl));
DIType TyD = getOrCreateType(TREE_TYPE(decl));
+ std::string DispName = GV->getNameStr();
+ if (DECL_NAME(decl)) {
+ if (IDENTIFIER_POINTER(DECL_NAME(decl)))
+ DispName = IDENTIFIER_POINTER(DECL_NAME(decl));
+ }
+
DebugFactory.CreateGlobalVariable(getOrCreateCompileUnit(Loc.file),
- GV->getNameStr(), GV->getNameStr(),
+ GV->getNameStr(),
+ DispName,
getLinkageName(decl),
getOrCreateCompileUnit(Loc.file), Loc.line,
TyD, GV->hasInternalLinkage(),
