changeset 123:8a79f7ec8f5d

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
author kamg
date Tue, 29 Apr 2008 11:21:51 -0400
parents 435e64505015
children b7268662a986
files src/share/vm/classfile/verifier.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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(