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

java-tree.h (struct lang_decl_func): Change type of throws_list field to a VEC. 

* java-tree.h (struct lang_decl_func): Change type of throws_list
	field to a VEC.
	* jcf-parse.c (HANDLE_EXCEPTIONS_ATTRIBUTE): Adjust for changed type
	of DECL_FUNCTION_THROWS.
	* class.c (make_method_value): Likewise.

From-SVN: r159899
This commit is contained in:
Nathan Froyd 2010-05-26 19:27:58 +00:00 committed by Nathan Froyd
parent ab9b814d25
commit 6484716cf6
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/java/ChangeLog
View File

@ -1,3 +1,11 @@
2010-05-26 Nathan Froyd <froydnj@codesourcery.com>
* java-tree.h (struct lang_decl_func): Change type of throws_list
field to a VEC.
* jcf-parse.c (HANDLE_EXCEPTIONS_ATTRIBUTE): Adjust for changed type
of DECL_FUNCTION_THROWS.
* class.c (make_method_value): Likewise.
2010-05-26 Nathan Froyd <froydnj@codesourcery.com>
* class.c (utf8_decl_list): Delete.

15
gcc/java/class.c
View File

@ -1519,18 +1519,19 @@ make_method_value (tree mdecl)
{
/* Compute the `throws' information for the method. */
tree table = null_pointer_node;
if (DECL_FUNCTION_THROWS (mdecl) != NULL_TREE)
if (DECL_FUNCTION_THROWS (mdecl) != NULL)
{
int length = 1 + list_length (DECL_FUNCTION_THROWS (mdecl));
tree iter, type, array;
int length = 1 + VEC_length (tree, DECL_FUNCTION_THROWS (mdecl));
tree t, type, array;
char buf[60];
unsigned ix;
table = tree_cons (NULL_TREE, table, NULL_TREE);
for (iter = DECL_FUNCTION_THROWS (mdecl);
iter != NULL_TREE;
iter = TREE_CHAIN (iter))
for (ix = 0;
VEC_iterate (tree, DECL_FUNCTION_THROWS (mdecl), ix, t);
ix++)
{
tree sig = DECL_NAME (TYPE_NAME (TREE_VALUE (iter)));
tree sig = DECL_NAME (TYPE_NAME (t));
tree utf8
= build_utf8_ref (unmangle_classname (IDENTIFIER_POINTER (sig),
IDENTIFIER_LENGTH (sig)));

2
gcc/java/java-tree.h
View File

@ -776,7 +776,7 @@ struct GTY(()) lang_decl_func {
int max_stack;
int arg_slot_count;
source_location last_line; /* End line number for a function decl */
tree throws_list; /* Exception specified by `throws' */
VEC(tree,gc) *throws_list; /* Exception specified by `throws' */
tree exc_obj; /* Decl holding the exception object. */
/* Class initialization test variables */

7
gcc/java/jcf-parse.c
View File

@ -936,13 +936,14 @@ handle_signature_attribute (int member_index, JCF *jcf,
#define HANDLE_EXCEPTIONS_ATTRIBUTE(COUNT) \
{ \
int n = COUNT; \
tree list = DECL_FUNCTION_THROWS (current_method); \
VEC (tree,gc) *v = VEC_alloc (tree, gc, n); \
gcc_assert (DECL_FUNCTION_THROWS (current_method) == NULL); \
while (--n >= 0) \
{ \
tree thrown_class = get_class_constant (jcf, JCF_readu2 (jcf)); \
list = tree_cons (NULL_TREE, thrown_class, list); \
VEC_quick_push (tree, v, thrown_class); \
} \
DECL_FUNCTION_THROWS (current_method) = nreverse (list); \
DECL_FUNCTION_THROWS (current_method) = v; \
}
#define HANDLE_DEPRECATED_ATTRIBUTE() handle_deprecated ()