OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

constants.c (build_constant_data_ref): Make sure we only build one copy of the decl for the constant pool. 

2008-10-14  Andrew Haley  <aph@redhat.com>

        * constants.c (build_constant_data_ref): Make sure we only build
        one copy of the decl for the constant pool.

From-SVN: r141133
This commit is contained in:
Andrew Haley 2008-10-15 12:16:35 +00:00 committed by Andrew Haley
parent f6e6e9904c
commit 307233c206
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2008-10-14 Andrew Haley <aph@redhat.com>
* constants.c (build_constant_data_ref): Make sure we only build
one copy of the decl for the constant pool.
2008-09-22 Andrew Haley <aph@redhat.com>
* expr.c (rules): Add new rule for

26
gcc/java/constants.c
View File

@ -448,21 +448,25 @@ build_constant_data_ref (bool indirect)
}
else
{
tree type, decl;
tree decl_name = mangled_classname ("_CD_", output_class);
tree decl = IDENTIFIER_GLOBAL_VALUE (decl_name);
/* Build a type with unspecified bounds. The will make sure
that targets do the right thing with whatever size we end
up with at the end. Using bounds that are too small risks
assuming the data is in the small data section. */
type = build_array_type (ptr_type_node, NULL_TREE);
if (! decl)
{
/* Build a type with unspecified bounds. The will make sure
that targets do the right thing with whatever size we end
up with at the end. Using bounds that are too small risks
assuming the data is in the small data section. */
tree type = build_array_type (ptr_type_node, NULL_TREE);
/* We need to lay out the type ourselves, since build_array_type
thinks the type is incomplete. */
layout_type (type);
/* We need to lay out the type ourselves, since build_array_type
thinks the type is incomplete. */
layout_type (type);
decl = build_decl (VAR_DECL, decl_name, type);
TREE_STATIC (decl) = 1;
decl = build_decl (VAR_DECL, decl_name, type);
TREE_STATIC (decl) = 1;
IDENTIFIER_GLOBAL_VALUE (decl_name) = decl;
}
return decl;
}