verify.cc (_Jv_BytecodeVerifier::verify_instructions_0): Shift argument is an int...

	* verify.cc (_Jv_BytecodeVerifier::verify_instructions_0)
	[op_lshl, op_lshr, op_lushr]: Shift argument is an int, not a
	long.

From-SVN: r47177

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index af02f3ecf6d557b51e6a244a9cb48db111d83cdf..99a69b8b707d0b50601bf593288459295953ef0d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19  Tom Tromey  <tromey@redhat.com>
+
+       * verify.cc (_Jv_BytecodeVerifier::verify_instructions_0)
+       [op_lshl, op_lshr, op_lushr]: Shift argument is an int, not a
+       long.
+
 2001-11-18  Tom Tromey  <tromey@redhat.com>
 
        * verify.cc (type::to_array): New method.

diff --git a/libjava/verify.cc b/libjava/verify.cc
index 8c290a38d2850c4d38c319eeaee1df65abb36b38..2562d1af25e494b9e1cb179b07bb3654cc1b6862 100644 (file)
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -2132,15 +2132,18 @@ private:
          case op_lmul:
          case op_ldiv:
          case op_lrem:
-         case op_lshl:
-         case op_lshr:
-         case op_lushr:
          case op_land:
          case op_lor:
          case op_lxor:
            pop_type (long_type);
            push_type (pop_type (long_type));
            break;
+         case op_lshl:
+         case op_lshr:
+         case op_lushr:
+           pop_type (int_type);
+           push_type (pop_type (long_type));
+           break;
          case op_fadd:
          case op_fsub:
          case op_fmul: