src/share/vm/classfile/verifier.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1544,1557 ****
              return;
            }
            no_control_flow = true; break;
          case Bytecodes::_getstatic :
          case Bytecodes::_putstatic :
          case Bytecodes::_getfield :
          case Bytecodes::_putfield :
            verify_field_instructions(
!             &bcs, &current_frame, cp, CHECK_VERIFY(this));
            no_control_flow = false; break;
          case Bytecodes::_invokevirtual :
          case Bytecodes::_invokespecial :
          case Bytecodes::_invokestatic :
            verify_invoke_instructions(
--- 1544,1562 ----
              return;
            }
            no_control_flow = true; break;
          case Bytecodes::_getstatic :
          case Bytecodes::_putstatic :
+           // pass TRUE, operand can be an array type for getstatic/putstatic.
+           verify_field_instructions(
+             &bcs, &current_frame, cp, true, CHECK_VERIFY(this));
+           no_control_flow = false; break;
          case Bytecodes::_getfield :
          case Bytecodes::_putfield :
+           // pass FALSE, operand can't be an array type for getfield/putfield.
            verify_field_instructions(
!             &bcs, &current_frame, cp, false, CHECK_VERIFY(this));
            no_control_flow = false; break;
          case Bytecodes::_invokevirtual :
          case Bytecodes::_invokespecial :
          case Bytecodes::_invokestatic :
            verify_invoke_instructions(
*** 2105,2114 ****
--- 2110,2120 ----
  }
  
  void ClassVerifier::verify_field_instructions(RawBytecodeStream* bcs,
                                                StackMapFrame* current_frame,
                                                constantPoolHandle cp,
+                                               bool allow_arrays,
                                                TRAPS) {
    u2 index = bcs->get_index_u2();
    verify_cp_type(bcs->bci(), index, cp,
        1 << JVM_CONSTANT_Fieldref, CHECK_VERIFY(this));
  
*** 2124,2135 ****
    }
  
    // Get referenced class type
    VerificationType ref_class_type = cp_ref_index_to_type(
      index, cp, CHECK_VERIFY(this));
!   if (!ref_class_type.is_object()) {
!     /* Unreachable?  Class file parser verifies Fieldref contents */
      verify_error(ErrorContext::bad_type(bcs->bci(),
          TypeOrigin::cp(index, ref_class_type)),
          "Expecting reference to class in class %s at constant pool index %d",
          _klass->external_name(), index);
      return;
--- 2130,2141 ----
    }
  
    // Get referenced class type
    VerificationType ref_class_type = cp_ref_index_to_type(
      index, cp, CHECK_VERIFY(this));
!   if (!ref_class_type.is_object() &&
!     (!allow_arrays || !ref_class_type.is_array())) {
      verify_error(ErrorContext::bad_type(bcs->bci(),
          TypeOrigin::cp(index, ref_class_type)),
          "Expecting reference to class in class %s at constant pool index %d",
          _klass->external_name(), index);
      return;