equal
deleted
inserted
replaced
576 } |
576 } |
577 } |
577 } |
578 } |
578 } |
579 #endif |
579 #endif |
580 |
580 |
581 bool ClassPathImageEntry::is_jrt() { |
581 bool ClassPathImageEntry::is_modules_image() const { |
582 return ClassLoader::is_jrt(name()); |
582 return ClassLoader::is_modules_image(name()); |
583 } |
583 } |
584 |
584 |
585 #if INCLUDE_CDS |
585 #if INCLUDE_CDS |
586 void ClassLoader::exit_with_path_failure(const char* error, const char* message) { |
586 void ClassLoader::exit_with_path_failure(const char* error, const char* message) { |
587 assert(DumpSharedSpaces, "only called at dump time"); |
587 assert(DumpSharedSpaces, "only called at dump time"); |
793 ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK); |
793 ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK); |
794 |
794 |
795 // Check for a jimage |
795 // Check for a jimage |
796 if (Arguments::has_jimage()) { |
796 if (Arguments::has_jimage()) { |
797 assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice"); |
797 assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice"); |
798 assert(new_entry != NULL && new_entry->is_jrt(), "No java runtime image present"); |
798 assert(new_entry != NULL && new_entry->is_modules_image(), "No java runtime image present"); |
799 _jrt_entry = new_entry; |
799 _jrt_entry = new_entry; |
800 ++_num_entries; |
800 ++_num_entries; |
801 #if INCLUDE_CDS |
801 #if INCLUDE_CDS |
802 if (DumpSharedSpaces) { |
802 if (DumpSharedSpaces) { |
803 JImageFile *jimage = _jrt_entry->jimage(); |
803 JImageFile *jimage = _jrt_entry->jimage(); |
1844 _jrt_entry->compile_the_world(system_class_loader, CATCH); |
1844 _jrt_entry->compile_the_world(system_class_loader, CATCH); |
1845 |
1845 |
1846 // Iterate over all bootstrap class path appended entries |
1846 // Iterate over all bootstrap class path appended entries |
1847 ClassPathEntry* e = _first_append_entry; |
1847 ClassPathEntry* e = _first_append_entry; |
1848 while (e != NULL) { |
1848 while (e != NULL) { |
1849 assert(!e->is_jrt(), "A modular java runtime image is present on the list of appended entries"); |
1849 assert(!e->is_modules_image(), "A modular java runtime image is present on the list of appended entries"); |
1850 e->compile_the_world(system_class_loader, CATCH); |
1850 e->compile_the_world(system_class_loader, CATCH); |
1851 e = e->next(); |
1851 e = e->next(); |
1852 } |
1852 } |
1853 jlong end = os::javaTimeMillis(); |
1853 jlong end = os::javaTimeMillis(); |
1854 tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, " JLONG_FORMAT " ms)", |
1854 tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, " JLONG_FORMAT " ms)", |