Warning fixes:

        * expr.c (build_java_soft_divmod): Provide a default case in switch.
        (java_lang_expand_expr): Mark parameters `target', `tmode' and
        `modifier' with ATTRIBUTE_UNUSED.

        * gjavah.c (process_file): Add braces around ambiguous `else'.

        * jcf-dump.c (print_access_flags, localvar_free): Change return
        type to void.

        * parse.y (java_complete_expand_method): Initialize variable
        `exception_copy'.
        (resolve_qualified_expression_name): Likewise for `field_decl'.
        (patch_method_invocation): Likewise for `class_to_search'.
        (qualify_ambiguous_name): Likewise for `name' and `ptr_type'.
        (patch_assignment): Likewise for `lhs_type'.

        * verify.c (verify_jvm_instructions): Remove unused variable
        `caller'.

From-SVN: r28344

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 45e00115e0f8b2f94192bd96d78aa81a8ed9c8df..f1de535b2a702d8cd5533d13218e2cd2a6afc9d0 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,24 @@
+1999-07-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * expr.c (build_java_soft_divmod): Provide a default case in switch.
+       (java_lang_expand_expr): Mark parameters `target', `tmode' and
+       `modifier' with ATTRIBUTE_UNUSED.
+
+       * gjavah.c (process_file): Add braces around ambiguous `else'.
+
+       * jcf-dump.c (print_access_flags, localvar_free): Change return
+       type to void.
+
+       * parse.y (java_complete_expand_method): Initialize variable
+       `exception_copy'.
+       (resolve_qualified_expression_name): Likewise for `field_decl'.
+       (patch_method_invocation): Likewise for `class_to_search'.
+       (qualify_ambiguous_name): Likewise for `name' and `ptr_type'.
+       (patch_assignment): Likewise for `lhs_type'.
+
+       * verify.c (verify_jvm_instructions): Remove unused variable
+       `caller'.
+
 1999-07-25  Richard Henderson  <rth@cygnus.com>
 
        * decl.c (va_list_type_node): New.

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index dbf6db55b7ce9e9ea9afd0bb936d52ef8d301b94..a825e981c3518c806ce27154a118eb6444319b18 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1072,6 +1072,8 @@ build_java_soft_divmod (op, type, op1, op2)
        case TRUNC_MOD_EXPR:
          call = soft_irem_node;
          break;
+       default:
+         break;
        }
     }
   else if (type == long_type_node)
@@ -1084,6 +1086,8 @@ build_java_soft_divmod (op, type, op1, op2)
        case TRUNC_MOD_EXPR:
          call = soft_lrem_node;
          break;
+       default:
+         break;
        }
     }
 
@@ -1873,9 +1877,9 @@ case_identity (t, v)
 struct rtx_def *
 java_lang_expand_expr (exp, target, tmode, modifier)
      register tree exp;
