check-init.c (check_init): Exclude a case of error when doing xrefs.

Fri Apr 30 17:54:40 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
	* check-init.c (check_init): Exclude a case of error when doing
 	xrefs.
	* class.c (layout_class_method): Don't generate the error message
 	twice when compiling from source.
	* lang-options.h: Added `-Wredundant-modifers' and
	`-Wunusupported-jdk11' flags and help text.
	* lang.c (lang_decode_option): Added support for
 	`-Wunsupported-jdk11' and `-Wredundant-modifiers'.
	flag_static_local_jdk11 and flag_redundant set accordingly.
	* lex.c (java_lex): Call BUILD_OPERATOR on CCB_TK.
	* parse.h (EXPR_WFL_ADD_COL): New macro.
	(DECL_END_SOURCE_LINE): Likewise.
	(DECL_INHERITED_SOURCE_LINE): Likewise.
	* parse.y (static_ref_err): New function, prototyped.
	(CCB_TK): Now tagged <operator>.
	(class_body:): Remember the location of the closing '}' of a class
 	definition when doing xrefs.
	(block:): Likewise.
	(block_end:): Likewise.
	(create_class): Remember the location of the inherited class
 	identifier when doing xrefs.
	(register_fields): Added test on first operand of `init' before
 	testing it TREE_CODE.
	(method_header): Store the location of the class identifier in the
 	class decl when doing xrefs.
	(finish_method_declaration): Don't combine first/last method line
 	when doing xref.
	(java_check_regular_methods): Warning check on not overriding
 	methods with default access on other packages move before check on
 	static methods. Initialization of `aflags' also moved up.
	(resolve_expression_name): Call static_ref_err to report the error.
	(static_ref_err): New function, implemented.
	(resolve_field_access): Returned simplified static field access
 	when doing xrefs.
	(resolve_qualified_expression_name): Check for illegal use of
 	static fields in a non static context. Call static_ref_err to
 	report error in various places.
	(java_complete_tree): To not fold initialized static fields when
 	doing xrefs.
	(java_complete_lhs): Likewise.

From-SVN: r26758

gcc/java/ChangeLog

@@ -2,6 +2,49 @@
 
 	* Makefile.in: Remove -v from bison command lines.
 
+Fri Apr 30 17:54:40 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* check-init.c (check_init): Exclude a case of error when doing
+ 	xrefs.
+	* class.c (layout_class_method): Don't generate the error message
+ 	twice when compiling from source.
+	* lang-options.h: Added `-Wredundant-modifers' and
+	`-Wunusupported-jdk11' flags and help text.
+	* lang.c (lang_decode_option): Added support for
+ 	`-Wunsupported-jdk11' and `-Wredundant-modifiers'. 
+	flag_static_local_jdk11 and flag_redundant set accordingly.
+	* lex.c (java_lex): Call BUILD_OPERATOR on CCB_TK.
+	* parse.h (EXPR_WFL_ADD_COL): New macro.
+	(DECL_END_SOURCE_LINE): Likewise.
+	(DECL_INHERITED_SOURCE_LINE): Likewise.
+	* parse.y (static_ref_err): New function, prototyped.
+	(CCB_TK): Now tagged <operator>.
+	(class_body:): Remember the location of the closing '}' of a class
+ 	definition when doing xrefs.
+	(block:): Likewise.
+	(block_end:): Likewise.
+	(create_class): Remember the location of the inherited class
+ 	identifier when doing xrefs.
+	(register_fields): Added test on first operand of `init' before
+ 	testing it TREE_CODE.
+	(method_header): Store the location of the class identifier in the
+ 	class decl when doing xrefs.
+	(finish_method_declaration): Don't combine first/last method line
+ 	when doing xref.
+	(java_check_regular_methods): Warning check on not overriding
+ 	methods with default access on other packages move before check on
+ 	static methods. Initialization of `aflags' also moved up.
+	(resolve_expression_name): Call static_ref_err to report the error.
+	(static_ref_err): New function, implemented.
+	(resolve_field_access): Returned simplified static field access
+ 	when doing xrefs.
+	(resolve_qualified_expression_name): Check for illegal use of
+ 	static fields in a non static context. Call static_ref_err to
+ 	report error in various places.
+	(java_complete_tree): To not fold initialized static fields when
+ 	doing xrefs.
+	(java_complete_lhs): Likewise.
+
 1999-04-29  Anthony Green  <green@cygnus.com>
 
 	* expr.c (generate_name): Use ASM_GENERATE_INTERNAL_LABEL to

