This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: FYI: verifier fix


I hope this isn't annoying anybody.  I'm checking this in.  It is
another verifier bug fix.

The branch-finding prepass had a couple cases wrong.
(There may be more; I'm just letting Mauve find these.)

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* verify.cc (_Jv_BytecodeVerifier::branch_prepass) [op_sipush]:
	Skip a short, not a byte.
	[op_newarray]: Skip a byte, not a short.

Index: verify.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/verify.cc,v
retrieving revision 1.11
diff -u -r1.11 verify.cc
--- verify.cc 2001/11/19 01:37:28 1.11
+++ verify.cc 2001/11/19 02:11:55
@@ -1347,7 +1347,6 @@
 	    break;
 
 	  case op_bipush:
-	  case op_sipush:
 	  case op_ldc:
 	  case op_iload:
 	  case op_lload:
@@ -1361,9 +1360,11 @@
 	  case op_astore:
 	  case op_arraylength:
 	  case op_ret:
+	  case op_newarray:
 	    get_byte ();
 	    break;
 
+	  case op_sipush:
 	  case op_ldc_w:
 	  case op_ldc2_w:
 	  case op_getstatic:
@@ -1371,7 +1372,6 @@
 	  case op_putfield:
 	  case op_putstatic:
 	  case op_new:
-	  case op_newarray:
 	  case op_anewarray:
 	  case op_instanceof:
 	  case op_checkcast:


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]