[GR-65020] [GR-65327] Fixes for java.specification.maintenance.version and reference constants in large images.

PullRequest: graal/20915

Author: christianhaeubl

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/TLABObjectHeaderConstant.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/TLABObjectHeaderConstant.java

@@ -23,30 +23,32 @@
  * questions.
  */
 
-package com.oracle.graal.pointsto.heap;
+package com.oracle.svm.core.graal.nodes;
 
 import java.util.Objects;
 
+import com.oracle.svm.core.hub.DynamicHub;
+
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.VMConstant;
 
 /**
  * An {@code TLABObjectHeaderConstant} is a constant representing the content of the header of a
- * newly created object. It is computed from the address of the type object and needs patching in
- * after compilation.
+ * newly created object. It is computed from the address of the {@link DynamicHub} and needs
+ * patching after compilation and relocations at run-time.
  */
 public final class TLABObjectHeaderConstant implements JavaConstant, VMConstant {
-    private final ImageHeapInstance hub;
+    private final JavaConstant hub;
     private final int size;
 
-    public TLABObjectHeaderConstant(ImageHeapInstance hub, int size) {
+    public TLABObjectHeaderConstant(JavaConstant hub, int size) {
         assert size == Integer.BYTES || size == Long.BYTES : size;
         this.hub = hub;
         this.size = size;
     }
 
-    public ImageHeapInstance hub() {
+    public JavaConstant hub() {
         return hub;
     }
 

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

@@ -80,8 +80,7 @@ protected ObjectHeader() {
 
     /**
      * If we should constant-fold the header calculation when initializing new objects, this method
-     * returns the size of the header, else it returns -1. This method should be in sync with
-     * {@link #readHeaderFromObject(Object)}.
+     * returns the size of the header, else it returns -1.
      */
     public abstract int constantHeaderSize();
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java

@@ -36,14 +36,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-import com.oracle.svm.core.SubstrateOptions;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.RuntimeSystemProperties;
 import org.graalvm.nativeimage.impl.RuntimeSystemPropertiesSupport;
 
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.VM;
 import com.oracle.svm.core.c.locale.LocaleSupport;
@@ -69,6 +69,15 @@ public abstract class SystemPropertiesSupport implements RuntimeSystemProperties
     private static final String[] HOSTED_PROPERTIES = {
                     "java.version",
                     "java.version.date",
+                    "java.class.version",
+                    "java.runtime.version",
+                    "java.specification.name",
+                    "java.specification.vendor",
+                    "java.specification.version",
+                    "java.specification.maintenance.version",
+                    "java.vm.specification.name",
+                    "java.vm.specification.vendor",
+                    "java.vm.specification.version",
                     ImageInfo.PROPERTY_IMAGE_KIND_KEY,
                     /*
                      * We do not support cross-compilation for now. Separators might also be cached
@@ -83,14 +92,6 @@ public abstract class SystemPropertiesSupport implements RuntimeSystemProperties
                     "native.encoding",
                     "stdout.encoding",
                     "stderr.encoding",
-                    "java.class.version",
-                    "java.runtime.version",
-                    "java.specification.name",
-                    "java.specification.vendor",
-                    "java.specification.version",
-                    "java.vm.specification.name",
-                    "java.vm.specification.vendor",
-                    "java.vm.specification.version"
     };
 
     /** System properties that are computed at run time on first access. */

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

@@ -61,8 +61,6 @@
 import org.graalvm.nativeimage.c.type.CTypedef;
 import org.graalvm.nativeimage.c.type.CUnsigned;
 
-import com.oracle.graal.pointsto.heap.ImageHeapInstance;
-import com.oracle.graal.pointsto.heap.TLABObjectHeaderConstant;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.objectfile.BasicProgbitsSectionImpl;
@@ -93,6 +91,7 @@
 import com.oracle.svm.core.graal.code.CGlobalDataBasePointer;
 import com.oracle.svm.core.graal.code.CGlobalDataInfo;
 import com.oracle.svm.core.graal.code.CGlobalDataReference;
+import com.oracle.svm.core.graal.nodes.TLABObjectHeaderConstant;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.image.ImageHeapLayoutInfo;
 import com.oracle.svm.core.image.ImageHeapPartition;
@@ -749,7 +748,7 @@ private void markDataRelocationSiteFromText(RelocatableBuffer buffer, final Prog
                 // The value of the hub pointer in the header of an object
                 VMError.guarantee(constant instanceof TLABObjectHeaderConstant, "must be an EncodedHubPointerConstant: %s", constant);
                 TLABObjectHeaderConstant hpc = (TLABObjectHeaderConstant) constant;
-                ImageHeapInstance hub = hpc.hub();
+                JavaConstant hub = hpc.hub();
                 long hubOffsetFromHeapBase = heap.getConstantInfo(hub).getOffset();
                 VMError.guarantee(hubOffsetFromHeapBase != 0, "hub must be non-null: %s", hub);
                 targetValue = Heap.getHeap().getObjectHeader().encodeAsTLABObjectHeader(hubOffsetFromHeapBase);
@@ -762,13 +761,12 @@ private void markDataRelocationSiteFromText(RelocatableBuffer buffer, final Prog
                 if (info.getRelocationSize() == Long.BYTES) {
                     bufferBytes.putLong(offset, targetValue);
                 } else if (info.getRelocationSize() == Integer.BYTES) {
-                    bufferBytes.putInt(offset, NumUtil.safeToInt(targetValue));
+                    bufferBytes.putInt(offset, NumUtil.safeToUInt(targetValue));
                 } else {
-                    new Exception().printStackTrace();
-                    shouldNotReachHere("Unsupported object reference size: " + info.getRelocationSize());
+                    throw shouldNotReachHere("Unsupported object reference size: " + info.getRelocationSize());
                 }
             } else if (arch instanceof AArch64) {
-                int patchValue = 0;
+                int patchValue;
                 switch (info.getRelocationKind()) {
                     case AARCH64_R_MOVW_UABS_G0:
                     case AARCH64_R_MOVW_UABS_G0_NC:

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

@@ -57,7 +57,7 @@
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
 import com.oracle.graal.pointsto.BigBang;
-import com.oracle.graal.pointsto.heap.TLABObjectHeaderConstant;
+import com.oracle.svm.core.graal.nodes.TLABObjectHeaderConstant;
 import com.oracle.graal.pointsto.infrastructure.WrappedElement;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedSnippetReflectionProvider.java

@@ -29,10 +29,9 @@
 
 import com.oracle.graal.pointsto.ObjectScanner.OtherReason;
 import com.oracle.graal.pointsto.heap.ImageHeapConstant;
-import com.oracle.graal.pointsto.heap.ImageHeapInstance;
 import com.oracle.graal.pointsto.heap.ImageHeapScanner;
-import com.oracle.graal.pointsto.heap.TLABObjectHeaderConstant;
 import com.oracle.svm.core.deopt.DeoptimizationSupport;
+import com.oracle.svm.core.graal.nodes.TLABObjectHeaderConstant;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
@@ -88,7 +87,7 @@ public ValueNode forTLABObjectHeader(Object hub, StructuredGraph graph) {
             return null;
         }
 
-        JavaConstant constant = new TLABObjectHeaderConstant((ImageHeapInstance) forObject(hub), constantHeaderSize);
+        JavaConstant constant = new TLABObjectHeaderConstant(forObject(hub), constantHeaderSize);
         ValueNode res = NonFoldingConstantNode.create(constant, graph);
         if (constantHeaderSize == Integer.BYTES) {
             res = graph.addOrUniqueWithInputs(ZeroExtendNode.create(res, Long.SIZE, NodeView.DEFAULT));