src/share/vm/classfile/verifier.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2013, 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, 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.
*** 1941,1951 ****
    }
    // Check if the specified method or field is protected
    InstanceKlass* target_instance = InstanceKlass::cast(target_class);
    fieldDescriptor fd;
    if (is_method) {
!     Method* m = target_instance->uncached_lookup_method(field_name, field_sig);
      if (m != NULL && m->is_protected()) {
        if (!this_class->is_same_class_package(m->method_holder())) {
          return true;
        }
      }
--- 1941,1951 ----
    }
    // Check if the specified method or field is protected
    InstanceKlass* target_instance = InstanceKlass::cast(target_class);
    fieldDescriptor fd;
    if (is_method) {
!     Method* m = target_instance->uncached_lookup_method(field_name, field_sig, false);
      if (m != NULL && m->is_protected()) {
        if (!this_class->is_same_class_package(m->method_holder())) {
          return true;
        }
      }
*** 2278,2288 ****
      if (name_in_supers(ref_class_type.name(), current_class())) {
        Klass* ref_klass = load_class(
          ref_class_type.name(), CHECK_VERIFY(this));
        Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
          vmSymbols::object_initializer_name(),
!         cp->signature_ref_at(bcs->get_index_u2()));
        instanceKlassHandle mh(THREAD, m->method_holder());
        if (m->is_protected() && !mh->is_same_class_package(_klass())) {
          bool assignable = current_type().is_assignable_from(
            objectref_type, this, CHECK_VERIFY(this));
          if (!assignable) {
--- 2278,2289 ----
      if (name_in_supers(ref_class_type.name(), current_class())) {
        Klass* ref_klass = load_class(
          ref_class_type.name(), CHECK_VERIFY(this));
        Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
          vmSymbols::object_initializer_name(),
!         cp->signature_ref_at(bcs->get_index_u2()),
!         false);
        instanceKlassHandle mh(THREAD, m->method_holder());
        if (m->is_protected() && !mh->is_same_class_package(_klass())) {
          bool assignable = current_type().is_assignable_from(
            objectref_type, this, CHECK_VERIFY(this));
          if (!assignable) {