gcc/java/check-init.c

@@ -700,6 +700,9 @@ check_init (exp, before)
       break;
       
     default:
+      /* It's OK to see that when doing xrefs. */
+      if (TREE_CODE (exp) == TYPE_DECL && flag_emit_xref)
+	break;
       fatal ("internal error in check-init: tree code not implemented: %s",
 	    tree_code_name [(int) TREE_CODE (exp)]);
     }

gcc/java/class.c

@@ -1655,7 +1655,8 @@ layout_class_method (this_class, super_class, method_decl, dtable_count)
       if (super_method != NULL_TREE && ! METHOD_PRIVATE (super_method))
 	{
 	  DECL_VINDEX (method_decl) = DECL_VINDEX (super_method);
-	  if (DECL_VINDEX (method_decl) == NULL_TREE)
+	  if (DECL_VINDEX (method_decl) == NULL_TREE 
+	      && !CLASS_FROM_SOURCE_P (this_class))
 	    error_with_decl (method_decl,
 			     "non-static method '%s' overrides static method");
 #if 0

gcc/java/lang-options.h

@@ -41,3 +41,6 @@ DEFINE_LANG_NAME ("Java")
   { "-fCLASSPATH", "Set class path" },
   { "-I", "Add directory to class path" },
   { "-foutput-class-dir", "Directory where class files should be written" },
+  { "-Wredundant-modifiers", 
+    "Warn if modifiers are specified when not necessary"},
+  { "-Wunsupported-jdk11", "Warn if `final' local variables are specified"},

gcc/java/lang.c

@@ -219,11 +219,21 @@ lang_decode_option (argc, argv)
     {
       flag_wall = 1;
       flag_redundant = 1;
-      flag_not_overriding = 1;
+      return 1;
+    }
+
+  if (strcmp (p, "-Wunsupported-jdk11") == 0)
+    {
       flag_static_local_jdk1_1 = 1;
       return 1;
     }
 
+  if (strcmp (p, "-Wredudant-modifiers") == 0)
+    {
+      flag_redundant = 1;
+      return 1;
+    }
+
   if (strcmp (p, "-MD") == 0)
     {
       jcf_dependency_init (1);

gcc/java/lex.c

@@ -955,7 +955,7 @@ java_lex (java_lval)
       ctxp->ccb_indent--;
       if (ctxp->ccb_indent == 1)
         ctxp->last_ccb_indent1 = lineno;
-      return CCB_TK;
+      BUILD_OPERATOR (CCB_TK);
     case '[':
       JAVA_LEX_SEP (c);
       BUILD_OPERATOR (OSB_TK);

gcc/java/parse.h

@@ -483,6 +483,9 @@ typedef struct _jdeplist {
      (LINE) = (V) >> 12;			\
      (COL) = (V) & 0xfff;			\
    }
+/* Add X to the column number information */
+#define EXPR_WFL_ADD_COL(V, X)					\
+  (V) = (((V) & 0xfffff000) | ((((V) & 0xfff) + (X)) & 0xfff))
 
 /* Build a WFL for expression nodes */
 #define BUILD_EXPR_WFL(NODE, WFL)					\
@@ -586,6 +589,10 @@ typedef struct _jdeplist {
 
 /* Macro to access the osb (opening square bracket) count */
 #define CURRENT_OSB(C) (C)->osb_number [(C)->osb_depth]
+
+/* Macro for the xreferencer */
+#define DECL_END_SOURCE_LINE(DECL)       DECL_FRAME_SIZE (DECL)
+#define DECL_INHERITED_SOURCE_LINE(DECL) DECL_FIELD_SIZE (DECL)
      
 /* Parser context data structure. */
 struct parser_ctxt {