--- old/src/hotspot/share/memory/heapShared.hpp	2020-08-31 08:09:22.827748766 -0700
+++ new/src/hotspot/share/memory/heapShared.hpp	2020-08-31 08:09:22.603740334 -0700
@@ -40,7 +40,8 @@
 #if INCLUDE_CDS_JAVA_HEAP
 struct ArchivableStaticFieldInfo {
   const char* klass_name;
-  const char* field_name;
+  int full_module_graph_only;
+  const char* field_name;  
   InstanceKlass* klass;
   int offset;
   BasicType type;
@@ -236,7 +237,10 @@
   static bool has_been_seen_during_subgraph_recording(oop obj);
   static void set_has_been_seen_during_subgraph_recording(oop obj);
 
+  static void check_module_oop(oop orig_module_obj);
+
  public:
+  static void reset_archived_object_states(TRAPS);
   static void create_archived_object_cache() {
     _archived_object_cache =
       new (ResourceObj::C_HEAP, mtClass)ArchivedObjectCache();