src/hotspot/share/opto/graphKit.cpp

*** 1212,11 ***
  //-------------------------load_object_klass-----------------------------------
  Node* GraphKit::load_object_klass(Node* obj) {
    // Special-case a fresh allocation to avoid building nodes:
    Node* akls = AllocateNode::Ideal_klass(obj, &_gvn);
    if (akls != nullptr)  return akls;
!   Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
    return _gvn.transform(LoadKlassNode::make(_gvn, immutable_memory(), k_adr, TypeInstPtr::KLASS));
  }
  
  //-------------------------load_array_length-----------------------------------
  Node* GraphKit::load_array_length(Node* array) {
--- 1212,11 ---
  //-------------------------load_object_klass-----------------------------------
  Node* GraphKit::load_object_klass(Node* obj) {
    // Special-case a fresh allocation to avoid building nodes:
    Node* akls = AllocateNode::Ideal_klass(obj, &_gvn);
    if (akls != nullptr)  return akls;
!   Node* k_adr = basic_plus_adr(obj, Type::klass_offset());
    return _gvn.transform(LoadKlassNode::make(_gvn, immutable_memory(), k_adr, TypeInstPtr::KLASS));
  }
  
  //-------------------------load_array_length-----------------------------------
  Node* GraphKit::load_array_length(Node* array) {

*** 3644,11 ***
      int mark_idx = C->get_alias_index(oop_type->add_offset(oopDesc::mark_offset_in_bytes()));
      // Add an edge in the MergeMem for the header fields so an access to one of those has correct memory state.
      // Use one NarrowMemProjNode per slice to properly record the adr type of each slice. The Initialize node will have
      // multiple projections as a result.
      set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(mark_idx))), mark_idx);
!     int klass_idx = C->get_alias_index(oop_type->add_offset(oopDesc::klass_offset_in_bytes()));
      set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(klass_idx))), klass_idx);
      if (oop_type->isa_aryptr()) {
        const TypePtr* telemref = oop_type->add_offset(Type::OffsetBot);
        int            elemidx  = C->get_alias_index(telemref);
        hook_memory_on_init(*this, elemidx, minit_in, _gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(elemidx))));
--- 3644,11 ---
      int mark_idx = C->get_alias_index(oop_type->add_offset(oopDesc::mark_offset_in_bytes()));
      // Add an edge in the MergeMem for the header fields so an access to one of those has correct memory state.
      // Use one NarrowMemProjNode per slice to properly record the adr type of each slice. The Initialize node will have
      // multiple projections as a result.
      set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(mark_idx))), mark_idx);
!     int klass_idx = C->get_alias_index(oop_type->add_offset(Type::klass_offset()));
      set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(klass_idx))), klass_idx);
      if (oop_type->isa_aryptr()) {
        const TypePtr* telemref = oop_type->add_offset(Type::OffsetBot);
        int            elemidx  = C->get_alias_index(telemref);
        hook_memory_on_init(*this, elemidx, minit_in, _gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(elemidx))));