[llvm-commits] [llvm-gcc-4.2] r69067 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Tue Apr 14 13:59:21 2009
New Revision: 69067

URL: http://llvm.org/viewvc/llvm-project?rev=69067&view=rev
Log:
Revert 68848.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=69067&r1=69066&r2=69067&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Tue Apr 14 13:59:21 2009
@@ -190,7 +190,7 @@
       return IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(Node));
     } 
   }
-  return NULL;
+  return "";
 }
 
 DebugInfo::DebugInfo(Module *m)
@@ -211,11 +211,12 @@
   // Gather location information.
   expanded_location Loc = GetNodeLocation(FnDecl, false);
   const char *LinkageName = getLinkageName(FnDecl);
-  const char *FnName = lang_hooks.dwarf_name(FnDecl, 0);
+
   DISubprogram SP = 
     DebugFactory.CreateSubprogram(findRegion(FnDecl),
-                                  FnName, FnName,
-                                  LinkageName ? LinkageName : FnName,
+                                  lang_hooks.dwarf_name(FnDecl, 0),
+                                  lang_hooks.dwarf_name(FnDecl, 0),
+                                  LinkageName,
                                   getOrCreateCompileUnit(Loc.file), CurLineNo,
                                   getOrCreateType(TREE_TYPE(FnDecl)),
                                   Fn->hasInternalLinkage(),
@@ -344,11 +345,11 @@
     if (IDENTIFIER_POINTER(DECL_NAME(decl)))
       DispName = IDENTIFIER_POINTER(DECL_NAME(decl));
   }
-  const char *LinkageName = getLinkageName(decl);
+    
   DebugFactory.CreateGlobalVariable(getOrCreateCompileUnit(Loc.file), 
                                     GV->getNameStr(), 
                                     DispName,
-                                    LinkageName ? LinkageName : DispName,
+                                    getLinkageName(decl), 
                                     getOrCreateCompileUnit(Loc.file), Loc.line,
                                     TyD, GV->hasInternalLinkage(),
                                     true/*definition*/, GV);
@@ -667,7 +668,7 @@
     DIType SPTy = getOrCreateType(TREE_TYPE(Member));
     DISubprogram SP = 
       DebugFactory.CreateSubprogram(findRegion(Member), MemberName, MemberName,
-                                    LinkageName ? LinkageName : MemberName, 
+                                    LinkageName, 
                                     getOrCreateCompileUnit(MemLoc.file),
                                     MemLoc.line, SPTy, false, false);
     EltTys.push_back(SP);