src/hotspot/share/classfile/verificationType.cpp

rev 58565 : 8238358: Implementation of JEP 371: Hidden Classes
Reviewed-by: duke
Contributed-by: mandy.chung@oracle.com, lois.foltan@oracle.com, david.holmes@oracle.com, harold.seigel@oracle.com, serguei.spitsyn@oracle.com, alex.buckley@oracle.com, jamsheed.c.m@oracle.com

*** 46,61 ****
  }
  
  bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Symbol* name,
           Symbol* from_name, bool from_field_is_protected, bool from_is_array, bool from_is_object, TRAPS) {
    HandleMark hm(THREAD);
!   Klass* this_class = SystemDictionary::resolve_or_fail(
        name, Handle(THREAD, klass->class_loader()),
        Handle(THREAD, klass->protection_domain()), true, CHECK_false);
    if (log_is_enabled(Debug, class, resolve)) {
      Verifier::trace_class_resolution(this_class, klass);
    }
  
    if (this_class->is_interface() && (!from_field_is_protected ||
        from_name != vmSymbols::java_lang_Object())) {
      // If we are not trying to access a protected field or method in
      // java.lang.Object then, for arrays, we only allow assignability
--- 46,66 ----
  }
  
  bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Symbol* name,
           Symbol* from_name, bool from_field_is_protected, bool from_is_array, bool from_is_object, TRAPS) {
    HandleMark hm(THREAD);
!   Klass* this_class;
!   if (klass->is_hidden() && klass->name() == name) {
!     this_class = klass;
!   } else {
!     this_class = SystemDictionary::resolve_or_fail(
        name, Handle(THREAD, klass->class_loader()),
        Handle(THREAD, klass->protection_domain()), true, CHECK_false);
      if (log_is_enabled(Debug, class, resolve)) {
        Verifier::trace_class_resolution(this_class, klass);
      }
+   }
  
    if (this_class->is_interface() && (!from_field_is_protected ||
        from_name != vmSymbols::java_lang_Object())) {
      // If we are not trying to access a protected field or method in
      // java.lang.Object then, for arrays, we only allow assignability
*** 63,78 ****
      // Otherwise, we treat interfaces as java.lang.Object.
      return !from_is_array ||
        this_class == SystemDictionary::Cloneable_klass() ||
        this_class == SystemDictionary::Serializable_klass();
    } else if (from_is_object) {
!     Klass* from_class = SystemDictionary::resolve_or_fail(
          from_name, Handle(THREAD, klass->class_loader()),
          Handle(THREAD, klass->protection_domain()), true, CHECK_false);
      if (log_is_enabled(Debug, class, resolve)) {
        Verifier::trace_class_resolution(from_class, klass);
      }
      return from_class->is_subclass_of(this_class);
    }
  
    return false;
  }
--- 68,88 ----
      // Otherwise, we treat interfaces as java.lang.Object.
      return !from_is_array ||
        this_class == SystemDictionary::Cloneable_klass() ||
        this_class == SystemDictionary::Serializable_klass();
    } else if (from_is_object) {
!     Klass* from_class;
!     if (klass->is_hidden() && klass->name() == from_name) {
!       from_class = klass;
!     } else {
!       from_class = SystemDictionary::resolve_or_fail(
          from_name, Handle(THREAD, klass->class_loader()),
          Handle(THREAD, klass->protection_domain()), true, CHECK_false);
        if (log_is_enabled(Debug, class, resolve)) {
          Verifier::trace_class_resolution(from_class, klass);
        }
+     }
      return from_class->is_subclass_of(this_class);
    }
  
    return false;
  }