diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-05-13 19:01:19 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 1999-05-13 12:01:19 -0700 |
| commit | 1fb89a4d595c742e276d07e1a5fb1c4a8a01d214 (patch) | |
| tree | aef77c219f962d69ae65bd3235c2be05ac9ef42d /gcc | |
| parent | aca1a6cbac86e5ad77db427f58fbd8750d55f1ac (diff) | |
| download | gcc-1fb89a4d595c742e276d07e1a5fb1c4a8a01d214.zip gcc-1fb89a4d595c742e276d07e1a5fb1c4a8a01d214.tar.gz gcc-1fb89a4d595c742e276d07e1a5fb1c4a8a01d214.tar.bz2 | |
parse.y (java_check_regular_methods): Warning check on not overriding methods with default access in other packages...
Thu May 13 18:30:48 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
* parse.y (java_check_regular_methods): Warning check on not
overriding methods with default access in other packages does not
apply to `<clinit>'.
(java_complete_lhs): If block body is an empty_stmt_node, replace
it by NULL_TREE. This avoid gcc generating an irrelevant warning.
From-SVN: r26930
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/parse.c | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a589eda..cf33bd5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +Thu May 13 18:30:48 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * parse.y (java_check_regular_methods): Warning check on not + overriding methods with default access in other packages does not + apply to `<clinit>'. + (java_complete_lhs): If block body is an empty_stmt_node, replace + it by NULL_TREE. This avoid gcc generating an irrelevant warning. + Thu May 13 13:23:38 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> * check-init.c (check_init): Removed code accepting to see things diff --git a/gcc/java/parse.c b/gcc/java/parse.c index 56e30d3..92ed988 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -7222,6 +7222,7 @@ java_check_regular_methods (class_decl) if (DECL_CONTEXT (found) != object_type_node && ((aflags & 0x7) == 0) && !class_in_current_package (DECL_CONTEXT (found)) + && DECL_NAME (found) != clinit_identifier_node && flag_not_overriding) { parse_warning_context @@ -10473,7 +10474,10 @@ java_complete_lhs (node) COMPLETE_CHECK_OP_1 (node); TREE_TYPE (node) = void_type_node; POP_LABELED_BLOCK (); - if (CAN_COMPLETE_NORMALLY (LABELED_BLOCK_BODY (node))) + + if (LABELED_BLOCK_BODY (node) == empty_stmt_node) + LABELED_BLOCK_BODY (node) = NULL_TREE; + else if (CAN_COMPLETE_NORMALLY (LABELED_BLOCK_BODY (node))) CAN_COMPLETE_NORMALLY (node) = 1; return node; diff --git a/gcc/java/parse.y b/gcc/java/parse.y index dbf7fe4..64f7e18 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -4618,6 +4618,7 @@ java_check_regular_methods (class_decl) if (DECL_CONTEXT (found) != object_type_node && ((aflags & 0x7) == 0) && !class_in_current_package (DECL_CONTEXT (found)) + && DECL_NAME (found) != clinit_identifier_node && flag_not_overriding) { parse_warning_context @@ -7869,7 +7870,10 @@ java_complete_lhs (node) COMPLETE_CHECK_OP_1 (node); TREE_TYPE (node) = void_type_node; POP_LABELED_BLOCK (); - if (CAN_COMPLETE_NORMALLY (LABELED_BLOCK_BODY (node))) + + if (LABELED_BLOCK_BODY (node) == empty_stmt_node) + LABELED_BLOCK_BODY (node) = NULL_TREE; + else if (CAN_COMPLETE_NORMALLY (LABELED_BLOCK_BODY (node))) CAN_COMPLETE_NORMALLY (node) = 1; return node; |