Renamings.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/DynamicHubOffsets.java

@@ -81,7 +81,7 @@ public class DynamicHubOffsets {
     private int componentTypeOffset = UNINITIALIZED;
 
     @UnknownPrimitiveField(availability = BuildPhaseProvider.ReadyForCompilation.class) //
-    private int compressedReferenceMapOffsetOffset = UNINITIALIZED;
+    private int referenceMapCompressedOffsetOffset = UNINITIALIZED;
     @UnknownPrimitiveField(availability = BuildPhaseProvider.ReadyForCompilation.class) //
     private int layerIdOffset = UNINITIALIZED;
 
@@ -185,8 +185,8 @@ public int getComponentTypeOffset() {
         return componentTypeOffset;
     }
 
-    public int getCompressedReferenceMapOffsetOffset() {
-        return compressedReferenceMapOffsetOffset;
+    public int getReferenceMapCompressedOffsetOffset() {
+        return referenceMapCompressedOffsetOffset;
     }
 
     public int getLayerIdOffset() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java

@@ -25,7 +25,7 @@
 package com.oracle.svm.core.heap;
 
 import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
-import static com.oracle.svm.core.heap.InstanceReferenceMapEncoder.COMPRESSED_REFERENCE_MAP_OFFSET_SHIFT;
+import static com.oracle.svm.core.heap.InstanceReferenceMapEncoder.REFERENCE_MAP_COMPRESSED_OFFSET_SHIFT;
 
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
@@ -87,8 +87,8 @@ public static InstanceReferenceMap getReferenceMap(NonmovableArray<Byte> referen
 
     @AlwaysInline("GC performance")
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
-    public static InstanceReferenceMap getReferenceMap(long compressedReferenceMapOffset) {
-        long uncompressedOffset = (compressedReferenceMapOffset << COMPRESSED_REFERENCE_MAP_OFFSET_SHIFT);
+    public static InstanceReferenceMap getReferenceMap(long referenceMapCompressedOffset) {
+        long uncompressedOffset = (referenceMapCompressedOffset << REFERENCE_MAP_COMPRESSED_OFFSET_SHIFT);
         return (InstanceReferenceMap) KnownIntrinsics.heapBase().add(Word.unsigned(uncompressedOffset));
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapEncoder.java

@@ -56,32 +56,32 @@
  * </ul>
  */
 public class InstanceReferenceMapEncoder extends ReferenceMapEncoder {
-    public static final int COMPRESSED_REFERENCE_MAP_OFFSET_SHIFT = 2;
+    public static final int REFERENCE_MAP_COMPRESSED_OFFSET_SHIFT = 2;
 
     public static final int MAP_HEADER_SIZE = 4;
     public static final int MAP_ENTRY_SIZE = 8;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    public static int computeCompressedReferenceMapOffset(long currentLayerRefMapDataStart, int referenceMapIndex) {
+    public static int computeReferenceMapCompressedOffset(long currentLayerRefMapDataStart, int referenceMapIndex) {
         long uncompressedOffset = currentLayerRefMapDataStart + referenceMapIndex;
-        return computeCompressedReferenceMapOffset(uncompressedOffset);
+        return computeReferenceMapCompressedOffset(uncompressedOffset);
     }
 
-    public static int computeCompressedReferenceMapOffset(InstanceReferenceMap refMap) {
+    public static int computeReferenceMapCompressedOffset(InstanceReferenceMap refMap) {
         long uncompressedOffset = ((Pointer) refMap).subtract(KnownIntrinsics.heapBase()).rawValue();
-        return computeCompressedReferenceMapOffset(uncompressedOffset);
+        return computeReferenceMapCompressedOffset(uncompressedOffset);
     }
 
     /**
      * Computes a compressed, heap-base relative offset that points to the start of an
      * {@link InstanceReferenceMap}. Due to the compression, all {@link InstanceReferenceMap}s must
-     * be within the first 16 GB of the address space.
+     * be within the first 16 GB of the heap base.
      *
      * @param uncompressedOffset heap-base relative offset of an {@link InstanceReferenceMap}.
      */
-    private static int computeCompressedReferenceMapOffset(long uncompressedOffset) {
-        long compressedOffset = uncompressedOffset >>> COMPRESSED_REFERENCE_MAP_OFFSET_SHIFT;
-        assert uncompressedOffset == (compressedOffset << COMPRESSED_REFERENCE_MAP_OFFSET_SHIFT) : "wrong alignment";
+    private static int computeReferenceMapCompressedOffset(long uncompressedOffset) {
+        long compressedOffset = uncompressedOffset >>> REFERENCE_MAP_COMPRESSED_OFFSET_SHIFT;
+        assert uncompressedOffset == (compressedOffset << REFERENCE_MAP_COMPRESSED_OFFSET_SHIFT) : "wrong alignment";
 
         VMError.guarantee(NumUtil.isUInt(compressedOffset), "Compressed reference map offset is not within unsigned integer range");
         return (int) compressedOffset;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -372,7 +372,7 @@ public final class DynamicHub implements AnnotatedElement, java.lang.reflect.Typ
      * {@link DynamicHubSupport#getInstanceReferenceMap}).
      */
     @UnknownPrimitiveField(availability = AfterHeapLayout.class)//
-    private int compressedReferenceMapOffset = -1;
+    private int referenceMapCompressedOffset = -1;
 
     private final byte layerId;
 
@@ -552,7 +552,7 @@ public static DynamicHub allocate(String name, DynamicHub superHub, Object inter
         // GR-61330: only write if the field exists according to analysis
         // companion.metaType = null;
 
-        int compressedReferenceMapOffset = RuntimeInstanceReferenceMapSupport.singleton().getOrCreateReferenceMap(superHub);
+        int referenceMapCompressedOffset = RuntimeInstanceReferenceMapSupport.singleton().getOrCreateReferenceMap(superHub);
 
         // GR-57813
         companion.hubMetadata = null;
@@ -585,7 +585,7 @@ public static DynamicHub allocate(String name, DynamicHub superHub, Object inter
 
         writeObject(hub, dynamicHubOffsets.getComponentTypeOffset(), componentHub);
 
-        writeInt(hub, dynamicHubOffsets.getCompressedReferenceMapOffsetOffset(), compressedReferenceMapOffset);
+        writeInt(hub, dynamicHubOffsets.getReferenceMapCompressedOffsetOffset(), referenceMapCompressedOffset);
         writeByte(hub, dynamicHubOffsets.getLayerIdOffset(), NumUtil.safeToByte(DynamicImageLayerInfo.CREMA_LAYER_ID));
 
         // skip vtable (special treatment)
@@ -943,25 +943,25 @@ public DynamicHub getArrayHub() {
 
     @AlwaysInline("GC performance")
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-    public int getCompressedReferenceMapOffset() {
-        assert compressedReferenceMapOffset >= 0;
-        return compressedReferenceMapOffset;
+    public int getReferenceMapCompressedOffset() {
+        assert referenceMapCompressedOffset >= 0;
+        return referenceMapCompressedOffset;
     }
 
     /**
-     * Initializes the {@link #compressedReferenceMapOffset} based on the
+     * Initializes the {@link #referenceMapCompressedOffset} based on the
      * {@link #referenceMapIndex}.
      */
     @Platforms(Platform.HOSTED_ONLY.class)
-    public void initializeCompressedReferenceMapOffset(long currentLayerRefMapDataStart) {
-        assert compressedReferenceMapOffset == -1;
+    public void initializeReferenceMapCompressedOffset(long currentLayerRefMapDataStart) {
+        assert referenceMapCompressedOffset == -1;
         assert ReferenceMapIndex.denotesValidReferenceMap(referenceMapIndex);
 
         if (Platform.includedIn(NATIVE_ONLY.class)) {
-            this.compressedReferenceMapOffset = InstanceReferenceMapEncoder.computeCompressedReferenceMapOffset(currentLayerRefMapDataStart, referenceMapIndex);
+            this.referenceMapCompressedOffset = InstanceReferenceMapEncoder.computeReferenceMapCompressedOffset(currentLayerRefMapDataStart, referenceMapIndex);
         } else {
             /* Remove once a heap base is supported, see GR-68847. */
-            this.compressedReferenceMapOffset = referenceMapIndex;
+            this.referenceMapCompressedOffset = referenceMapIndex;
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java

@@ -60,11 +60,11 @@ public static DynamicHubSupport currentLayer() {
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static InstanceReferenceMap getInstanceReferenceMap(DynamicHub hub) {
         if (Platform.includedIn(NATIVE_ONLY.class)) {
-            return InstanceReferenceMapDecoder.getReferenceMap(hub.getCompressedReferenceMapOffset());
+            return InstanceReferenceMapDecoder.getReferenceMap(hub.getReferenceMapCompressedOffset());
         } else {
             /* Remove once a heap base is supported, see GR-68847. */
             byte[] referenceMapEncoding = MultiLayeredImageSingleton.getForLayer(DynamicHubSupport.class, 0).referenceMapEncoding;
-            return InstanceReferenceMapDecoder.getReferenceMap(NonmovableArrays.fromImageHeap(referenceMapEncoding), hub.getCompressedReferenceMapOffset());
+            return InstanceReferenceMapDecoder.getReferenceMap(NonmovableArrays.fromImageHeap(referenceMapEncoding), hub.getReferenceMapCompressedOffset());
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/RuntimeInstanceReferenceMapSupport.java

@@ -82,7 +82,7 @@ public int getOrCreateReferenceMap(DynamicHub superHub, FieldInfo... declaredIns
 
         /* If there are no declared object fields, reuse the reference map from the super class. */
         if (map.isEmpty()) {
-            return superHub.getCompressedReferenceMapOffset();
+            return superHub.getReferenceMapCompressedOffset();
         }
 
         /* Add the object fields from all super classes to the bitmap. */
@@ -103,7 +103,7 @@ private synchronized int putIfAbsent(byte[] newHeapMap) {
         ReferenceMapHolder newHeapMapHolder = new ReferenceMapHolder(newHeapMap);
         ReferenceMapHolder existingMetaspaceMapHolder = refMaps.get(newHeapMapHolder);
         if (existingMetaspaceMapHolder != null) {
-            return toCompressedReferenceMapOffset(existingMetaspaceMapHolder.refMap);
+            return toCompressedOffset(existingMetaspaceMapHolder.refMap);
         }
 
         /* Copy the data to the metaspace. */
@@ -113,16 +113,16 @@ private synchronized int putIfAbsent(byte[] newHeapMap) {
         /* Store the new reference map in the hash map. */
         ReferenceMapHolder newMetaspaceMapHolder = new ReferenceMapHolder(newMetaspaceMap);
         refMaps.put(newMetaspaceMapHolder, newMetaspaceMapHolder);
-        return toCompressedReferenceMapOffset(newMetaspaceMapHolder.refMap);
+        return toCompressedOffset(newMetaspaceMapHolder.refMap);
     }
 
     @SuppressWarnings("unchecked")
-    private static int toCompressedReferenceMapOffset(byte[] metaspaceRefMapArray) {
+    private static int toCompressedOffset(byte[] metaspaceRefMapArray) {
         assert Metaspace.singleton().isInAddressSpace(metaspaceRefMapArray);
 
         NonmovableArray<Byte> array = (NonmovableArray<Byte>) Word.objectToUntrackedPointer(metaspaceRefMapArray);
         InstanceReferenceMap metaspaceMap = NonmovableArrays.getArrayBase(array);
-        return InstanceReferenceMapEncoder.computeCompressedReferenceMapOffset(metaspaceMap);
+        return InstanceReferenceMapEncoder.computeReferenceMapCompressedOffset(metaspaceMap);
     }
 
     /* Remove once GR-60069 is merged. */

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/DynamicHubSupportFeature.java

@@ -67,7 +67,7 @@ public void beforeCompilation(BeforeCompilationAccess access) {
      * At runtime, no code directly accesses {@code DynamicHubSupport.referenceMapEncoding}.
      * However, the object referenced by this field must still be included in the image heap because
      * each {@link DynamicHub} contains a heap-base relative offset into that object (see
-     * {@link DynamicHub#getCompressedReferenceMapOffset()}). Therefore, we must add this object to
+     * {@link DynamicHub#getReferenceMapCompressedOffset()}). Therefore, we must add this object to
      * the image heap manually.
      */
     private static void addReferenceMapEncodingToImageHeap(NativeImageHeap heap, HostedUniverse hUniverse) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java

@@ -438,7 +438,7 @@ public int countPatchAndVerifyDynamicHubs() {
         for (ObjectInfo o : getObjects()) {
             if (!o.constant.isWrittenInPreviousLayer() && hMetaAccess.isInstanceOf(o.getConstant(), DynamicHub.class)) {
                 DynamicHub hub = (DynamicHub) o.getObject();
-                hub.initializeCompressedReferenceMapOffset(currentLayerRefMapDataStart);
+                hub.initializeReferenceMapCompressedOffset(currentLayerRefMapDataStart);
 
                 objHeader.verifyDynamicHubOffset(o.getOffset());
                 count++;