src/share/vm/opto/parseHelper.cpp

*** 198,208 ****
    }
  
    // Come here for polymorphic array klasses
  
    // Extract the array element class
!   int element_klass_offset = objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc);
    Node *p2 = basic_plus_adr(array_klass, array_klass, element_klass_offset);
    Node *a_e_klass = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p2, tak) );
  
    // Check (the hard way) and throw if not a subklass.
    // Result is ignored, we just need the CFG effects.
--- 198,208 ----
    }
  
    // Come here for polymorphic array klasses
  
    // Extract the array element class
!   int element_klass_offset = in_bytes(objArrayKlass::element_klass_offset());
    Node *p2 = basic_plus_adr(array_klass, array_klass, element_klass_offset);
    Node *a_e_klass = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p2, tak) );
  
    // Check (the hard way) and throw if not a subklass.
    // Result is ignored, we just need the CFG effects.
*** 218,236 ****
    Node* cur_thread = _gvn.transform( new (C, 1) ThreadLocalNode() );
    Node* merge = new (C, 3) RegionNode(3);
    _gvn.set_type(merge, Type::CONTROL);
    Node* kls = makecon(TypeKlassPtr::make(klass));
  
!   Node* init_thread_offset = _gvn.MakeConX(instanceKlass::init_thread_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes());
    Node* adr_node = basic_plus_adr(kls, kls, init_thread_offset);
    Node* init_thread = make_load(NULL, adr_node, TypeRawPtr::BOTTOM, T_ADDRESS);
    Node *tst   = Bool( CmpP( init_thread, cur_thread), BoolTest::eq);
    IfNode* iff = create_and_map_if(control(), tst, PROB_ALWAYS, COUNT_UNKNOWN);
    set_control(IfTrue(iff));
    merge->set_req(1, IfFalse(iff));
  
!   Node* init_state_offset = _gvn.MakeConX(instanceKlass::init_state_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes());
    adr_node = basic_plus_adr(kls, kls, init_state_offset);
    Node* init_state = make_load(NULL, adr_node, TypeInt::INT, T_INT);
    Node* being_init = _gvn.intcon(instanceKlass::being_initialized);
    tst   = Bool( CmpI( init_state, being_init), BoolTest::eq);
    iff = create_and_map_if(control(), tst, PROB_ALWAYS, COUNT_UNKNOWN);
--- 218,236 ----
    Node* cur_thread = _gvn.transform( new (C, 1) ThreadLocalNode() );
    Node* merge = new (C, 3) RegionNode(3);
    _gvn.set_type(merge, Type::CONTROL);
    Node* kls = makecon(TypeKlassPtr::make(klass));
  
!   Node* init_thread_offset = _gvn.MakeConX(in_bytes(instanceKlass::init_thread_offset()));
    Node* adr_node = basic_plus_adr(kls, kls, init_thread_offset);
    Node* init_thread = make_load(NULL, adr_node, TypeRawPtr::BOTTOM, T_ADDRESS);
    Node *tst   = Bool( CmpP( init_thread, cur_thread), BoolTest::eq);
    IfNode* iff = create_and_map_if(control(), tst, PROB_ALWAYS, COUNT_UNKNOWN);
    set_control(IfTrue(iff));
    merge->set_req(1, IfFalse(iff));
  
!   Node* init_state_offset = _gvn.MakeConX(in_bytes(instanceKlass::init_state_offset()));
    adr_node = basic_plus_adr(kls, kls, init_state_offset);
    Node* init_state = make_load(NULL, adr_node, TypeInt::INT, T_INT);
    Node* being_init = _gvn.intcon(instanceKlass::being_initialized);
    tst   = Bool( CmpI( init_state, being_init), BoolTest::eq);
    iff = create_and_map_if(control(), tst, PROB_ALWAYS, COUNT_UNKNOWN);