--- a/src/hotspot/share/classfile/systemDictionary.hpp Mon May 07 20:42:36 2018 +0200
+++ b/src/hotspot/share/classfile/systemDictionary.hpp Thu Apr 26 13:40:58 2018 -0700
@@ -26,7 +26,6 @@
#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
#include "classfile/classLoader.hpp"
-#include "classfile/systemDictionary_ext.hpp"
#include "jvmci/systemDictionary_jvmci.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/symbol.hpp"
@@ -186,6 +185,7 @@
do_klass(File_klass, java_io_File, Pre ) \
do_klass(URL_klass, java_net_URL, Pre ) \
do_klass(Jar_Manifest_klass, java_util_jar_Manifest, Pre ) \
+ do_klass(jdk_internal_loader_ClassLoaders_klass, jdk_internal_loader_ClassLoaders, Pre ) \
do_klass(jdk_internal_loader_ClassLoaders_AppClassLoader_klass, jdk_internal_loader_ClassLoaders_AppClassLoader, Pre ) \
do_klass(jdk_internal_loader_ClassLoaders_PlatformClassLoader_klass, jdk_internal_loader_ClassLoaders_PlatformClassLoader, Pre ) \
do_klass(CodeSource_klass, java_security_CodeSource, Pre ) \
@@ -212,8 +212,6 @@
do_klass(Integer_klass, java_lang_Integer, Pre ) \
do_klass(Long_klass, java_lang_Long, Pre ) \
\
- /* Extensions */ \
- WK_KLASSES_DO_EXT(do_klass) \
/* JVMCI classes. These are loaded on-demand. */ \
JVMCI_WK_KLASSES_DO(do_klass) \
\
@@ -223,7 +221,6 @@
class SystemDictionary : AllStatic {
friend class VMStructs;
friend class SystemDictionaryHandles;
- friend class SharedClassUtil;
public:
enum WKID {