Mercurial > hg > graal-jvmci-8
diff src/share/vm/classfile/systemDictionary.cpp @ 22298:c28cb37b2e1d
Rename JVMCI to INCLUDE_JVMCI.
| author | twisti |
|---|---|
| date | Wed, 22 Jul 2015 08:56:03 -0700 |
| parents | be896a1983c0 |
| children | a17e3063a7b5 |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Wed Jul 22 15:50:08 2015 +0200 +++ b/src/share/vm/classfile/systemDictionary.cpp Wed Jul 22 08:56:03 2015 -0700 @@ -64,7 +64,7 @@ #include "services/threadService.hpp" #include "utilities/macros.hpp" #include "utilities/ticks.hpp" -#ifdef JVMCI +#if INCLUDE_JVMCI #include "jvmci/jvmciRuntime.hpp" #endif #if INCLUDE_TRACE @@ -96,7 +96,7 @@ bool SystemDictionary::_has_loadClassInternal = false; bool SystemDictionary::_has_checkPackageAccess = false; -#ifdef JVMCI +#if INCLUDE_JVMCI oop SystemDictionary::_jvmci_loader = NULL; oop SystemDictionary::jvmci_loader() { @@ -1865,7 +1865,7 @@ Klass** klassp = &_well_known_klasses[id]; bool must_load = (init_opt < SystemDictionary::Opt); if ((*klassp) == NULL) { -#ifdef JVMCI +#if INCLUDE_JVMCI bool is_jvmci = init_opt == SystemDictionary::Jvmci; assert(is_jvmci == (id >= (int)FIRST_JVMCI_WKID && id <= (int)LAST_JVMCI_WKID), "JVMCI WKIDs must be contiguous and separate from non-JVMCI WKIDs");