src/hotspot/share/opto/macroArrayCopy.cpp

*** 201,211 ****
    if ((*ctrl)->is_top())  return NULL;
  
    Node* kls = NULL;
    if (_igvn.type(obj_or_klass)->isa_oopptr()) {
      Node* k_adr = basic_plus_adr(obj_or_klass, oopDesc::klass_offset_in_bytes());
!     kls = transform_later(LoadKlassNode::make(_igvn, NULL, C->immutable_memory(), k_adr, TypeInstPtr::KLASS));
    } else {
      assert(_igvn.type(obj_or_klass)->isa_klassptr(), "what else?");
      kls = obj_or_klass;
    }
    Node* layout_val = make_load(NULL, mem, kls, in_bytes(Klass::layout_helper_offset()), TypeInt::INT, T_INT);
--- 201,211 ----
    if ((*ctrl)->is_top())  return NULL;
  
    Node* kls = NULL;
    if (_igvn.type(obj_or_klass)->isa_oopptr()) {
      Node* k_adr = basic_plus_adr(obj_or_klass, oopDesc::klass_offset_in_bytes());
!     kls = transform_later(LoadKlassNode::make(_igvn, NULL, C->immutable_memory(), k_adr, TypeInstPtr::KLASS, TypeKlassPtr::OBJECT, /* clear_prop_bits = */ true));
    } else {
      assert(_igvn.type(obj_or_klass)->isa_klassptr(), "what else?");
      kls = obj_or_klass;
    }
    Node* layout_val = make_load(NULL, mem, kls, in_bytes(Klass::layout_helper_offset()), TypeInt::INT, T_INT);