From: Alexandre Petit-Bianco <apbianco@cygnus.com>
Date: Thu, 13 May 1999 19:01:19 +0000 (+0000)
Subject: parse.y (java_check_regular_methods): Warning check on not overriding methods with... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fb89a4d595c742e276d07e1a5fb1c4a8a01d214;p=gcc.git

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
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a589edab3b1..cf33bd55339 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 56e30d3c2cf..92ed988cf24 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 dbf7fe42d23..64f7e182c14 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;