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

     1.1 --- a/src/share/vm/opto/memnode.cpp	Fri Sep 28 14:36:20 2012 -0700
     1.2 +++ b/src/share/vm/opto/memnode.cpp	Sat Sep 29 06:40:00 2012 -0400
     1.3 @@ -1671,9 +1671,9 @@
     1.4        }
     1.5        const Type* aift = load_array_final_field(tkls, klass);
     1.6        if (aift != NULL)  return aift;
     1.7 -      if (tkls->offset() == in_bytes(arrayKlass::component_mirror_offset())
     1.8 +      if (tkls->offset() == in_bytes(ArrayKlass::component_mirror_offset())
     1.9            && klass->is_array_klass()) {
    1.10 -        // The field is arrayKlass::_component_mirror.  Return its (constant) value.
    1.11 +        // The field is ArrayKlass::_component_mirror.  Return its (constant) value.
    1.12          // (Folds up aClassConstant.getComponentType, common in Arrays.copyOf.)
    1.13          assert(Opcode() == Op_LoadP, "must load an oop from _component_mirror");
    1.14          return TypeInstPtr::make(klass->as_array_klass()->component_mirror());
    1.15 @@ -2014,7 +2014,7 @@
    1.16      if( !klass->is_loaded() )
    1.17        return _type;             // Bail out if not loaded
    1.18      if( klass->is_obj_array_klass() &&
    1.19 -        tkls->offset() == in_bytes(objArrayKlass::element_klass_offset())) {
    1.20 +        tkls->offset() == in_bytes(ObjArrayKlass::element_klass_offset())) {
    1.21        ciKlass* elem = klass->as_obj_array_klass()->element_klass();
    1.22        // // Always returning precise element type is incorrect,
    1.23        // // e.g., element type could be object and array may contain strings
    1.24 @@ -2067,7 +2067,7 @@
    1.25    }
    1.26  
    1.27    // Simplify k.java_mirror.as_klass to plain k, where k is a Klass*.
    1.28 -  // Simplify ak.component_mirror.array_klass to plain ak, ak an arrayKlass.
    1.29 +  // Simplify ak.component_mirror.array_klass to plain ak, ak an ArrayKlass.
    1.30    // See inline_native_Class_query for occurrences of these patterns.
    1.31    // Java Example:  x.getClass().isAssignableFrom(y)
    1.32    // Java Example:  Array.newInstance(x.getClass().getComponentType(), n)
    1.33 @@ -2080,7 +2080,7 @@
    1.34        && (offset == java_lang_Class::klass_offset_in_bytes() ||
    1.35            offset == java_lang_Class::array_klass_offset_in_bytes())) {
    1.36      // We are loading a special hidden field from a Class mirror,
    1.37 -    // the field which points to its Klass or arrayKlass metaobject.
    1.38 +    // the field which points to its Klass or ArrayKlass metaobject.
    1.39      if (base->is_Load()) {
    1.40        Node* adr2 = base->in(MemNode::Address);
    1.41        const TypeKlassPtr* tkls = phase->type(adr2)->isa_klassptr();
    1.42 @@ -2091,7 +2091,7 @@
    1.43            ) {
    1.44          int mirror_field = in_bytes(Klass::java_mirror_offset());
    1.45          if (offset == java_lang_Class::array_klass_offset_in_bytes()) {
    1.46 -          mirror_field = in_bytes(arrayKlass::component_mirror_offset());
    1.47 +          mirror_field = in_bytes(ArrayKlass::component_mirror_offset());
    1.48          }
    1.49          if (tkls->offset() == mirror_field) {
    1.50            return adr2->in(AddPNode::Base);