equal
deleted
inserted
replaced
2061 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
2061 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
2062 int info = wk_init_info[id - FIRST_WKID]; |
2062 int info = wk_init_info[id - FIRST_WKID]; |
2063 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
2063 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
2064 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); |
2064 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); |
2065 InstanceKlass** klassp = &_well_known_klasses[id]; |
2065 InstanceKlass** klassp = &_well_known_klasses[id]; |
2066 bool must_load = (init_opt < SystemDictionary::Opt); |
2066 |
|
2067 bool must_load; |
|
2068 #if INCLUDE_JVMCI |
|
2069 if (EnableJVMCI) { |
|
2070 // If JVMCI is enabled we require its classes to be found. |
|
2071 must_load = (init_opt < SystemDictionary::Opt) || (init_opt == SystemDictionary::Jvmci); |
|
2072 } else |
|
2073 #endif |
|
2074 { |
|
2075 must_load = (init_opt < SystemDictionary::Opt); |
|
2076 } |
|
2077 |
2067 if ((*klassp) == NULL) { |
2078 if ((*klassp) == NULL) { |
2068 Klass* k; |
2079 Klass* k; |
2069 if (must_load) { |
2080 if (must_load) { |
2070 k = resolve_or_fail(symbol, true, CHECK_0); // load required class |
2081 k = resolve_or_fail(symbol, true, CHECK_0); // load required class |
2071 } else { |
2082 } else { |