equal
deleted
inserted
replaced
655 // boot/platform/app classloader, or must be in the unnamed module defined in the |
655 // boot/platform/app classloader, or must be in the unnamed module defined in the |
656 // AppClassLoader. |
656 // AppClassLoader. |
657 bool SystemDictionaryShared::is_shared_class_visible_for_classloader( |
657 bool SystemDictionaryShared::is_shared_class_visible_for_classloader( |
658 InstanceKlass* ik, |
658 InstanceKlass* ik, |
659 Handle class_loader, |
659 Handle class_loader, |
660 const char* pkg_string, |
|
661 Symbol* pkg_name, |
660 Symbol* pkg_name, |
662 PackageEntry* pkg_entry, |
661 PackageEntry* pkg_entry, |
663 ModuleEntry* mod_entry, |
662 ModuleEntry* mod_entry, |
664 TRAPS) { |
663 TRAPS) { |
665 assert(class_loader.not_null(), "Class loader should not be NULL"); |
664 assert(class_loader.not_null(), "Class loader should not be NULL"); |
682 return true; // Module class from the runtime image |
681 return true; // Module class from the runtime image |
683 } |
682 } |
684 } |
683 } |
685 } else if (SystemDictionary::is_system_class_loader(class_loader())) { |
684 } else if (SystemDictionary::is_system_class_loader(class_loader())) { |
686 assert(ent != NULL, "shared class for system loader should have valid SharedClassPathEntry"); |
685 assert(ent != NULL, "shared class for system loader should have valid SharedClassPathEntry"); |
687 if (pkg_string == NULL) { |
686 if (pkg_name == NULL) { |
688 // The archived class is in the unnamed package. Currently, the boot image |
687 // The archived class is in the unnamed package. Currently, the boot image |
689 // does not contain any class in the unnamed package. |
688 // does not contain any class in the unnamed package. |
690 assert(!ent->is_modules_image(), "Class in the unnamed package must be from the classpath"); |
689 assert(!ent->is_modules_image(), "Class in the unnamed package must be from the classpath"); |
691 if (path_index >= ClassLoaderExt::app_class_paths_start_index()) { |
690 if (path_index >= ClassLoaderExt::app_class_paths_start_index()) { |
692 assert(path_index < ClassLoaderExt::app_module_paths_start_index(), "invalid path_index"); |
691 assert(path_index < ClassLoaderExt::app_module_paths_start_index(), "invalid path_index"); |