1.1 --- a/src/share/vm/oops/instanceKlass.cpp Fri Nov 16 09:59:08 2012 +0100 1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Fri Nov 16 09:19:12 2012 -0500 1.3 @@ -727,8 +727,8 @@ 1.4 1.5 // Step 7 1.6 Klass* super_klass = this_oop->super(); 1.7 - if (super_klass != NULL && !this_oop->is_interface() && Klass::cast(super_klass)->should_be_initialized()) { 1.8 - Klass::cast(super_klass)->initialize(THREAD); 1.9 + if (super_klass != NULL && !this_oop->is_interface() && super_klass->should_be_initialized()) { 1.10 + super_klass->initialize(THREAD); 1.11 1.12 if (HAS_PENDING_EXCEPTION) { 1.13 Handle e(THREAD, PENDING_EXCEPTION); 1.14 @@ -924,7 +924,7 @@ 1.15 } 1.16 1.17 bool InstanceKlass::compute_is_subtype_of(Klass* k) { 1.18 - if (Klass::cast(k)->is_interface()) { 1.19 + if (k->is_interface()) { 1.20 return implements_interface(k); 1.21 } else { 1.22 return Klass::compute_is_subtype_of(k); 1.23 @@ -933,7 +933,7 @@ 1.24 1.25 bool InstanceKlass::implements_interface(Klass* k) const { 1.26 if (this == k) return true; 1.27 - assert(Klass::cast(k)->is_interface(), "should be an interface class"); 1.28 + assert(k->is_interface(), "should be an interface class"); 1.29 for (int i = 0; i < transitive_interfaces()->length(); i++) { 1.30 if (transitive_interfaces()->at(i) == k) { 1.31 return true; 1.32 @@ -1107,7 +1107,7 @@ 1.33 const int n = local_interfaces()->length(); 1.34 for (int i = 0; i < n; i++) { 1.35 Klass* intf1 = local_interfaces()->at(i); 1.36 - assert(Klass::cast(intf1)->is_interface(), "just checking type"); 1.37 + assert(intf1->is_interface(), "just checking type"); 1.38 // search for field in current interface 1.39 if (InstanceKlass::cast(intf1)->find_local_field(name, sig, fd)) { 1.40 assert(fd->is_static(), "interface field must be static"); 1.41 @@ -1178,7 +1178,7 @@ 1.42 if (InstanceKlass::cast(klass)->find_local_field_from_offset(offset, is_static, fd)) { 1.43 return true; 1.44 } 1.45 - klass = Klass::cast(klass)->super(); 1.46 + klass = klass->super(); 1.47 } 1.48 return false; 1.49 } 1.50 @@ -2366,19 +2366,19 @@ 1.51 bool InstanceKlass::is_same_class_package(Klass* class2) { 1.52 Klass* class1 = this; 1.53 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); 1.54 - Symbol* classname1 = Klass::cast(class1)->name(); 1.55 - 1.56 - if (Klass::cast(class2)->oop_is_objArray()) { 1.57 + Symbol* classname1 = class1->name(); 1.58 + 1.59 + if (class2->oop_is_objArray()) { 1.60 class2 = ObjArrayKlass::cast(class2)->bottom_klass(); 1.61 } 1.62 oop classloader2; 1.63 - if (Klass::cast(class2)->oop_is_instance()) { 1.64 + if (class2->oop_is_instance()) { 1.65 classloader2 = InstanceKlass::cast(class2)->class_loader(); 1.66 } else { 1.67 - assert(Klass::cast(class2)->oop_is_typeArray(), "should be type array"); 1.68 + assert(class2->oop_is_typeArray(), "should be type array"); 1.69 classloader2 = NULL; 1.70 } 1.71 - Symbol* classname2 = Klass::cast(class2)->name(); 1.72 + Symbol* classname2 = class2->name(); 1.73 1.74 return InstanceKlass::is_same_class_package(classloader1, classname1, 1.75 classloader2, classname2); 1.76 @@ -2387,7 +2387,7 @@ 1.77 bool InstanceKlass::is_same_class_package(oop classloader2, Symbol* classname2) { 1.78 Klass* class1 = this; 1.79 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); 1.80 - Symbol* classname1 = Klass::cast(class1)->name(); 1.81 + Symbol* classname1 = class1->name(); 1.82 1.83 return InstanceKlass::is_same_class_package(classloader1, classname1, 1.84 classloader2, classname2); 1.85 @@ -2478,7 +2478,7 @@ 1.86 bool InstanceKlass::is_same_package_member_impl(instanceKlassHandle class1, 1.87 Klass* class2_oop, TRAPS) { 1.88 if (class2_oop == class1()) return true; 1.89 - if (!Klass::cast(class2_oop)->oop_is_instance()) return false; 1.90 + if (!class2_oop->oop_is_instance()) return false; 1.91 instanceKlassHandle class2(THREAD, class2_oop); 1.92 1.93 // must be in same package before we try anything else 1.94 @@ -3011,7 +3011,7 @@ 1.95 if (im != NULL) { 1.96 guarantee(is_interface(), "only interfaces should have implementor set"); 1.97 guarantee(im->is_klass(), "should be klass"); 1.98 - guarantee(!Klass::cast(im)->is_interface() || im == this, 1.99 + guarantee(!im->is_interface() || im == this, 1.100 "implementors cannot be interfaces"); 1.101 } 1.102 1.103 @@ -3020,7 +3020,7 @@ 1.104 Array<Klass*>* local_interfaces = this->local_interfaces(); 1.105 for (int j = 0; j < local_interfaces->length(); j++) { 1.106 Klass* e = local_interfaces->at(j); 1.107 - guarantee(e->is_klass() && Klass::cast(e)->is_interface(), "invalid local interface"); 1.108 + guarantee(e->is_klass() && e->is_interface(), "invalid local interface"); 1.109 } 1.110 } 1.111 1.112 @@ -3029,7 +3029,7 @@ 1.113 Array<Klass*>* transitive_interfaces = this->transitive_interfaces(); 1.114 for (int j = 0; j < transitive_interfaces->length(); j++) { 1.115 Klass* e = transitive_interfaces->at(j); 1.116 - guarantee(e->is_klass() && Klass::cast(e)->is_interface(), "invalid transitive interface"); 1.117 + guarantee(e->is_klass() && e->is_interface(), "invalid transitive interface"); 1.118 } 1.119 } 1.120