1.1 --- a/src/share/vm/oops/method.cpp Fri Nov 09 22:22:53 2012 -0800 1.2 +++ b/src/share/vm/oops/method.cpp Mon Nov 12 16:15:05 2012 -0500 1.3 @@ -152,11 +152,11 @@ 1.4 } 1.5 1.6 char* Method::name_and_sig_as_C_string() const { 1.7 - return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature()); 1.8 + return name_and_sig_as_C_string(constants()->pool_holder(), name(), signature()); 1.9 } 1.10 1.11 char* Method::name_and_sig_as_C_string(char* buf, int size) const { 1.12 - return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature(), buf, size); 1.13 + return name_and_sig_as_C_string(constants()->pool_holder(), name(), signature(), buf, size); 1.14 } 1.15 1.16 char* Method::name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature) { 1.17 @@ -578,8 +578,8 @@ 1.18 for (int i = 0; i < length; i++) { 1.19 CheckedExceptionElement* table = h_this->checked_exceptions_start(); // recompute on each iteration, not gc safe 1.20 Klass* k = h_this->constants()->klass_at(table[i].class_cp_index, CHECK_(objArrayHandle())); 1.21 - assert(Klass::cast(k)->is_subclass_of(SystemDictionary::Throwable_klass()), "invalid exception class"); 1.22 - mirrors->obj_at_put(i, Klass::cast(k)->java_mirror()); 1.23 + assert(k->is_subclass_of(SystemDictionary::Throwable_klass()), "invalid exception class"); 1.24 + mirrors->obj_at_put(i, k->java_mirror()); 1.25 } 1.26 return mirrors; 1.27 } 1.28 @@ -618,7 +618,7 @@ 1.29 Thread *thread = Thread::current(); 1.30 Symbol* klass_name = constants()->klass_name_at(klass_index); 1.31 Handle loader(thread, method_holder()->class_loader()); 1.32 - Handle prot (thread, Klass::cast(method_holder())->protection_domain()); 1.33 + Handle prot (thread, method_holder()->protection_domain()); 1.34 return SystemDictionary::find(klass_name, loader, prot, thread) != NULL; 1.35 } else { 1.36 return true; 1.37 @@ -1067,8 +1067,8 @@ 1.38 } 1.39 1.40 Klass* Method::check_non_bcp_klass(Klass* klass) { 1.41 - if (klass != NULL && Klass::cast(klass)->class_loader() != NULL) { 1.42 - if (Klass::cast(klass)->oop_is_objArray()) 1.43 + if (klass != NULL && klass->class_loader() != NULL) { 1.44 + if (klass->oop_is_objArray()) 1.45 klass = ObjArrayKlass::cast(klass)->bottom_klass(); 1.46 return klass; 1.47 }