Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/systemDictionary.cpp @ 22298:c28cb37b2e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents be896a1983c0
children a17e3063a7b5
comparison
equal deleted inserted replaced
22297:571202729bbf 22298:c28cb37b2e1d
62 #include "runtime/signature.hpp" 62 #include "runtime/signature.hpp"
63 #include "services/classLoadingService.hpp" 63 #include "services/classLoadingService.hpp"
64 #include "services/threadService.hpp" 64 #include "services/threadService.hpp"
65 #include "utilities/macros.hpp" 65 #include "utilities/macros.hpp"
66 #include "utilities/ticks.hpp" 66 #include "utilities/ticks.hpp"
67 #ifdef JVMCI 67 #if INCLUDE_JVMCI
68 #include "jvmci/jvmciRuntime.hpp" 68 #include "jvmci/jvmciRuntime.hpp"
69 #endif 69 #endif
70 #if INCLUDE_TRACE 70 #if INCLUDE_TRACE
71 #include "trace/tracing.hpp" 71 #include "trace/tracing.hpp"
72 #endif 72 #endif
94 oop SystemDictionary::_java_system_loader = NULL; 94 oop SystemDictionary::_java_system_loader = NULL;
95 95
96 bool SystemDictionary::_has_loadClassInternal = false; 96 bool SystemDictionary::_has_loadClassInternal = false;
97 bool SystemDictionary::_has_checkPackageAccess = false; 97 bool SystemDictionary::_has_checkPackageAccess = false;
98 98
99 #ifdef JVMCI 99 #if INCLUDE_JVMCI
100 oop SystemDictionary::_jvmci_loader = NULL; 100 oop SystemDictionary::_jvmci_loader = NULL;
101 101
102 oop SystemDictionary::jvmci_loader() { 102 oop SystemDictionary::jvmci_loader() {
103 return _jvmci_loader; 103 return _jvmci_loader;
104 } 104 }
1863 int sid = (info >> CEIL_LG_OPTION_LIMIT); 1863 int sid = (info >> CEIL_LG_OPTION_LIMIT);
1864 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); 1864 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid);
1865 Klass** klassp = &_well_known_klasses[id]; 1865 Klass** klassp = &_well_known_klasses[id];
1866 bool must_load = (init_opt < SystemDictionary::Opt); 1866 bool must_load = (init_opt < SystemDictionary::Opt);
1867 if ((*klassp) == NULL) { 1867 if ((*klassp) == NULL) {
1868 #ifdef JVMCI 1868 #if INCLUDE_JVMCI
1869 bool is_jvmci = init_opt == SystemDictionary::Jvmci; 1869 bool is_jvmci = init_opt == SystemDictionary::Jvmci;
1870 assert(is_jvmci == (id >= (int)FIRST_JVMCI_WKID && id <= (int)LAST_JVMCI_WKID), 1870 assert(is_jvmci == (id >= (int)FIRST_JVMCI_WKID && id <= (int)LAST_JVMCI_WKID),
1871 "JVMCI WKIDs must be contiguous and separate from non-JVMCI WKIDs"); 1871 "JVMCI WKIDs must be contiguous and separate from non-JVMCI WKIDs");
1872 if (is_jvmci) { 1872 if (is_jvmci) {
1873 (*klassp) = resolve_or_fail(symbol, _jvmci_loader, Handle(), true, CHECK_0); // load required JVMCI class 1873 (*klassp) = resolve_or_fail(symbol, _jvmci_loader, Handle(), true, CHECK_0); // load required JVMCI class