godump.c (go_format_type): Check for invalid type names, pointer target types,…

godump.c (go_format_type): Check for invalid type names, pointer target types, and struct field types.

	* godump.c (go_format_type): Check for invalid type names, pointer
	target types, and struct field types.

From-SVN: r174253

gcc/ChangeLog

+2011-05-25  Ian Lance Taylor  <iant@google.com>
+
+	* godump.c (go_format_type): Check for invalid type names, pointer
+	target types, and struct field types.
+
 2011-05-25  Jason Merrill  <jason@redhat.com>
 
 	* print-tree.c (print_node): Only look at TREE_TYPE if TS_TYPED.

gcc/godump.c

@@ -532,8 +532,18 @@ go_format_type (struct godump_container *container, tree type,
       break;
 
     case TYPE_DECL:
+      {
+	void **slot;
+
+	slot = htab_find_slot (container->invalid_hash,
+			       IDENTIFIER_POINTER (DECL_NAME (type)),
+			       NO_INSERT);
+	if (slot != NULL)
+	  ret = false;
+
 	obstack_1grow (ob, '_');
 	go_append_string (ob, DECL_NAME (type));
+      }
       break;
 
     case INTEGER_TYPE:
@@ -604,32 +614,29 @@ go_format_type (struct godump_container *container, tree type,
 		      == FUNCTION_TYPE))))
         {
 	  tree name;
+	  void **slot;
 
 	  name = TYPE_NAME (TREE_TYPE (type));
-	  if (TREE_CODE (name) == IDENTIFIER_NODE)
-	    {
+	  if (TREE_CODE (name) == TYPE_DECL)
+	    name = DECL_NAME (name);
+
+	  slot = htab_find_slot (container->invalid_hash,
+				 IDENTIFIER_POINTER (name), NO_INSERT);
+	  if (slot != NULL)
+	    ret = false;
+
 	  obstack_grow (ob, "*_", 2);
 	  go_append_string (ob, name);
 
-	      /* The pointer here can be used without the struct or
-		 union definition.  So this struct or union is a a
-		 potential dummy type.  */
+	  /* The pointer here can be used without the struct or union
+	     definition.  So this struct or union is a potential dummy
+	     type.  */
 	  if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (type)))
 	    pointer_set_insert (container->pot_dummy_types,
 				IDENTIFIER_POINTER (name));
 
 	  return ret;
         }
-	  else if (TREE_CODE (name) == TYPE_DECL)
-	    {
-	      obstack_grow (ob, "*_", 2);
-	      go_append_string (ob, DECL_NAME (name));
-	      if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (type)))
-		pointer_set_insert (container->pot_dummy_types,
-				    IDENTIFIER_POINTER (DECL_NAME (name)));
-	      return ret;
-	    }
-        }
       if (TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE)
 	obstack_grow (ob, "func", 4);
       else
@@ -716,18 +723,22 @@ go_format_type (struct godump_container *container, tree type,
 			    && (TREE_CODE (TREE_TYPE (TREE_TYPE (field)))
                                 == FUNCTION_TYPE))))
 		  {
-		    tree name = TYPE_NAME (TREE_TYPE (field));
-		    if (TREE_CODE (name) == IDENTIFIER_NODE)
-		      {
+		    tree name;
+		    void **slot;
+
+		    name = TYPE_NAME (TREE_TYPE (field));
+		    if (TREE_CODE (name) == TYPE_DECL)
+		      name = DECL_NAME (name);
+
+		    slot = htab_find_slot (container->invalid_hash,
+					   IDENTIFIER_POINTER (name),
+					   NO_INSERT);
+		    if (slot != NULL)
+		      ret = false;
+
 		    obstack_1grow (ob, '_');
 		    go_append_string (ob, name);
 		  }
-		    else if (TREE_CODE (name) == TYPE_DECL)
-		      {
-			obstack_1grow (ob, '_');
-			go_append_string (ob, DECL_NAME (name));
-		      }
-		  }
 		else
 		  {
 		    if (!go_format_type (container, TREE_TYPE (field), true,