test/compiler/jvmci/code/DataPatchTest.java

*** 54,86 ****
  
      @Test
      public void testInlineObject() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) type.getJavaClass();
              Register ret = asm.emitLoadPointer(c);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testInlineNarrowObject() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) type.getJavaClass();
              Register compressed = asm.emitLoadPointer((HotSpotConstant) c.compress());
              Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testDataSectionReference() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) type.getJavaClass();
              DataSectionReference ref = asm.emitDataItem(c);
              Register ret = asm.emitLoadPointer(ref);
              asm.emitPointerRet(ret);
          });
      }
--- 54,86 ----
  
      @Test
      public void testInlineObject() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
              Register ret = asm.emitLoadPointer(c);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testInlineNarrowObject() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
              Register compressed = asm.emitLoadPointer((HotSpotConstant) c.compress());
              Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testDataSectionReference() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
              DataSectionReference ref = asm.emitDataItem(c);
              Register ret = asm.emitLoadPointer(ref);
              asm.emitPointerRet(ret);
          });
      }
*** 88,98 ****
      @Test
      public void testNarrowDataSectionReference() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) type.getJavaClass();
              HotSpotConstant cCompressed = (HotSpotConstant) c.compress();
              DataSectionReference ref = asm.emitDataItem(cCompressed);
              Register compressed = asm.emitLoadNarrowPointer(ref);
              Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
              asm.emitPointerRet(ret);
--- 88,98 ----
      @Test
      public void testNarrowDataSectionReference() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
              HotSpotConstant cCompressed = (HotSpotConstant) c.compress();
              DataSectionReference ref = asm.emitDataItem(cCompressed);
              Register compressed = asm.emitLoadNarrowPointer(ref);
              Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
              asm.emitPointerRet(ret);
*** 101,122 ****
  
      @Test
      public void testInlineMetadata() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             Register klass = asm.emitLoadPointer((HotSpotConstant) type.getObjectHub());
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testInlineNarrowMetadata() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) type.getObjectHub();
              Register narrowKlass = asm.emitLoadPointer((HotSpotConstant) hub.compress());
              Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
--- 101,122 ----
  
      @Test
      public void testInlineMetadata() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             Register klass = asm.emitLoadPointer((HotSpotConstant) constantReflection.asObjectHub(type));
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
      }
  
      @Test
      public void testInlineNarrowMetadata() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
              Register narrowKlass = asm.emitLoadPointer((HotSpotConstant) hub.compress());
              Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
*** 124,134 ****
  
      @Test
      public void testMetadataInDataSection() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) type.getObjectHub();
              DataSectionReference ref = asm.emitDataItem(hub);
              Register klass = asm.emitLoadPointer(ref);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
--- 124,134 ----
  
      @Test
      public void testMetadataInDataSection() {
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
              DataSectionReference ref = asm.emitDataItem(hub);
              Register klass = asm.emitLoadPointer(ref);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
              asm.emitPointerRet(ret);
          });
*** 137,147 ****
      @Test
      public void testNarrowMetadataInDataSection() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) type.getObjectHub();
              HotSpotConstant narrowHub = (HotSpotConstant) hub.compress();
              DataSectionReference ref = asm.emitDataItem(narrowHub);
              Register narrowKlass = asm.emitLoadNarrowPointer(ref);
              Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
--- 137,147 ----
      @Test
      public void testNarrowMetadataInDataSection() {
          Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
          test(asm -> {
              ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
!             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
              HotSpotConstant narrowHub = (HotSpotConstant) hub.compress();
              DataSectionReference ref = asm.emitDataItem(narrowHub);
              Register narrowKlass = asm.emitLoadNarrowPointer(ref);
              Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
              Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);