src/share/vm/memory/universe.cpp

*** 113,122 ****
--- 113,123 ----
  oop Universe::_the_null_string                        = NULL;
  oop Universe::_the_min_jint_string                   = NULL;
  LatestMethodCache* Universe::_finalizer_register_cache = NULL;
  LatestMethodCache* Universe::_loader_addClass_cache    = NULL;
  LatestMethodCache* Universe::_pd_implies_cache         = NULL;
+ LatestMethodCache* Universe::_throw_illegal_access_error_cache = NULL;
  oop Universe::_out_of_memory_error_java_heap          = NULL;
  oop Universe::_out_of_memory_error_metaspace          = NULL;
  oop Universe::_out_of_memory_error_class_metaspace    = NULL;
  oop Universe::_out_of_memory_error_array_size         = NULL;
  oop Universe::_out_of_memory_error_gc_overhead_limit  = NULL;
*** 128,138 ****
  oop Universe::_arithmetic_exception_instance          = NULL;
  oop Universe::_virtual_machine_error_instance         = NULL;
  oop Universe::_vm_exception                           = NULL;
  oop Universe::_allocation_context_notification_obj    = NULL;
  
- Method* Universe::_throw_illegal_access_error         = NULL;
  Array<int>* Universe::_the_empty_int_array            = NULL;
  Array<u2>* Universe::_the_empty_short_array           = NULL;
  Array<Klass*>* Universe::_the_empty_klass_array     = NULL;
  Array<Method*>* Universe::_the_empty_method_array   = NULL;
  
--- 129,138 ----
*** 234,243 ****
--- 234,244 ----
    f->do_ptr((void**)&_the_empty_method_array);
    f->do_ptr((void**)&_the_empty_klass_array);
    _finalizer_register_cache->serialize(f);
    _loader_addClass_cache->serialize(f);
    _pd_implies_cache->serialize(f);
+   _throw_illegal_access_error_cache->serialize(f);
  }
  
  void Universe::check_alignment(uintx size, uintx alignment, const char* name) {
    if (size < alignment || size % alignment != 0) {
      vm_exit_during_initialization(
*** 662,671 ****
--- 663,673 ----
    // We have a heap so create the Method* caches before
    // Metaspace::initialize_shared_spaces() tries to populate them.
    Universe::_finalizer_register_cache = new LatestMethodCache();
    Universe::_loader_addClass_cache    = new LatestMethodCache();
    Universe::_pd_implies_cache         = new LatestMethodCache();
+   Universe::_throw_illegal_access_error_cache = new LatestMethodCache();
  
    if (UseSharedSpaces) {
      // Read the data structures supporting the shared spaces (shared
      // system dictionary, symbol table, etc.).  After that, access to
      // the file (other than the mapped regions) is no longer needed, and
*** 1127,1137 ****
      // Note null is okay; this method is used in itables, and if it is null,
      // then AbstractMethodError is thrown instead.
      tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
      return false; // initialization failed (cannot throw exception yet)
    }
!   Universe::_throw_illegal_access_error = m;
  
    // Setup method for registering loaded classes in class loader vector
    InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
    m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
    if (m == NULL || m->is_static()) {
--- 1129,1140 ----
      // Note null is okay; this method is used in itables, and if it is null,
      // then AbstractMethodError is thrown instead.
      tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
      return false; // initialization failed (cannot throw exception yet)
    }
!   Universe::_throw_illegal_access_error_cache->init(
!     SystemDictionary::misc_Unsafe_klass(), m);
  
    // Setup method for registering loaded classes in class loader vector
    InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
    m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
    if (m == NULL || m->is_static()) {
*** 1153,1163 ****
        // <init> function before java_lang_Class is linked. Print error and exit.
        tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage");
        return false; // initialization failed
      }
      Universe::_pd_implies_cache->init(
!       SystemDictionary::ProtectionDomain_klass(), m);;
    }
  
    // This needs to be done before the first scavenge/gc, since
    // it's an input to soft ref clearing policy.
    {
--- 1156,1166 ----
        // <init> function before java_lang_Class is linked. Print error and exit.
        tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage");
        return false; // initialization failed
      }
      Universe::_pd_implies_cache->init(
!       SystemDictionary::ProtectionDomain_klass(), m);
    }
  
    // This needs to be done before the first scavenge/gc, since
    // it's an input to soft ref clearing policy.
    {