diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/class.c | 2 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 671c865..bfe435d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2004-07-06 Nathan Sidwell <nathan@codesourcery.com> + + * java-tree.h (CLASS_HAS_SUPER_FLAG): Use BINFO_FLAG_1. + * class.c (add_interface_do): Use BINFO_VIRTUAL_P. + 2004-07-05 Nathan Sidwell <nathan@codesourcery.com> * class.c (make_class): Use make_tree_binfo. @@ -8167,7 +8172,7 @@ properly initialize `finished_label'. Don't emit gotos for empty try statements. -2000-03-19 Martin v. Löwis <loewis@informatik.hu-berlin.de> +2000-03-19 Martin v. Löwis <loewis@informatik.hu-berlin.de> * except.c (emit_handlers): Clear catch_clauses_last. diff --git a/gcc/java/class.c b/gcc/java/class.c index 1083efb..be4b3fd 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -616,7 +616,7 @@ add_interface_do (tree basetype_vec, tree interface_class, int i) BINFO_TYPE (interface_binfo) = interface_class; BINFO_OFFSET (interface_binfo) = integer_zero_node; BINFO_VPTR_FIELD (interface_binfo) = integer_zero_node; - TREE_VIA_VIRTUAL (interface_binfo) = 1; + BINFO_VIRTUAL_P (interface_binfo) = 1; TREE_VEC_ELT (basetype_vec, i) = interface_binfo; } diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 792f2ac..04a8f1f 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -48,8 +48,7 @@ struct JCF; SUPPRESS_UNREACHABLE_ERROR (for other _EXPR nodes) ANONYMOUS_CLASS_P (in RECORD_TYPE) ARG_FINAL_P (in TREE_LIST) - 1: CLASS_HAS_SUPER_FLAG (in TREE_BINFO). - IS_A_CLASSFILE_NAME (in IDENTIFIER_NODE) + 1: IS_A_CLASSFILE_NAME (in IDENTIFIER_NODE) COMPOUND_ASSIGN_P (in EXPR (binop_*)) LOCAL_CLASS_P (in RECORD_TYPE) BLOCK_IS_IMPLICIT (in BLOCK) @@ -122,7 +121,7 @@ struct JCF; /* True if the class whose TYPE_BINFO this is has a superclass. (True of all classes except Object.) */ -#define CLASS_HAS_SUPER_FLAG(BINFO) TREE_LANG_FLAG_1 (TREE_BINFO_CHECK (BINFO)) +#define CLASS_HAS_SUPER_FLAG(BINFO) BINFO_FLAG_1 (BINFO) #define CLASS_HAS_SUPER(TYPE) CLASS_HAS_SUPER_FLAG (TYPE_BINFO (TYPE)) /* Return the supertype of class TYPE, or NULL_TREE is it has none. */ |