src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java

*** 36,46 ****
  import java.nio.ByteOrder;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.HashMap;
  
- import jdk.vm.ci.common.JVMCIError;
  import jdk.vm.ci.meta.Assumptions.AssumptionResult;
  import jdk.vm.ci.meta.Assumptions.ConcreteMethod;
  import jdk.vm.ci.meta.Assumptions.ConcreteSubtype;
  import jdk.vm.ci.meta.Assumptions.LeafType;
  import jdk.vm.ci.meta.Assumptions.NoFinalizableSubclass;
--- 36,45 ----
*** 125,137 ****
      /**
       * Gets the metaspace Klass for this type.
       */
      long getMetaspaceKlass() {
          if (HotSpotJVMCIRuntime.getHostWordKind() == JavaKind.Long) {
!             return UNSAFE.getLong(javaClass, (long) config().klassOffset);
          }
!         return UNSAFE.getInt(javaClass, (long) config().klassOffset) & 0xFFFFFFFFL;
      }
  
      public long getMetaspacePointer() {
          return getMetaspaceKlass();
      }
--- 124,136 ----
      /**
       * Gets the metaspace Klass for this type.
       */
      long getMetaspaceKlass() {
          if (HotSpotJVMCIRuntime.getHostWordKind() == JavaKind.Long) {
!             return UNSAFE.getLong(javaClass, config().klassOffset);
          }
!         return UNSAFE.getInt(javaClass, config().klassOffset) & 0xFFFFFFFFL;
      }
  
      public long getMetaspacePointer() {
          return getMetaspaceKlass();
      }
*** 254,264 ****
      }
  
      @Override
      public HotSpotResolvedObjectTypeImpl getSingleImplementor() {
          if (!isInterface()) {
!             throw new JVMCIError("Cannot call getSingleImplementor() on a non-interface type: %s", this);
          }
          return compilerToVM().getImplementor(this);
      }
  
      public HotSpotResolvedObjectTypeImpl getSupertype() {
--- 253,263 ----
      }
  
      @Override
      public HotSpotResolvedObjectTypeImpl getSingleImplementor() {
          if (!isInterface()) {
!             throw new InternalError("Cannot call getSingleImplementor() on a non-interface type: " + this);
          }
          return compilerToVM().getImplementor(this);
      }
  
      public HotSpotResolvedObjectTypeImpl getSupertype() {