[llvm-commits] [llvm-gcc-4.2] r45143 - in /llvm-gcc-4.2/trunk/gcc: llvm-debug.cpp llvm-types.cpp

[Dale Johannesen]

Author: johannes
Date: Mon Dec 17 19:45:00 2007
New Revision: 45143

URL: http://llvm.org/viewvc/llvm-project?rev=45143&view=rev
Log:
the gcc CFE is capable of producing a non-null TYPE_NAME
with a null DECL_NAME in a pathological case.  Allow this.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-types.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=45143&r1=45142&r2=45143&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Mon Dec 17 19:45:00 2007
@@ -141,7 +141,8 @@
   if (Name) {
     if (TREE_CODE(Name) == IDENTIFIER_NODE) {
       return IDENTIFIER_POINTER(Name);
-    } else if (TREE_CODE(Name) == TYPE_DECL && !DECL_IGNORED_P(Name)) {
+    } else if (TREE_CODE(Name) == TYPE_DECL && DECL_NAME(Name) &&
+               !DECL_IGNORED_P(Name)) {
       return IDENTIFIER_POINTER(DECL_NAME(Name));
     }
   }

Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=45143&r1=45142&r2=45143&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Mon Dec 17 19:45:00 2007
@@ -245,7 +245,7 @@
   if (TYPE_NAME(type))
     if (TREE_CODE(TYPE_NAME(type)) == IDENTIFIER_NODE)
       Name = IDENTIFIER_POINTER(TYPE_NAME(type));
-    else 
+    else if (DECL_NAME(TYPE_NAME(type)))
       Name = IDENTIFIER_POINTER(DECL_NAME(TYPE_NAME(type)));
   
   std::string ContextStr;