1.1 --- a/src/share/vm/interpreter/linkResolver.cpp Thu Oct 04 14:55:57 2012 +0200
1.2 +++ b/src/share/vm/interpreter/linkResolver.cpp Tue Nov 06 15:09:37 2012 -0500
1.3 @@ -133,7 +133,7 @@
1.4 // don't force compilation, resolve was on behalf of compiler
1.5 return;
1.6 }
1.7 - if (InstanceKlass::cast(selected_method->method_holder())->is_not_initialized()) {
1.8 + if (selected_method->method_holder()->is_not_initialized()) {
1.9 // 'is_not_initialized' means not only '!is_initialized', but also that
1.10 // initialization has not been started yet ('!being_initialized')
1.11 // Do not force compilation of methods in uninitialized classes.
1.12 @@ -466,7 +466,7 @@
1.13
1.14 // check loader constraints
1.15 Handle loader (THREAD, InstanceKlass::cast(current_klass())->class_loader());
1.16 - Handle class_loader (THREAD, InstanceKlass::cast(resolved_method->method_holder())->class_loader());
1.17 + Handle class_loader (THREAD, resolved_method->method_holder()->class_loader());
1.18 {
1.19 ResourceMark rm(THREAD);
1.20 char* failed_type_name =
1.21 @@ -528,7 +528,7 @@
1.22 if (check_access) {
1.23 HandleMark hm(THREAD);
1.24 Handle loader (THREAD, InstanceKlass::cast(current_klass())->class_loader());
1.25 - Handle class_loader (THREAD, InstanceKlass::cast(resolved_method->method_holder())->class_loader());
1.26 + Handle class_loader (THREAD, resolved_method->method_holder()->class_loader());
1.27 {
1.28 ResourceMark rm(THREAD);
1.29 char* failed_type_name =
1.30 @@ -910,12 +910,12 @@
1.31
1.32 // Virtual methods cannot be resolved before its klass has been linked, for otherwise the Method*'s
1.33 // has not been rewritten, and the vtable initialized.
1.34 - assert(InstanceKlass::cast(resolved_method->method_holder())->is_linked(), "must be linked");
1.35 + assert(resolved_method->method_holder()->is_linked(), "must be linked");
1.36
1.37 // Virtual methods cannot be resolved before its klass has been linked, for otherwise the Method*'s
1.38 // has not been rewritten, and the vtable initialized. Make sure to do this after the nullcheck, since
1.39 // a missing receiver might result in a bogus lookup.
1.40 - assert(InstanceKlass::cast(resolved_method->method_holder())->is_linked(), "must be linked");
1.41 + assert(resolved_method->method_holder()->is_linked(), "must be linked");
1.42
1.43 // do lookup based on receiver klass using the vtable index
1.44 if (resolved_method->method_holder()->is_interface()) { // miranda method
