Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit 2b465b1

Browse files
committedMar 13, 2020
8241010: Unnecessarily resolving some well-known classes
Reviewed-by: coleenp
1 parent 3762967 commit 2b465b1

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed
 

‎src/hotspot/share/classfile/systemDictionary.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ class GCTimer;
226226
class SystemDictionary : AllStatic {
227227
friend class BootstrapInfo;
228228
friend class VMStructs;
229-
friend class SystemDictionaryHandles;
230229

231230
public:
232231
enum WKID {

‎src/hotspot/share/memory/universe.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ bool universe_post_init() {
863863
Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false);
864864

865865
// Setup preallocated OutOfMemoryError errors
866-
Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_OutOfMemoryError(), true, CHECK_false);
866+
Klass* k = SystemDictionary::OutOfMemoryError_klass();
867867
InstanceKlass* ik = InstanceKlass::cast(k);
868868
Universe::_out_of_memory_error_java_heap = ik->allocate_instance(CHECK_false);
869869
Universe::_out_of_memory_error_metaspace = ik->allocate_instance(CHECK_false);
@@ -889,8 +889,7 @@ bool universe_post_init() {
889889
k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ArithmeticException(), true, CHECK_false);
890890
Universe::_arithmetic_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false);
891891
// Virtual Machine Error for when we get into a situation we can't resolve
892-
k = SystemDictionary::resolve_or_fail(
893-
vmSymbols::java_lang_VirtualMachineError(), true, CHECK_false);
892+
k = SystemDictionary::VirtualMachineError_klass();
894893
bool linked = InstanceKlass::cast(k)->link_class_or_fail(CHECK_false);
895894
if (!linked) {
896895
tty->print_cr("Unable to link/verify VirtualMachineError class");

‎src/hotspot/share/prims/stackwalk.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void JavaFrameStream::fill_frame(int index, objArrayHandle frames_array,
187187
// T_OBJECT, or T_CONFLICT.
188188
oop LiveFrameStream::create_primitive_slot_instance(StackValueCollection* values,
189189
int i, BasicType type, TRAPS) {
190-
Klass* k = SystemDictionary::resolve_or_null(vmSymbols::java_lang_LiveStackFrameInfo(), CHECK_NULL);
190+
Klass* k = SystemDictionary::LiveStackFrameInfo_klass();
191191
InstanceKlass* ik = InstanceKlass::cast(k);
192192

193193
JavaValue result(T_OBJECT);

‎src/hotspot/share/runtime/thread.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name
12411241
return;
12421242
}
12431243

1244-
Klass* group = SystemDictionary::ThreadGroup_klass();
1244+
Klass* group = SystemDictionary::ThreadGroup_klass();
12451245
Handle threadObj(THREAD, this->threadObj());
12461246

12471247
JavaCalls::call_special(&result,
@@ -3613,7 +3613,7 @@ void Threads::possibly_parallel_threads_do(bool is_par, ThreadClosure* tc) {
36133613
// fields in, out, and err. Set up java signal handlers, OS-specific
36143614
// system settings, and thread group of the main thread.
36153615
static void call_initPhase1(TRAPS) {
3616-
Klass* klass = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
3616+
Klass* klass = SystemDictionary::System_klass();
36173617
JavaValue result(T_VOID);
36183618
JavaCalls::call_static(&result, klass, vmSymbols::initPhase1_name(),
36193619
vmSymbols::void_method_signature(), CHECK);
@@ -3633,7 +3633,7 @@ static void call_initPhase1(TRAPS) {
36333633
static void call_initPhase2(TRAPS) {
36343634
TraceTime timer("Initialize module system", TRACETIME_LOG(Info, startuptime));
36353635

3636-
Klass* klass = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
3636+
Klass* klass = SystemDictionary::System_klass();
36373637

36383638
JavaValue result(T_INT);
36393639
JavaCallArguments args;
@@ -3655,7 +3655,7 @@ static void call_initPhase2(TRAPS) {
36553655
// and system class loader may be a custom class loaded from -Xbootclasspath/a,
36563656
// other modules or the application's classpath.
36573657
static void call_initPhase3(TRAPS) {
3658-
Klass* klass = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
3658+
Klass* klass = SystemDictionary::System_klass();
36593659
JavaValue result(T_VOID);
36603660
JavaCalls::call_static(&result, klass, vmSymbols::initPhase3_name(),
36613661
vmSymbols::void_method_signature(), CHECK);

‎src/hotspot/share/services/diagnosticCommand.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,7 @@ void SystemGCDCmd::execute(DCmdSource source, TRAPS) {
440440
}
441441

442442
void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
443-
Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(),
444-
true, CHECK);
443+
Klass* k = SystemDictionary::System_klass();
445444
JavaValue result(T_VOID);
446445
JavaCalls::call_static(&result, k,
447446
vmSymbols::run_finalization_name(),

0 commit comments

Comments
 (0)