src/hotspot/share/cds/heapShared.hpp

@@ -23,10 +23,11 @@
   */
  
  #ifndef SHARE_CDS_HEAPSHARED_HPP
  #define SHARE_CDS_HEAPSHARED_HPP
  
+ #include "cds/cds_globals.hpp"
  #include "cds/dumpTimeClassInfo.hpp"
  #include "cds/metaspaceShared.hpp"
  #include "classfile/compactHashtable.hpp"
  #include "classfile/javaClasses.hpp"
  #include "gc/shared/gc_globals.hpp"

@@ -307,12 +308,14 @@
    //    - ConstantPool::resolved_references()
    //    - Universe::<xxx>_exception_instance()
    static KlassSubGraphInfo* _dump_time_special_subgraph;              // for collecting info during dump time
    static ArchivedKlassSubGraphInfoRecord* _run_time_special_subgraph; // for initializing classes during run time.
  
-   static GrowableArrayCHeap<oop, mtClassShared>* _pending_roots;
+   static GrowableArrayCHeap<OopHandle, mtClassShared>* _pending_roots;
    static GrowableArrayCHeap<OopHandle, mtClassShared>* _root_segments;
+   static GrowableArrayCHeap<oop, mtClassShared>* _trace; // for debugging unarchivable objects
+   static GrowableArrayCHeap<const char*, mtClassShared>* _context; // for debugging unarchivable objects
    static int _root_segment_max_size_elems;
    static OopHandle _scratch_basic_type_mirrors[T_VOID+1];
    static MetaspaceObjToOopHandleTable* _scratch_java_mirror_table;
    static MetaspaceObjToOopHandleTable* _scratch_references_table;
  

@@ -324,10 +327,13 @@
      assert(_seen_objects_table != nullptr, "must be");
      delete _seen_objects_table;
      _seen_objects_table = nullptr;
    }
  
+   class ArchivingObjectMark;
+   class ContextMark;
+ 
    // Statistics (for one round of start_recording_subgraph ... done_recording_subgraph)
    static int _num_new_walked_objs;
    static int _num_new_archived_objs;
    static int _num_old_recorded_klasses;
  

@@ -377,10 +383,11 @@
    static void find_all_aot_initialized_classes();
    static void find_all_aot_initialized_classes_helper();
    static bool scan_for_aot_initialized_classes(oop obj);
  
   public:
+   static void exit_on_error();
    static void reset_archived_object_states(TRAPS);
    static void create_archived_object_cache() {
      _archived_object_cache =
        new (mtClass)ArchivedObjectCache(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE);
    }

@@ -400,10 +407,12 @@
                                               KlassSubGraphInfo* subgraph_info,
                                               oop orig_obj);
  
    static void add_to_dumped_interned_strings(oop string);
  
+   static void track_scratch_object(oop orig_obj, oop scratch_obj);
+ 
    // Scratch objects for archiving Klass::java_mirror()
    static void set_scratch_java_mirror(Klass* k, oop mirror);
    static void remove_scratch_objects(Klass* k);
    static void get_pointer_info(oop src_obj, bool& has_oop_pointers, bool& has_native_pointers);
    static void set_has_native_pointers(oop src_obj);

@@ -423,25 +432,24 @@
    // Other types of roots are also cleared similarly when they become referenced.
  
    // Dump-time only. Returns the index of the root, which can be used at run time to read
    // the root using get_root(index, ...).
    static int append_root(oop obj);
-   static GrowableArrayCHeap<oop, mtClassShared>* pending_roots() { return _pending_roots; }
+   static GrowableArrayCHeap<OopHandle, mtClassShared>* pending_roots() { return _pending_roots; }
  
    // Dump-time and runtime
    static objArrayOop root_segment(int segment_idx);
    static oop get_root(int index, bool clear=false);
  
    // Run-time only
    static void clear_root(int index);
- 
    static void get_segment_indexes(int index, int& segment_index, int& internal_index);
- 
    static void setup_test_class(const char* test_class_name) PRODUCT_RETURN;
  #endif // INCLUDE_CDS_JAVA_HEAP
  
   public:
+   static oop orig_to_scratch_object(oop orig_obj);
    static objArrayOop scratch_resolved_references(ConstantPool* src);
    static void add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) NOT_CDS_JAVA_HEAP_RETURN;
    static void init_scratch_objects(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
    static void init_box_classes(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
    static bool is_heap_region(int idx) {

@@ -461,19 +469,36 @@
  #ifndef PRODUCT
    static bool is_a_test_class_in_unnamed_module(Klass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
    static void initialize_test_class_from_archive(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
  #endif
  
+   static void add_to_permanent_oop_table(oop obj, int offset);
+ 
+   // AOT-compile time only: get a stable index for an archived object.
+   // Returns 0 if obj is not archived.
+   static int get_archived_object_permanent_index(oop obj) NOT_CDS_JAVA_HEAP_RETURN_(-1);
+   // Runtime only: get back the same object for an index returned by
+   // get_archived_object_permanent_index().
+   static oop get_archived_object(int permanent_index) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
+ 
    static void initialize_java_lang_invoke(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
    static void init_classes_for_special_subgraph(Handle loader, TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
  
    static bool is_lambda_form_klass(InstanceKlass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
    static bool is_lambda_proxy_klass(InstanceKlass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
    static bool is_string_concat_klass(InstanceKlass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
    static bool is_archivable_hidden_klass(InstanceKlass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
  };
  
+ class CachedCodeDirectoryInternal {
+   int _permanent_oop_count;
+   int* _permanent_oop_offsets; // offset of each permanent object from the bottom of the archived heap
+ public:
+   void dumptime_init_internal();
+   void runtime_init_internal();
+ };
+ 
  #if INCLUDE_CDS_JAVA_HEAP
  class DumpedInternedStrings :
    public ResizeableResourceHashtable<oop, bool,
                             AnyObj::C_HEAP,
                             mtClassShared,