diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-04 07:11:05 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-04 07:11:05 +0000 |
| commit | 1f3233d13f58417984cb2239d328b65e8d172744 (patch) | |
| tree | 720630adca0f6b357e05c4feb8cbe33d556925ce /gcc/java/builtins.c | |
| parent | 0dc11899d8781bca1da5f4421327d61890424808 (diff) | |
| download | gcc-1f3233d13f58417984cb2239d328b65e8d172744.tar.gz | |
Merge from pch-branch up to tag pch-commit-20020603.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54232 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/builtins.c')
| -rw-r--r-- | gcc/java/builtins.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index 81be7e3d457..c167df5b16b 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -83,21 +83,21 @@ typedef tree builtin_creator_function PARAMS ((tree, tree)); /* Hold a char*, before initialization, or a tree, after initialization. */ -union string_or_tree +union string_or_tree GTY(()) { - const char *s; - tree t; + const char * GTY ((tag ("0"))) s; + tree GTY ((tag ("1"))) t; }; /* Used to hold a single builtin record. */ -struct builtin_record +struct builtin_record GTY(()) { - union string_or_tree class_name; - union string_or_tree method_name; - builtin_creator_function *creator; + union string_or_tree GTY ((desc ("1"))) class_name; + union string_or_tree GTY ((desc ("1"))) method_name; + builtin_creator_function * GTY((skip (""))) creator; }; -static struct builtin_record java_builtins[] = +static GTY(()) struct builtin_record java_builtins[] = { { { "java.lang.Math" }, { "min" }, min_builtin }, { { "java.lang.Math" }, { "max" }, max_builtin }, @@ -273,8 +273,6 @@ initialize_builtins () java_builtins[i].class_name.t = klass_id; java_builtins[i].method_name.t = m; - ggc_add_tree_root (&java_builtins[i].class_name.t, 1); - ggc_add_tree_root (&java_builtins[i].method_name.t, 1); } void_list_node = end_params_node; @@ -348,3 +346,5 @@ check_for_builtin (method, call) } return call; } + +#include "gt-java-builtins.h" |