[llvm-branch-commits] [llvm-gcc-branch] r93938 - /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Tue Jan 19 16:50:22 2010
New Revision: 93938

URL: http://llvm.org/viewvc/llvm-project?rev=93938&view=rev
Log:
Merge 93936 from mainline.

Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp?rev=93938&r1=93937&r2=93938&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp Tue Jan 19 16:50:22 2010
@@ -308,7 +308,7 @@
       && DECL_ABSTRACT_ORIGIN (FnDecl) != FnDecl)
     ArtificialFnWithAbstractOrigin = true;
 
-  const char *FnName = lang_hooks.dwarf_name(FnDecl, 0);
+  StringRef FnName = GetNodeName(FnDecl);
   DISubprogram SP = 
     DebugFactory.CreateSubprogram(ArtificialFnWithAbstractOrigin ?
                                   getOrCreateCompileUnit(main_input_filename) :
@@ -922,7 +922,7 @@
     else {
       // Get the location of the member.
       expanded_location MemLoc = GetNodeLocation(Member, false);
-      const char *MemberName = lang_hooks.dwarf_name(Member, 0);        
+      StringRef MemberName = GetNodeName(Member);        
       StringRef LinkageName = getLinkageName(Member);
       DIType SPTy = getOrCreateType(TREE_TYPE(Member));
       unsigned Virtuality = 0;