added ClassPrelinker::replay_training_at_init_for_javabase_preloaded_classes()

Author: iklam

src/hotspot/share/cds/cdsConfig.cpp

@@ -41,6 +41,10 @@ bool CDSConfig::is_using_dumptime_tables() {
   return is_dumping_static_archive() || is_dumping_dynamic_archive();
 }
 
+bool CDSConfig::is_dumping_archive() {
+  return is_dumping_static_archive() || is_dumping_dynamic_archive();
+}
+
 bool CDSConfig::is_dumping_static_archive() {
   return DumpSharedSpaces || is_dumping_final_static_archive();
 }

src/hotspot/share/cds/classPrelinker.cpp

@@ -1174,3 +1174,19 @@ void ClassPrelinker::init_javabase_preloaded_classes(TRAPS) {
     }
   }
 }
+
+void ClassPrelinker::replay_training_at_init_for_javabase_preloaded_classes(TRAPS) {
+  Array<InstanceKlass*>* preloaded_klasses = _static_preloaded_klasses._boot;
+  if (preloaded_klasses != nullptr) {
+    for (int i = 0; i < preloaded_klasses->length(); i++) {
+      InstanceKlass* ik = preloaded_klasses->at(i);
+      if (ik->is_initialized()) {
+        if (log_is_enabled(Debug, cds, init)) {
+          ResourceMark rm;
+          log_debug(cds, init)("replay training %s", ik->external_name());
+        }
+        ik->replay_training_at_init(CHECK);
+      }
+    }
+  }
+}

src/hotspot/share/cds/classPrelinker.hpp

@@ -155,6 +155,7 @@ class ClassPrelinker :  AllStatic {
 
   static void runtime_preload(JavaThread* current, Handle loader);
   static void init_javabase_preloaded_classes(TRAPS);
+  static void replay_training_at_init_for_javabase_preloaded_classes(TRAPS);
   static bool class_preloading_finished();
 };
 

src/hotspot/share/compiler/compileBroker.hpp

@@ -291,6 +291,7 @@ class CompileBroker: AllStatic {
     return nullptr;
   }
 
+  static bool initialized() { return _initialized; }
   static bool compilation_is_complete(const methodHandle& method, int osr_bci, int comp_level, bool online_only = false);
   static bool compilation_is_in_queue(const methodHandle& method);
   static void print_compile_queues(outputStream* st);

src/hotspot/share/oops/instanceKlass.cpp

@@ -1319,7 +1319,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
 }
 
 void InstanceKlass::replay_training_at_init(TRAPS) {
-  if (TrainingData::have_data()) {
+  if (CompileBroker::initialized() && TrainingData::have_data()) {
     KlassTrainingData* ktd = KlassTrainingData::find(this);
     if (ktd != nullptr) {
       guarantee(ktd->has_holder(), "");

src/hotspot/share/oops/instanceKlass.hpp

@@ -558,6 +558,7 @@ class InstanceKlass: public Klass {
   bool should_be_initialized() const;  // means that initialize should be called
   void initialize_from_cds(TRAPS);
   void initialize(TRAPS);
+  void replay_training_at_init(TRAPS);
   void link_class(TRAPS);
   bool link_class_or_fail(TRAPS); // returns false on failure
   void rewrite_class(TRAPS);
@@ -1122,7 +1123,6 @@ class InstanceKlass: public Klass {
 
   void add_initialization_error(JavaThread* current, Handle exception);
   oop get_initialization_error(JavaThread* current);
-  void replay_training_at_init(TRAPS);
 
   // find a local method (returns null if not found)
   Method* find_method_impl(const Symbol* name,

src/hotspot/share/runtime/threads.cpp

@@ -758,6 +758,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
   if (CDSConfig::has_preloaded_classes()) {
     force_JVMCI_initialization = initialize_compilation(CHECK_JNI_ERR);
+    ClassPrelinker::replay_training_at_init_for_javabase_preloaded_classes(CHECK_JNI_ERR);
   }
 
   // This will initialize the module system.  Only java.base classes can be