1.1 --- a/src/share/vm/runtime/reflection.cpp Thu Oct 04 14:55:57 2012 +0200 1.2 +++ b/src/share/vm/runtime/reflection.cpp Tue Nov 06 15:09:37 2012 -0500 1.3 @@ -56,14 +56,14 @@ 1.4 vframeStream vfst(jthread); 1.5 // skip over any frames belonging to java.lang.Class 1.6 while (!vfst.at_end() && 1.7 - InstanceKlass::cast(vfst.method()->method_holder())->name() == vmSymbols::java_lang_Class()) { 1.8 + vfst.method()->method_holder()->name() == vmSymbols::java_lang_Class()) { 1.9 vfst.next(); 1.10 } 1.11 if (!vfst.at_end()) { 1.12 // this frame is a likely suspect 1.13 caller = vfst.method()->method_holder(); 1.14 line_number = vfst.method()->line_number_from_bci(vfst.bci()); 1.15 - Symbol* s = InstanceKlass::cast(vfst.method()->method_holder())->source_file_name(); 1.16 + Symbol* s = vfst.method()->method_holder()->source_file_name(); 1.17 if (s != NULL) { 1.18 source_file = s->as_C_string(); 1.19 } 1.20 @@ -642,8 +642,8 @@ 1.21 case T_OBJECT: 1.22 case T_ARRAY: 1.23 Symbol* name = ss->as_symbol(CHECK_NULL); 1.24 - oop loader = InstanceKlass::cast(method->method_holder())->class_loader(); 1.25 - oop protection_domain = InstanceKlass::cast(method->method_holder())->protection_domain(); 1.26 + oop loader = method->method_holder()->class_loader(); 1.27 + oop protection_domain = method->method_holder()->protection_domain(); 1.28 Klass* k = SystemDictionary::resolve_or_fail( 1.29 name, 1.30 Handle(THREAD, loader), 1.31 @@ -714,7 +714,7 @@ 1.32 assert(!method()->is_initializer() || 1.33 (for_constant_pool_access && method()->is_static()) || 1.34 (method()->name() == vmSymbols::class_initializer_name() 1.35 - && Klass::cast(method()->method_holder())->is_interface() && JDK_Version::is_jdk12x_version()), "should call new_constructor instead"); 1.36 + && method()->method_holder()->is_interface() && JDK_Version::is_jdk12x_version()), "should call new_constructor instead"); 1.37 instanceKlassHandle holder (THREAD, method->method_holder()); 1.38 int slot = method->method_idnum(); 1.39 1.40 @@ -832,7 +832,7 @@ 1.41 Handle type = new_type(signature, holder, CHECK_NULL); 1.42 Handle rh = java_lang_reflect_Field::create(CHECK_NULL); 1.43 1.44 - java_lang_reflect_Field::set_clazz(rh(), Klass::cast(fd->field_holder())->java_mirror()); 1.45 + java_lang_reflect_Field::set_clazz(rh(), fd->field_holder()->java_mirror()); 1.46 java_lang_reflect_Field::set_slot(rh(), fd->index()); 1.47 java_lang_reflect_Field::set_name(rh(), name()); 1.48 java_lang_reflect_Field::set_type(rh(), type()); 1.49 @@ -900,7 +900,7 @@ 1.50 method = reflected_method; 1.51 } else { 1.52 // resolve based on the receiver 1.53 - if (InstanceKlass::cast(reflected_method->method_holder())->is_interface()) { 1.54 + if (reflected_method->method_holder()->is_interface()) { 1.55 // resolve interface call 1.56 if (ReflectionWrapResolutionErrors) { 1.57 // new default: 6531596