Rename ReferenceAccess.getAddressSpaceSize() to getMaxAddressSpaceSize().

Author: christianhaeubl

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java

@@ -327,7 +327,7 @@ public UnsignedWord getMinimumHeapSize() {
     protected abstract long gcCount();
 
     protected SizeParameters computeSizeParameters(SizeParameters existing) {
-        UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getAddressSpaceSize();
+        UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getMaxAddressSpaceSize();
         UnsignedWord minYoungSpaces = minSpaceSize(); // eden
         if (HeapParameters.getMaxSurvivorSpaces() > 0) {
             minYoungSpaces = minYoungSpaces.add(minSpaceSize().multiply(2)); // survivor from and to
@@ -430,7 +430,7 @@ private SizeParameters(UnsignedWord maxHeapSize, UnsignedWord maxYoungSize, Unsi
             assert initialHeapSize.belowOrEqual(maxHeapSize);
             assert maxSurvivorSize().belowThan(maxYoungSize);
             assert maxYoungSize.add(maxOldSize()).equal(maxHeapSize);
-            assert maxHeapSize.belowOrEqual(ReferenceAccess.singleton().getAddressSpaceSize());
+            assert maxHeapSize.belowOrEqual(ReferenceAccess.singleton().getMaxAddressSpaceSize());
             assert initialEdenSize.add(initialSurvivorSize.multiply(2)).equal(initialYoungSize());
             assert initialYoungSize().add(initialOldSize()).equal(initialHeapSize);
         }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AddressRangeCommittedMemoryProvider.java

@@ -28,10 +28,9 @@
 import static com.oracle.svm.core.util.PointerUtils.roundDown;
 import static com.oracle.svm.core.util.PointerUtils.roundUp;
 import static com.oracle.svm.core.util.VMError.guarantee;
-import static jdk.graal.compiler.word.Word.unsigned;
 import static jdk.graal.compiler.word.Word.nullPointer;
+import static jdk.graal.compiler.word.Word.unsigned;
 
-import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -74,6 +73,7 @@
 import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 
 /**
  * Reserves a fixed-size address range and provides memory from it by committing and uncommitting
@@ -144,7 +144,7 @@ public AddressRangeCommittedMemoryProvider() {
     @Override
     @Uninterruptible(reason = "Still being initialized.")
     public int initialize(WordPointer heapBasePointer, IsolateArguments arguments) {
-        UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getAddressSpaceSize();
+        UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getMaxAddressSpaceSize();
         UnsignedWord reserved = Word.unsigned(IsolateArgumentAccess.readLong(arguments, IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.ReservedAddressSpaceSize)));
         if (reserved.equal(0)) {
             /*

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/BasicCollectionPolicies.java

@@ -106,7 +106,7 @@ public final UnsignedWord getMaximumHeapSize() {
              * If the physical size is known yet, the maximum size of the heap is a fraction of the
              * size of the physical memory.
              */
-            UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getAddressSpaceSize();
+            UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getMaxAddressSpaceSize();
             UnsignedWord physicalMemorySize = PhysicalMemory.size();
             int maximumHeapSizePercent = HeapParameters.getMaximumHeapSizePercent();
             /* Do not cache because `-Xmx` option parsing may not have happened yet. */

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

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.graal.compiler.word.Word;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.SubstrateGCOptions;
@@ -34,6 +33,8 @@
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.UserError.UserException;
 
+import jdk.graal.compiler.word.Word;
+
 /**
  * Verifies that the heap size options are used consistently. Note that some checks seem redundant
  * at first glance. However, those checks are needed because options don't necessarily have a value.
@@ -100,7 +101,7 @@ public static void verifyMaxNewSizeAgainstMaxAddressSpaceSize(UnsignedWord maxNe
     }
 
     private static void verifyAgainstMaxAddressSpaceSize(UnsignedWord actualValue, String actualValueName) {
-        UnsignedWord maxAddressSpaceSize = ReferenceAccess.singleton().getAddressSpaceSize();
+        UnsignedWord maxAddressSpaceSize = ReferenceAccess.singleton().getMaxAddressSpaceSize();
         if (actualValue.aboveThan(maxAddressSpaceSize)) {
             throwError(actualValue, actualValueName, maxAddressSpaceSize, "largest possible heap address space");
         }

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

@@ -103,5 +103,5 @@ static ReferenceAccess singleton() {
      * Returns the maximum size that the Java heap address space can have at run-time (e.g., based
      * on the reference size).
      */
-    UnsignedWord getAddressSpaceSize();
+    UnsignedWord getMaxAddressSpaceSize();
 }

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

@@ -109,7 +109,7 @@ public CompressEncoding getCompressEncoding() {
 
     @Fold
     @Override
-    public UnsignedWord getAddressSpaceSize() {
+    public UnsignedWord getMaxAddressSpaceSize() {
         int compressionShift = ReferenceAccess.singleton().getCompressEncoding().getShift();
         if (compressionShift > 0) {
             int referenceSize = ConfigurationValues.getObjectLayout().getReferenceSize();