# HG changeset patch
# User kamg
# Date 1209482511 14400
# Node ID 8a79f7ec8f5dd99aacae54dd17e6e0958b48e766
# Parent  435e6450501506326c95d3374eb08b3406fa420c
6692246: Regression : JDK 6u4 b01 fails two JCK tests when fallback is switched off
Summary: Added a clause to allow null to be an operand to the arraylength bytecode
Reviewed-by: sbohne, coleenp

diff -r 435e64505015 -r 8a79f7ec8f5d src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Thu Apr 24 15:07:57 2008 -0400
+++ b/src/share/vm/classfile/verifier.cpp	Tue Apr 29 11:21:51 2008 -0400
@@ -1205,7 +1205,7 @@
         case Bytecodes::_arraylength :
           type = current_frame.pop_stack(
             VerificationType::reference_check(), CHECK_VERIFY(this));
-          if (!type.is_array()) {
+          if (!(type.is_null() || type.is_array())) {
             verify_error(bci, bad_type_msg, "arraylength");
           }
           current_frame.push_stack(