src/hotspot/share/classfile/javaClasses.hpp

rev 50453 : imported patch 02.removeInArchiveRoot
rev 50454 : imported patch cleanups

*** 227,238 ****
    static void serialize(SerializeClosure* f) NOT_CDS_RETURN;
    static void archive_basic_type_mirrors(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
    static oop  archive_mirror(Klass* k, TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
    static oop  process_archived_mirror(Klass* k, oop mirror, oop archived_mirror, Thread *THREAD)
                                        NOT_CDS_JAVA_HEAP_RETURN_(NULL);
!   static void restore_archived_mirror(Klass *k, Handle mirror, Handle class_loader, Handle module,
!                                       Handle protection_domain, TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
  
    static void fixup_module_field(Klass* k, Handle module);
  
    // Conversion
    static Klass* as_Klass(oop java_class);
--- 227,239 ----
    static void serialize(SerializeClosure* f) NOT_CDS_RETURN;
    static void archive_basic_type_mirrors(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
    static oop  archive_mirror(Klass* k, TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
    static oop  process_archived_mirror(Klass* k, oop mirror, oop archived_mirror, Thread *THREAD)
                                        NOT_CDS_JAVA_HEAP_RETURN_(NULL);
!   static bool restore_archived_mirror(Klass *k, Handle class_loader, Handle module,
!                                       Handle protection_domain,
!                                       TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(false);
  
    static void fixup_module_field(Klass* k, Handle module);
  
    // Conversion
    static Klass* as_Klass(oop java_class);