[llvm-commits] [llvm-gcc-4.2] r64732 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp

[Bill Wendling]

Author: void
Date: Mon Feb 16 20:54:14 2009
New Revision: 64732

URL: http://llvm.org/viewvc/llvm-project?rev=64732&view=rev
Log:
Pull r64704 into Dib:

Use appropriate constructor and destructor names in debug info entry.

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

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

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp Mon Feb 16 20:54:14 2009
@@ -221,12 +221,13 @@
                                   BasicBlock *CurBB) {
   // Gather location information.
   expanded_location Loc = GetNodeLocation(FnDecl, false);
-  const char *FnName = GetNodeName(FnDecl);
   const char *LinkageName = getLinkageName(FnDecl);
 
   DISubprogram SP = 
     DebugFactory.CreateSubprogram(findRegion(FnDecl),
-                                  FnName, FnName, LinkageName,
+                                  lang_hooks.dwarf_name(FnDecl, 0),
+                                  lang_hooks.dwarf_name(FnDecl, 0),
+                                  LinkageName,
                                   getOrCreateCompileUnit(Loc.file), CurLineNo,
                                   getOrCreateType(TREE_TYPE(FnDecl)),
                                   Fn->hasInternalLinkage(),
@@ -596,7 +597,7 @@
        Member = TREE_CHAIN(Member)) {
     // Should we skip.
     if (DECL_P(Member) && DECL_IGNORED_P(Member)) continue;
-    
+
     if (TREE_CODE(Member) == FIELD_DECL) {
       
       if (DECL_FIELD_OFFSET(Member) == 0 ||
@@ -639,11 +640,12 @@
        Member = TREE_CHAIN(Member)) {
     
     if (DECL_ABSTRACT_ORIGIN (Member)) continue;
-    
+    if (DECL_ARTIFICIAL (Member)) continue;
+
     // Get the location of the member.
     expanded_location MemLoc = GetNodeLocation(Member, false);
     
-    const char *MemberName = GetNodeName(Member);                
+    const char *MemberName = lang_hooks.dwarf_name(Member, 0);        
     const char *LinkageName = getLinkageName(Member);
     DIType SPTy = getOrCreateType(TREE_TYPE(Member));
     DISubprogram SP =