* lang.c (flag_new_verifier): Define.

	(java_post_options): Set flag_new_verifier if indirect dispatch
	is being used.
	* lang.opt (fnew-verifier): Removed.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91693 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3a2ff2e..805c5e0 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,12 @@
 2004-12-03  Tom Tromey  <tromey@redhat.com>
 
+       * lang.c (flag_new_verifier): Define.
+       (java_post_options): Set flag_new_verifier if indirect dispatch
+       is being used.
+       * lang.opt (fnew-verifier): Removed.
+
+2004-12-03  Tom Tromey  <tromey@redhat.com>
+
        PR bootstrap/14614:
        * Make-lang.in (java.install-common): Only install transformed
        gcjh if gcj-cross exists.

diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index bcf4e45..b89bdf9 100644 (file)
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -139,6 +139,9 @@ int flag_deprecated = 1;
 /* Don't attempt to verify invocations.  */
 int flag_verify_invocations = 0; 
 
+/* True if the new bytecode verifier should be used.  */
+int flag_new_verifier = 0;
+
 /* When nonzero, print extra version information.  */
 static int v_flag = 0;
 
@@ -608,6 +611,12 @@ java_post_options (const char **pfilename)
      must always verify everything.  */
   if (! flag_indirect_dispatch)
     flag_verify_invocations = true;
+  else
+    {
+      /* If we are using indirect dispatch, then we want the new
+        verifier as well.  */
+      flag_new_verifier = 1;
+    }
 
   /* Open input file.  */
 

diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index 644bd5b..0e4ffcf 100644 (file)
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -176,9 +176,5 @@ fuse-divide-subroutine
 Java Var(flag_use_divide_subroutine) Init(1)
 Call a library routine to do integer divisions
 
-fnew-verifier
-Java Var(flag_new_verifier)
-Enable the new bytecode verifier
-
 version
 Java