archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8232881: Remove unnecessary InstanceKlass::casts

Browse source 
Reviewed-by: coleenp
This commit is contained in:
Claes Redestad 2019-10-23 18:34:25 +02:00
parent bbc4e0d999
commit 36ac846d35
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/classfile/classListParser.cpp
View file

@ -233,7 +233,7 @@ void ClassListParser::print_actual_interfaces(InstanceKlass *ik) {
int n = ik->local_interfaces()->length(); int n = ik->local_interfaces()->length();
jio_fprintf(defaultStream::error_stream(), "Actual interfaces[%d] = {\n", n); jio_fprintf(defaultStream::error_stream(), "Actual interfaces[%d] = {\n", n);
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
InstanceKlass* e = InstanceKlass::cast(ik->local_interfaces()->at(i)); InstanceKlass* e = ik->local_interfaces()->at(i);
jio_fprintf(defaultStream::error_stream(), " %s\n", e->name()->as_klass_external_name()); jio_fprintf(defaultStream::error_stream(), " %s\n", e->name()->as_klass_external_name());
} }
jio_fprintf(defaultStream::error_stream(), "}\n"); jio_fprintf(defaultStream::error_stream(), "}\n");

2
src/hotspot/share/classfile/defaultMethods.cpp
View file

@ -146,7 +146,7 @@ class HierarchyVisitor : StackObj {
return interface_index() >= number_of_interfaces(); return interface_index() >= number_of_interfaces();
} }
InstanceKlass* interface_at(int index) { InstanceKlass* interface_at(int index) {
return InstanceKlass::cast(_class->local_interfaces()->at(index)); return _class->local_interfaces()->at(index);
} }
InstanceKlass* next_super() { return _class->java_super(); } InstanceKlass* next_super() { return _class->java_super(); }
InstanceKlass* next_interface() { InstanceKlass* next_interface() {

10
src/hotspot/share/classfile/systemDictionary.cpp
View file

@ -1989,14 +1989,14 @@ void SystemDictionary::resolve_well_known_classes(TRAPS) {
resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK);
// Preload ref klasses and set reference types // Preload ref klasses and set reference types
InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); WK_KLASS(Reference_klass)->set_reference_type(REF_OTHER);
InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); WK_KLASS(SoftReference_klass)->set_reference_type(REF_SOFT);
InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); WK_KLASS(WeakReference_klass)->set_reference_type(REF_WEAK);
InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); WK_KLASS(FinalReference_klass)->set_reference_type(REF_FINAL);
InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); WK_KLASS(PhantomReference_klass)->set_reference_type(REF_PHANTOM);
// JSR 292 classes // JSR 292 classes
WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);

2
src/hotspot/share/classfile/verificationType.cpp
View file

@ -71,7 +71,7 @@ bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Sym
if (log_is_enabled(Debug, class, resolve)) { if (log_is_enabled(Debug, class, resolve)) {
Verifier::trace_class_resolution(from_class, klass); Verifier::trace_class_resolution(from_class, klass);
} }
return InstanceKlass::cast(from_class)->is_subclass_of(this_class); return from_class->is_subclass_of(this_class);
} }
return false; return false;

2
src/hotspot/share/jvmci/jvmciRuntime.cpp
View file

@ -1271,7 +1271,7 @@ InstanceKlass* JVMCIRuntime::get_instance_klass_for_declared_method_holder(Klass
if (method_holder->is_instance_klass()) { if (method_holder->is_instance_klass()) {
return InstanceKlass::cast(method_holder); return InstanceKlass::cast(method_holder);
} else if (method_holder->is_array_klass()) { } else if (method_holder->is_array_klass()) {
return InstanceKlass::cast(SystemDictionary::Object_klass()); return SystemDictionary::Object_klass();
} else { } else {
ShouldNotReachHere(); ShouldNotReachHere();
} }

4
src/hotspot/share/prims/jniCheck.cpp
View file

@ -266,7 +266,7 @@ checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype)
/* check for proper subclass hierarchy */ /* check for proper subclass hierarchy */
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fid); JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fid);
Klass* f_oop = id->holder(); Klass* f_oop = id->holder();
if (!InstanceKlass::cast(k_oop)->is_subtype_of(f_oop)) if (!k_oop->is_subtype_of(f_oop))
ReportJNIFatalError(thr, fatal_wrong_static_field); ReportJNIFatalError(thr, fatal_wrong_static_field);
/* check for proper field type */ /* check for proper field type */
@ -513,7 +513,7 @@ void jniCheck::validate_throwable_klass(JavaThread* thr, Klass* klass) {
assert(klass != NULL, "klass argument must have a value"); assert(klass != NULL, "klass argument must have a value");
if (!klass->is_instance_klass() || if (!klass->is_instance_klass() ||
!InstanceKlass::cast(klass)->is_subclass_of(SystemDictionary::Throwable_klass())) { !klass->is_subclass_of(SystemDictionary::Throwable_klass())) {
ReportJNIFatalError(thr, fatal_class_not_a_throwable_class); ReportJNIFatalError(thr, fatal_class_not_a_throwable_class);
} }
} }