Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/deoptimization.cpp	Fri Sep 28 14:36:20 2012 -0700
     1.2 +++ b/src/share/vm/runtime/deoptimization.cpp	Sat Sep 29 06:40:00 2012 -0400
     1.3 @@ -755,12 +755,12 @@
     1.4        InstanceKlass* ik = InstanceKlass::cast(k());
     1.5        obj = ik->allocate_instance(CHECK_(false));
     1.6      } else if (k->oop_is_typeArray()) {
     1.7 -      typeArrayKlass* ak = typeArrayKlass::cast(k());
     1.8 +      TypeArrayKlass* ak = TypeArrayKlass::cast(k());
     1.9        assert(sv->field_size() % type2size[ak->element_type()] == 0, "non-integral array length");
    1.10        int len = sv->field_size() / type2size[ak->element_type()];
    1.11        obj = ak->allocate(len, CHECK_(false));
    1.12      } else if (k->oop_is_objArray()) {
    1.13 -      objArrayKlass* ak = objArrayKlass::cast(k());
    1.14 +      ObjArrayKlass* ak = ObjArrayKlass::cast(k());
    1.15        obj = ak->allocate(sv->field_size(), CHECK_(false));
    1.16      }
    1.17  
    1.18 @@ -923,7 +923,7 @@
    1.19        FieldReassigner reassign(fr, reg_map, sv, obj());
    1.20        ik->do_nonstatic_fields(&reassign);
    1.21      } else if (k->oop_is_typeArray()) {
    1.22 -      typeArrayKlass* ak = typeArrayKlass::cast(k());
    1.23 +      TypeArrayKlass* ak = TypeArrayKlass::cast(k());
    1.24        reassign_type_array_elements(fr, reg_map, sv, (typeArrayOop) obj(), ak->element_type());
    1.25      } else if (k->oop_is_objArray()) {
    1.26        reassign_object_array_elements(fr, reg_map, sv, (objArrayOop) obj());