src/hotspot/share/classfile/systemDictionary.hpp

*** 24,34 ****
  
  #ifndef SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
  #define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
  
  #include "classfile/classLoader.hpp"
- #include "jvmci/systemDictionary_jvmci.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/java.hpp"
  #include "runtime/reflectionUtils.hpp"
  #include "runtime/signature.hpp"
--- 24,33 ----
*** 210,222 ****
    do_klass(Byte_klass,                                  java_lang_Byte                                        ) \
    do_klass(Short_klass,                                 java_lang_Short                                       ) \
    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*/
  
  
  class SystemDictionary : AllStatic {
    friend class VMStructs;
--- 209,218 ----
*** 230,244 ****
      WK_KLASSES_DO(WK_KLASS_ENUM)
      #undef WK_KLASS_ENUM
  
      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
    };
  
    // Returns a class with a given class name and class loader.  Loads the
    // class if needed. If not found a NoClassDefFoundError or a
--- 226,235 ----