diff options
| author | Richard Henderson <rth@redhat.com> | 2001-03-28 00:59:30 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2001-03-28 00:59:30 -0800 |
| commit | ce1c98ea459813570b4588427030daa03958fda6 (patch) | |
| tree | 4e0cd6667d1a644a7351591937d44f5c7b75db48 /gcc/java/decl.c | |
| parent | da7da8f9773d5e6b2edde3d332df6f2f85ed3c51 (diff) | |
| download | gcc-ce1c98ea459813570b4588427030daa03958fda6.zip gcc-ce1c98ea459813570b4588427030daa03958fda6.tar.gz gcc-ce1c98ea459813570b4588427030daa03958fda6.tar.bz2 | |
java-tree.h (throw_node): Define as a single member of java_global_trees instead of a separate array.
* java-tree.h (throw_node): Define as a single member of
java_global_trees instead of a separate array.
(JTI_THROW_NODE): New.
* decl.c (throw_node): Don't declare.
(init_decl_processing): Init a scalar throw_node.
Don't register it for gc.
* check-init.c (check_init): Reference scalar throw_node.
* expr.c (build_java_athrow): Likewise.
* jcf-write.c (generate_bytecode_insns): Likewise.
* parse.h (BUILD_THROW): Likewise.
From-SVN: r40922
Diffstat (limited to 'gcc/java/decl.c')
| -rw-r--r-- | gcc/java/decl.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c index c81c342..c0b67b2 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -72,8 +72,6 @@ tree decl_map; static tree pending_local_decls = NULL_TREE; -tree throw_node [2]; - /* Push a local variable or stack slot into the decl_map, and assign it an rtl. */ @@ -727,18 +725,13 @@ init_decl_processing () t), 0, NOT_BUILT_IN, NULL_PTR); - throw_node[0] = builtin_function ("_Jv_Throw", - build_function_type (ptr_type_node, t), - 0, NOT_BUILT_IN, NULL_PTR); + throw_node = builtin_function ((USING_SJLJ_EXCEPTIONS + ? "_Jv_Throw" : "_Jv_Sjlj_Throw"), + build_function_type (ptr_type_node, t), + 0, NOT_BUILT_IN, NULL_PTR); /* Mark throw_nodes as `noreturn' functions with side effects. */ - TREE_THIS_VOLATILE (throw_node[0]) = 1; - TREE_SIDE_EFFECTS (throw_node[0]) = 1; - t = tree_cons (NULL_TREE, ptr_type_node, endlink); - throw_node[1] = builtin_function ("_Jv_Sjlj_Throw", - build_function_type (ptr_type_node, t), - 0, NOT_BUILT_IN, NULL_PTR); - TREE_THIS_VOLATILE (throw_node[1]) = 1; - TREE_SIDE_EFFECTS (throw_node[1]) = 1; + TREE_THIS_VOLATILE (throw_node) = 1; + TREE_SIDE_EFFECTS (throw_node) = 1; t = build_function_type (int_type_node, endlink); soft_monitorenter_node = builtin_function ("_Jv_MonitorEnter", t, 0, NOT_BUILT_IN, @@ -884,8 +877,6 @@ init_decl_processing () /* Register nodes with the garbage collector. */ ggc_add_tree_root (java_global_trees, sizeof (java_global_trees) / sizeof (tree)); - ggc_add_tree_root (throw_node, - sizeof (throw_node) / sizeof (tree)); ggc_add_tree_root (predef_filenames, sizeof (predef_filenames) / sizeof (tree)); ggc_add_tree_root (&decl_map, 1); |