src/hotspot/share/cds/finalImageRecipes.hpp

*** 49,26 ***
    // The classes who have resolved at least one indy CP entry during the training run.
    // _indy_cp_indices[i] is a list of all resolved CP entries for _indy_klasses[i].
    Array<InstanceKlass*>* _indy_klasses;
    Array<Array<int>*>*    _indy_cp_indices;
  
!   FinalImageRecipes() : _indy_klasses(nullptr), _indy_cp_indices(nullptr) {}
  
    void* operator new(size_t size) throw();
  
    // Called when dumping preimage
    void record_recipes_impl();
  
    // Called when dumping final image
    void apply_recipes_impl(TRAPS);
    void load_all_classes(TRAPS);
    void apply_recipes_for_invokedynamic(TRAPS);
  
  public:
    static void serialize(SerializeClosure* soc);
  
    // Called when dumping preimage
    static void record_recipes();
  
    // Called when dumping final image
    static void apply_recipes(TRAPS);
  };
--- 49,58 ---
    // The classes who have resolved at least one indy CP entry during the training run.
    // _indy_cp_indices[i] is a list of all resolved CP entries for _indy_klasses[i].
    Array<InstanceKlass*>* _indy_klasses;
    Array<Array<int>*>*    _indy_cp_indices;
  
!   // The RefectionData for  _reflect_klasses[i] should be initialized with _reflect_flags[i]
+   Array<InstanceKlass*>* _reflect_klasses;
+   Array<int>*            _reflect_flags;
+ 
+   static GrowableArray<InstanceKlass*>* _tmp_reflect_klasses;
+   static GrowableArray<int>* _tmp_reflect_flags;
+ 
+   struct TmpDynamicProxyClassInfo {
+     int _loader_type;
+     int _access_flags;
+     const char* _proxy_name;
+     GrowableArray<Klass*>* _interfaces;
+   };
+ 
+   struct DynamicProxyClassInfo {
+     int _loader_type;
+     int _access_flags;
+     const char* _proxy_name;
+     Array<Klass*>* _interfaces;
+   };
+ 
+   Array<DynamicProxyClassInfo>* _dynamic_proxy_classes;
+ 
+   static GrowableArray<TmpDynamicProxyClassInfo>* _tmp_dynamic_proxy_classes;
+ 
+   FinalImageRecipes() : _indy_klasses(nullptr), _indy_cp_indices(nullptr),
+                         _reflect_klasses(nullptr), _reflect_flags(nullptr),
+                         _dynamic_proxy_classes(nullptr) {}
+ 
  
    void* operator new(size_t size) throw();
  
    // Called when dumping preimage
    void record_recipes_impl();
  
    // Called when dumping final image
    void apply_recipes_impl(TRAPS);
    void load_all_classes(TRAPS);
+   void apply_recipes_for_dynamic_proxies(TRAPS);
    void apply_recipes_for_invokedynamic(TRAPS);
+   void apply_recipes_for_reflection_data(JavaThread* current);
  
  public:
    static void serialize(SerializeClosure* soc);
  
    // Called when dumping preimage
+   static void add_dynamic_proxy_class(oop loader, const char* proxy_name, objArrayOop interfaces, int access_flags);
+   static void add_reflection_data_flags(InstanceKlass* ik, TRAPS);
    static void record_recipes();
  
    // Called when dumping final image
    static void apply_recipes(TRAPS);
  };