1.1 --- a/src/share/vm/runtime/reflection.cpp Fri Nov 09 22:22:53 2012 -0800
1.2 +++ b/src/share/vm/runtime/reflection.cpp Mon Nov 12 16:15:05 2012 -0500
1.3 @@ -70,8 +70,8 @@
1.4 }
1.5 }
1.6 if (caller != NULL) {
1.7 - const char * from = Klass::cast(caller)->external_name();
1.8 - const char * to = Klass::cast(to_class)->external_name();
1.9 + const char * from = caller->external_name();
1.10 + const char * to = to_class->external_name();
1.11 // print in a single call to reduce interleaving between threads
1.12 if (source_file != NULL) {
1.13 tty->print("RESOLVE %s %s %s:%d (reflection)\n", from, to, source_file, line_number);
1.14 @@ -330,7 +330,7 @@
1.15 return TypeArrayKlass::cast(tak)->allocate(length, THREAD);
1.16 } else {
1.17 Klass* k = java_lang_Class::as_Klass(element_mirror);
1.18 - if (Klass::cast(k)->oop_is_array() && ArrayKlass::cast(k)->dimension() >= MAX_DIM) {
1.19 + if (k->oop_is_array() && ArrayKlass::cast(k)->dimension() >= MAX_DIM) {
1.20 THROW_0(vmSymbols::java_lang_IllegalArgumentException());
1.21 }
1.22 return oopFactory::new_objArray(k, length, THREAD);
1.23 @@ -366,7 +366,7 @@
1.24 klass = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL);
1.25 } else {
1.26 klass = java_lang_Class::as_Klass(element_mirror);
1.27 - if (Klass::cast(klass)->oop_is_array()) {
1.28 + if (klass->oop_is_array()) {
1.29 int k_dim = ArrayKlass::cast(klass)->dimension();
1.30 if (k_dim + len > MAX_DIM) {
1.31 THROW_0(vmSymbols::java_lang_IllegalArgumentException());
1.32 @@ -374,7 +374,7 @@
1.33 dim += k_dim;
1.34 }
1.35 }
1.36 - klass = Klass::cast(klass)->array_klass(dim, CHECK_NULL);
1.37 + klass = klass->array_klass(dim, CHECK_NULL);
1.38 oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD);
1.39 assert(obj->is_array(), "just checking");
1.40 return arrayOop(obj);
1.41 @@ -387,7 +387,7 @@
1.42 }
1.43
1.44 Klass* klass = java_lang_Class::as_Klass(mirror);
1.45 - if (!Klass::cast(klass)->oop_is_array()) {
1.46 + if (!klass->oop_is_array()) {
1.47 return NULL;
1.48 }
1.49
1.50 @@ -395,15 +395,15 @@
1.51 #ifdef ASSERT
1.52 oop result2 = NULL;
1.53 if (ArrayKlass::cast(klass)->dimension() == 1) {
1.54 - if (Klass::cast(klass)->oop_is_typeArray()) {
1.55 + if (klass->oop_is_typeArray()) {
1.56 result2 = basic_type_arrayklass_to_mirror(klass, CHECK_NULL);
1.57 } else {
1.58 - result2 = Klass::cast(ObjArrayKlass::cast(klass)->element_klass())->java_mirror();
1.59 + result2 = ObjArrayKlass::cast(klass)->element_klass()->java_mirror();
1.60 }
1.61 } else {
1.62 Klass* lower_dim = ArrayKlass::cast(klass)->lower_dimension();
1.63 - assert(Klass::cast(lower_dim)->oop_is_array(), "just checking");
1.64 - result2 = Klass::cast(lower_dim)->java_mirror();
1.65 + assert(lower_dim->oop_is_array(), "just checking");
1.66 + result2 = lower_dim->java_mirror();
1.67 }
1.68 assert(result == result2, "results must be consistent");
1.69 #endif //ASSERT
1.70 @@ -442,7 +442,7 @@
1.71 if (acc.is_protected()) {
1.72 if (target_class != client_class) {
1.73 if (!is_same_class_package(client_class, field_class)) {
1.74 - if (!Klass::cast(target_class)->is_subclass_of(client_class)) {
1.75 + if (!target_class->is_subclass_of(client_class)) {
1.76 THROW_(vmSymbols::java_lang_IllegalAccessException(), false);
1.77 }
1.78 }
1.79 @@ -468,7 +468,7 @@
1.80 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
1.81 if ( JDK_Version::is_gte_jdk14x_version()
1.82 && UseNewReflection
1.83 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.84 + && current_class->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.85 return true;
1.86 }
1.87
1.88 @@ -546,12 +546,12 @@
1.89 if (access.is_protected()) {
1.90 if (!protected_restriction) {
1.91 // See if current_class is a subclass of field_class
1.92 - if (Klass::cast(current_class)->is_subclass_of(field_class)) {
1.93 + if (current_class->is_subclass_of(field_class)) {
1.94 if (access.is_static() || // static fields are ok, see 6622385
1.95 current_class == resolved_class ||
1.96 field_class == resolved_class ||
1.97 - Klass::cast(current_class)->is_subclass_of(resolved_class) ||
1.98 - Klass::cast(resolved_class)->is_subclass_of(current_class)) {
1.99 + current_class->is_subclass_of(resolved_class) ||
1.100 + resolved_class->is_subclass_of(current_class)) {
1.101 return true;
1.102 }
1.103 }
1.104 @@ -566,7 +566,7 @@
1.105 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
1.106 if ( JDK_Version::is_gte_jdk14x_version()
1.107 && UseNewReflection
1.108 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.109 + && current_class->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.110 return true;
1.111 }
1.112
1.113 @@ -693,7 +693,7 @@
1.114 }
1.115
1.116 oop loader = InstanceKlass::cast(k())->class_loader();
1.117 - oop protection_domain = Klass::cast(k())->protection_domain();
1.118 + oop protection_domain = k()->protection_domain();
1.119 Klass* result = SystemDictionary::resolve_or_fail(signature,
1.120 Handle(THREAD, loader),
1.121 Handle(THREAD, protection_domain),
1.122 @@ -703,7 +703,7 @@
1.123 trace_class_resolution(result);
1.124 }
1.125
1.126 - oop nt = Klass::cast(result)->java_mirror();
1.127 + oop nt = result->java_mirror();
1.128 return Handle(THREAD, nt);
1.129 }
1.130
1.131 @@ -937,7 +937,7 @@
1.132 ResourceMark rm(THREAD);
1.133 Handle h_origexception = Exceptions::new_exception(THREAD,
1.134 vmSymbols::java_lang_AbstractMethodError(),
1.135 - Method::name_and_sig_as_C_string(Klass::cast(target_klass()),
1.136 + Method::name_and_sig_as_C_string(target_klass(),
1.137 method->name(),
1.138 method->signature()));
1.139 JavaCallArguments args(h_origexception);
1.140 @@ -947,7 +947,7 @@
1.141 } else {
1.142 ResourceMark rm(THREAD);
1.143 THROW_MSG_0(vmSymbols::java_lang_AbstractMethodError(),
1.144 - Method::name_and_sig_as_C_string(Klass::cast(target_klass()),
1.145 + Method::name_and_sig_as_C_string(target_klass(),
1.146 method->name(),
1.147 method->signature()));
1.148 }
1.149 @@ -962,7 +962,7 @@
1.150 if (method.is_null()) {
1.151 ResourceMark rm(THREAD);
1.152 THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(),
1.153 - Method::name_and_sig_as_C_string(Klass::cast(klass()),
1.154 + Method::name_and_sig_as_C_string(klass(),
1.155 reflected_method->name(),
1.156 reflected_method->signature()));
1.157 }
