--- a/src/hotspot/share/classfile/systemDictionary.hpp Wed May 01 12:41:26 2019 -0400
+++ b/src/hotspot/share/classfile/systemDictionary.hpp Wed May 01 12:31:29 2019 -0700
@@ -26,7 +26,6 @@
#define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
#include "classfile/classLoaderData.hpp"
-#include "jvmci/systemDictionary_jvmci.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/symbol.hpp"
#include "runtime/java.hpp"
@@ -215,9 +214,6 @@
do_klass(Integer_klass, java_lang_Integer ) \
do_klass(Long_klass, java_lang_Long ) \
\
- /* JVMCI classes. These are loaded on-demand. */ \
- JVMCI_WK_KLASSES_DO(do_klass) \
- \
/*end*/
@@ -236,11 +232,6 @@
WKID_LIMIT,
-#if INCLUDE_JVMCI
- FIRST_JVMCI_WKID = WK_KLASS_ENUM_NAME(JVMCI_klass),
- LAST_JVMCI_WKID = WK_KLASS_ENUM_NAME(Value_klass),
-#endif
-
FIRST_WKID = NO_WKID + 1
};