-     rtx target;
-     enum machine_mode tmode;
-     enum expand_modifier modifier;
+     rtx target ATTRIBUTE_UNUSED;
+     enum machine_mode tmode ATTRIBUTE_UNUSED;
+     enum expand_modifier modifier ATTRIBUTE_UNUSED;
 {
   tree current;
 

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 500aa2c817ed4c6df99944a1d25e0f6a31235a1d..b680a87f48501b79d357310a142a66b34ec38161 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1308,18 +1308,20 @@ DEFUN(process_file, (jcf, out),
   jcf_parse_class (jcf);
 
   if (written_class_count++ == 0 && out)
-    if (! stubs)
-      fputs ("// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-\n\n",
-            out);
-    else
-      {
-       fputs ("// This file was created by `gcjh -stubs'.  It is -*- c++ -*-.
+    {
+      if (! stubs)
+       fputs ("// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-\n\n",
+              out);
+      else
+       {
+         fputs ("// This file was created by `gcjh -stubs'.  It is -*- c++ -*-.
 //
 // This file is intended to give you a head start on implementing native 
 // methods using CNI.  
 // Be aware: running `gcjh -stubs' once more for this class may overwrite any 
 // edits you have made to this file.\n\n", out);
-      }
+       }
+    }
 
   if (out)
     {

diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 6d3e37253b34c11c4c98941bcc835eddc7e0332c..a26a6fbbfca3ccef22eca9210ea61ba68bef166c 100644 (file)
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -78,7 +78,7 @@ int class_access_flags = 0;
 /* Print in format similar to javap.  VERY IMCOMPLETE. */
 int flag_javap_compatible = 0;
 
-static int print_access_flags PROTO ((FILE *, uint16, char));
+static void print_access_flags PROTO ((FILE *, uint16, char));
 static void print_constant_terse PROTO ((FILE*, JCF*, int, int));
 static void print_constant PROTO ((FILE *, JCF *, int, int));
 static void print_constant_ref PROTO ((FILE *, JCF *, int));
@@ -311,7 +311,7 @@ DEFUN(print_constant_ref, (stream, jcf, index),
    The CONTEXT is one of 'c' (class flags), 'f' (field flags),
    or 'm' (method flags). */
 
-static int
+static void
 DEFUN (print_access_flags, (stream, flags, context),
        FILE *stream AND uint16 flags AND char context)
 {

diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 71560e60616c2e761f67b2da4464c45317414c70..0cbbfac90437cd6539f4c31717f8ec3aa20e72f0 100644 (file)
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -286,7 +286,7 @@ static void define_jcf_label PROTO ((struct jcf_block *,
 static struct jcf_block * get_jcf_label_here PROTO ((struct jcf_partial *));
 static void put_linenumber PROTO ((int, struct jcf_partial *));
 static void localvar_alloc PROTO ((tree, struct jcf_partial *));
-static int localvar_free PROTO ((tree, struct jcf_partial *));
+static void localvar_free PROTO ((tree, struct jcf_partial *));
 static int get_access_flags PROTO ((tree));
 static void write_chunks PROTO ((FILE *, struct chunk *));
 static int adjust_typed_op PROTO ((tree, int));
@@ -567,7 +567,7 @@ localvar_alloc (decl, state)
     }
 }
 
-static int
+static void
 localvar_free (decl, state)
      tree decl;     
      struct jcf_partial *state;

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index da19cda26d54878154093d33c7175ba8f9303b0e..8876285f80226fc127b4883fa2224acea2bac833 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -8503,7 +8503,7 @@ java_complete_expand_method (mdecl)
     {
       tree fbody = DECL_FUNCTION_BODY (mdecl);
       tree block_body = BLOCK_EXPR_BODY (fbody);
-      tree exception_copy;
+      tree exception_copy = NULL_TREE;
       expand_start_java_method (mdecl);
       build_result_decl (mdecl);
 
@@ -9215,7 +9215,7 @@ resolve_qualified_expression_name (wfl, found_decl, where_found, type_found)
       /* We resolve and expression name */
       else 
        {
-         tree field_decl;
+         tree field_decl = NULL_TREE;
 
          /* If there exists an early resolution, use it. That occurs
             only once and we know that there are more things to
@@ -9628,7 +9628,7 @@ patch_method_invocation (patch, primary, where, is_static, ret_decl)
      constructors */
   else
     {
-      tree class_to_search;
+      tree class_to_search = NULL_TREE;
       int lc;          /* Looking for Constructor */
       
       /* We search constructor in their target class */
@@ -10207,7 +10207,8 @@ static void
 qualify_ambiguous_name (id)
      tree id;
 {
-  tree qual, qual_wfl, name, decl, ptr_type, saved_current_class;
+  tree qual, qual_wfl, name = NULL_TREE, decl, ptr_type = NULL_TREE,
+    saved_current_class;
   int again, super_found = 0, this_found = 0, new_array_found = 0;
   int code;
 
@@ -11429,7 +11430,7 @@ patch_assignment (node, wfl_op1, wfl_op2)
 {
   tree rhs = TREE_OPERAND (node, 1);
   tree lvalue = TREE_OPERAND (node, 0), llvalue;
-  tree lhs_type, rhs_type, new_rhs = NULL_TREE;
+  tree lhs_type = NULL_TREE, rhs_type, new_rhs = NULL_TREE;
   int error_found = 0;
   int lvalue_from_array = 0;
 

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 23b2c7ad03cf9e3f94efcb46d911b81b1f7e6d73..13a35fa32ecdb9c2e390fbc9b4a7631438b75704 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -5918,7 +5918,7 @@ java_complete_expand_method (mdecl)
     {
       tree fbody = DECL_FUNCTION_BODY (mdecl);
       tree block_body = BLOCK_EXPR_BODY (fbody);
-      tree exception_copy;
+      tree exception_copy = NULL_TREE;
       expand_start_java_method (mdecl);
       build_result_decl (mdecl);
 
@@ -6630,7 +6630,7 @@ resolve_qualified_expression_name (wfl, found_decl, where_found, type_found)
       /* We resolve and expression name */
       else 
        {
-         tree field_decl;
+         tree field_decl = NULL_TREE;
 
          /* If there exists an early resolution, use it. That occurs
             only once and we know that there are more things to
@@ -7043,7 +7043,7 @@ patch_method_invocation (patch, primary, where, is_static, ret_decl)
      constructors */
   else
     {
-      tree class_to_search;
+      tree class_to_search = NULL_TREE;
       int lc;          /* Looking for Constructor */
       
       /* We search constructor in their target class */
@@ -7622,7 +7622,8 @@ static void
 qualify_ambiguous_name (id)
      tree id;
 {
-  tree qual, qual_wfl, name, decl, ptr_type, saved_current_class;
+  tree qual, qual_wfl, name = NULL_TREE, decl, ptr_type = NULL_TREE,
+    saved_current_class;
   int again, super_found = 0, this_found = 0, new_array_found = 0;
   int code;
 
@@ -8844,7 +8845,7 @@ patch_assignment (node, wfl_op1, wfl_op2)
 {
   tree rhs = TREE_OPERAND (node, 1);
   tree lvalue = TREE_OPERAND (node, 0), llvalue;
-  tree lhs_type, rhs_type, new_rhs = NULL_TREE;
+  tree lhs_type = NULL_TREE, rhs_type, new_rhs = NULL_TREE;
   int error_found = 0;
   int lvalue_from_array = 0;
 

diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index e367334c46206e61cb7c52f573dfe84a569bcef5..9e11d761c9065af0c333ceaff92dba18a1ede8d5 100644 (file)
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -1213,7 +1213,6 @@ verify_jvm_instructions (jcf, byte_ops, length)
          else
            {
              tree ret_map = LABEL_RETURN_TYPE_STATE (current_subr);
-             tree caller = LABEL_SUBR_CONTEXT (current_subr);
              int size = DECL_MAX_LOCALS(current_function_decl)+stack_pointer;
              index = wide ? IMMEDIATE_u2 : IMMEDIATE_u1;
              wide = 0;