1.1 --- a/src/share/vm/opto/library_call.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/opto/library_call.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -3435,7 +3435,7 @@
1.4 if (generate_array_guard(kls, region) != NULL) {
1.5 // Be sure to pin the oop load to the guard edge just created:
1.6 Node* is_array_ctrl = region->in(region->req()-1);
1.7 - Node* cma = basic_plus_adr(kls, in_bytes(arrayKlass::component_mirror_offset()));
1.8 + Node* cma = basic_plus_adr(kls, in_bytes(ArrayKlass::component_mirror_offset()));
1.9 Node* cmo = make_load(is_array_ctrl, cma, TypeInstPtr::MIRROR, T_OBJECT);
1.10 phi->add_req(cmo);
1.11 }
1.12 @@ -5032,7 +5032,7 @@
1.13 PreserveJVMState pjvms(this);
1.14 set_control(not_subtype_ctrl);
1.15 // (At this point we can assume disjoint_bases, since types differ.)
1.16 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset());
1.17 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
1.18 Node* p1 = basic_plus_adr(dest_klass, ek_offset);
1.19 Node* n1 = LoadKlassNode::make(_gvn, immutable_memory(), p1, TypeRawPtr::BOTTOM);
1.20 Node* dest_elem_klass = _gvn.transform(n1);
