src/hotspot/share/opto/compile.cpp

@@ -1371,11 +1371,11 @@
      }
    } else if (ta != nullptr) {
      // Common slices
      if (offset == arrayOopDesc::length_offset_in_bytes()) {
        return TypeAryPtr::RANGE;
-     } else if (offset == oopDesc::klass_offset_in_bytes()) {
+     } else if (offset == Type::klass_offset()) {
        return TypeInstPtr::KLASS;
      } else if (offset == oopDesc::mark_offset_in_bytes()) {
        return TypeInstPtr::MARK;
      }
  

@@ -1520,11 +1520,11 @@
    assert( (offset != Type::OffsetBot && tj->base() != Type::AryPtr) ||
            (offset == Type::OffsetBot && tj->base() == Type::AryPtr) ||
            (offset == Type::OffsetBot && tj == TypeOopPtr::BOTTOM) ||
            (offset == Type::OffsetBot && tj == TypePtr::BOTTOM) ||
            (offset == oopDesc::mark_offset_in_bytes() && tj->base() == Type::AryPtr) ||
-           (offset == oopDesc::klass_offset_in_bytes() && tj->base() == Type::AryPtr) ||
+           (offset == Type::klass_offset() && tj->base() == Type::AryPtr) ||
            (offset == arrayOopDesc::length_offset_in_bytes() && tj->base() == Type::AryPtr),
            "For oops, klasses, raw offset must be constant; for arrays the offset is never known" );
    assert( tj->ptr() != TypePtr::TopPTR &&
            tj->ptr() != TypePtr::AnyNull &&
            tj->ptr() != TypePtr::Null, "No imprecise addresses" );