src/hotspot/share/opto/macro.cpp

@@ -1705,11 +1705,11 @@
      transform_later(mark_node);
    }
    rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, TypeX_X->basic_type());
  
    if (!UseCompactObjectHeaders) {
-     rawmem = make_store(control, rawmem, object, oopDesc::klass_offset_in_bytes(), klass_node, T_METADATA);
+     rawmem = make_store(control, rawmem, object, Type::klass_offset(), klass_node, T_METADATA);
    }
    int header_size = alloc->minimum_header_size();  // conservatively small
  
    // Array length
    if (length != nullptr) {         // Arrays need length field

@@ -2332,11 +2332,11 @@
  
      Node* subklass = nullptr;
      if (_igvn.type(obj_or_subklass)->isa_klassptr()) {
        subklass = obj_or_subklass;
      } else {
-       Node* k_adr = basic_plus_adr(obj_or_subklass, oopDesc::klass_offset_in_bytes());
+       Node* k_adr = basic_plus_adr(obj_or_subklass, Type::klass_offset());
        subklass = _igvn.transform(LoadKlassNode::make(_igvn, nullptr, C->immutable_memory(), k_adr, TypeInstPtr::KLASS));
      }
  
      Node* not_subtype_ctrl = Phase::gen_subtype_check(subklass, superklass, &ctrl, nullptr, _igvn, check->method(), check->bci());