From aa7f1486af728193a412bee823db295a95733306 Mon Sep 17 00:00:00 2001
From: kamg <unknown>
Date: Tue, 29 Apr 2008 11:21:51 -0400
Subject: [PATCH] 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

---
 src/share/vm/classfile/verifier.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/share/vm/classfile/verifier.cpp b/src/share/vm/classfile/verifier.cpp
index 20157e967..5ece3847b 100644
--- a/src/share/vm/classfile/verifier.cpp
+++ b/src/share/vm/classfile/verifier.cpp
@@ -1205,7 +1205,7 @@ void ClassVerifier::verify_method(methodHandle m, TRAPS) {
         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(
-- 
GitLab