aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/verify.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8eb616a..39670ef 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
2001-11-18 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.
+
* verify.cc (_Jv_BytecodeVerifier::get_type_val_for_signature):
Added `B' case.
diff --git a/libjava/verify.cc b/libjava/verify.cc
index b0fefc0..423edaa 100644
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -1347,7 +1347,6 @@ private:
break;
case op_bipush:
- case op_sipush:
case op_ldc:
case op_iload:
case op_lload:
@@ -1361,9 +1360,11 @@ private:
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 @@ private:
case op_putfield:
case op_putstatic:
case op_new:
- case op_newarray:
case op_anewarray:
case op_instanceof:
case op_checkcast: