java-except.h (struct eh_range.handler): Remove unused field.

2005-04-18  Andrew Haley  <aph@redhat.com>

        * java-except.h (struct eh_range.handler): Remove unused field.
        (handle_nested_ranges): Remove function declaration.
        (sanity_check_exception_range): Add function declaration.
        * verify.c (verify_jvm_instructions): Remove call to
        handle_nested_ranges.
        * verify-glue.c (verify_jvm_instructions_new): Call
        sanity_check_exception_range.
        * except.c (link_handler, eh_range_freelist, link_handler,
        handle_nested_ranges): Remove.
        (add_handler): Rewrite.
        (sanity_check_exception_range): New function.
        (print_ranges): New function.

From-SVN: r98395

gcc/java/ChangeLog

+2005-04-18  Andrew Haley  <aph@redhat.com>
+
+	* java-except.h (struct eh_range.handler): Remove unused field.
+	(handle_nested_ranges): Remove function declaration.
+	(sanity_check_exception_range): Add function declaration.	
+	* verify.c (verify_jvm_instructions): Remove call to
+	handle_nested_ranges.
+	* verify-glue.c (verify_jvm_instructions_new): Call
+	sanity_check_exception_range.
+	* except.c (link_handler, eh_range_freelist, link_handler,
+	handle_nested_ranges): Remove.
+	(add_handler): Rewrite.
+	(sanity_check_exception_range): New function.
+	(print_ranges): New function.
+
 2005-04-13  Julian Brown  <julian@codesourcery.com>
 
 	* decl.c (finish_method): Give methods once-only linkage.

gcc/java/java-except.h

@@ -54,8 +54,6 @@ struct eh_range
 
     /* The TRY_CATCH_EXPR for this EH range.  */
     tree stmt;
-
-    tree handler;
   };
 
 /* A dummy range that represents the entire method. */
@@ -67,5 +65,5 @@ extern struct eh_range * find_handler (int);
 extern void method_init_exceptions (void);
 extern void maybe_start_try (int, int);
 extern void add_handler (int, int, tree, tree);
-extern void handle_nested_ranges (void);
 extern void expand_end_java_handler (struct eh_range *);
+extern bool sanity_check_exception_range (struct eh_range *);

gcc/java/verify-glue.c

@@ -487,7 +487,7 @@ verify_jvm_instructions_new (JCF *jcf, const unsigned char *byte_ops,
       instruction_bits[handler_pc] |= BCODE_EXCEPTION_TARGET;
     }
 
-  handle_nested_ranges ();
+  gcc_assert (sanity_check_exception_range (&whole_range));
 
   method.method = current_function_decl;
   method.signature = build_java_signature (TREE_TYPE (current_function_decl));

gcc/java/verify.c

@@ -491,7 +491,6 @@ verify_jvm_instructions (JCF* jcf, const unsigned char *byte_ops, long length)
     }
 
   free (starts);
-  handle_nested_ranges ();
 
   for (PC = 0;;)
     {