src/hotspot/share/opto/type.cpp

@@ -554,11 +554,11 @@
    TypeInstPtr::BOTTOM  = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass());
    TypeInstPtr::MIRROR  = TypeInstPtr::make(TypePtr::NotNull, current->env()->Class_klass());
    TypeInstPtr::MARK    = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass(),
                                             false, nullptr, oopDesc::mark_offset_in_bytes());
    TypeInstPtr::KLASS   = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass(),
-                                            false, nullptr, oopDesc::klass_offset_in_bytes());
+                                            false, nullptr, Type::klass_offset());
    TypeOopPtr::BOTTOM  = TypeOopPtr::make(TypePtr::BotPTR, OffsetBot, TypeOopPtr::InstanceBot);
  
    TypeMetadataPtr::BOTTOM = TypeMetadataPtr::make(TypePtr::BotPTR, nullptr, OffsetBot);
  
    TypeNarrowOop::NULL_PTR = TypeNarrowOop::make( TypePtr::NULL_PTR );

@@ -3516,11 +3516,11 @@
        (offset > 0) && xk && (k != nullptr) && k->is_instance_klass()) {
      _is_ptr_to_boxed_value = k->as_instance_klass()->is_boxed_value_offset(offset);
    }
  #ifdef _LP64
    if (_offset > 0 || _offset == Type::OffsetTop || _offset == Type::OffsetBot) {
-     if (_offset == oopDesc::klass_offset_in_bytes()) {
+     if (_offset == Type::klass_offset()) {
        _is_ptr_to_narrowklass = UseCompressedClassPointers;
      } else if (klass() == nullptr) {
        // Array with unknown body type
        assert(this->isa_aryptr(), "only arrays without klass");
        _is_ptr_to_narrowoop = UseCompressedOops;