procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

godump.c (go_output_var): Don't output the variable if there is already a type with the same name.

Browse source 
* godump.c (go_output_var): Don't output the variable if there is
	already a type with the same name.

From-SVN: r168683
This commit is contained in:
Ian Lance Taylor 2011-01-11 22:58:35 +00:00 • committed by Ian Lance Taylor
parent fa3e04d2db
commit 4053a5a0af
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2011-01-11 Ian Lance Taylor <iant@google.com>
* godump.c (go_output_var): Don't output the variable if there is
already a type with the same name.
2011-01-11 Ian Lance Taylor <iant@google.com>
* godump.c (go_format_type): Don't generate float80.

16
gcc/godump.c
View file

@ -715,13 +715,27 @@ go_output_typedef (struct godump_container *container, tree decl)
static void
go_output_var (struct godump_container *container, tree decl)
{
bool is_valid;
if (pointer_set_contains (container->decls_seen, decl)
|| pointer_set_contains (container->decls_seen, DECL_NAME (decl)))
return;
pointer_set_insert (container->decls_seen, decl);
pointer_set_insert (container->decls_seen, DECL_NAME (decl));
if (!go_format_type (container, TREE_TYPE (decl), true, false))
is_valid = go_format_type (container, TREE_TYPE (decl), true, false);
if (is_valid
&& htab_find_slot (container->type_hash,
IDENTIFIER_POINTER (DECL_NAME (decl)),
NO_INSERT) != NULL)
{
/* There is already a type with this name, probably from a
struct tag. Prefer the type to the variable. */
is_valid = false;
}
if (!is_valid)
fprintf (go_dump_file, "// ");
fprintf (go_dump_file, "var _%s ",
IDENTIFIER_POINTER (DECL_NAME (decl)));
go_output_type (container);