Workaround for web-image.

Author: christianhaeubl

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

@@ -89,6 +89,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.InternalPlatform.NATIVE_ONLY;
 
 import com.oracle.svm.configure.ClassNameSupport;
 import com.oracle.svm.configure.config.SignatureUtil;
@@ -956,7 +957,12 @@ public void initializeCompressedReferenceMapOffset(long currentLayerRefMapDataSt
         assert compressedReferenceMapOffset == -1;
         assert ReferenceMapIndex.denotesValidReferenceMap(referenceMapIndex);
 
-        this.compressedReferenceMapOffset = InstanceReferenceMapEncoder.computeCompressedReferenceMapOffset(currentLayerRefMapDataStart, referenceMapIndex);
+        if (Platform.includedIn(NATIVE_ONLY.class)) {
+            this.compressedReferenceMapOffset = InstanceReferenceMapEncoder.computeCompressedReferenceMapOffset(currentLayerRefMapDataStart, referenceMapIndex);
+        } else {
+            /* Remove once a heap base is supported, see GR-68847. */
+            this.compressedReferenceMapOffset = referenceMapIndex;
+        }
     }
 
     /**

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

@@ -30,6 +30,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.InternalPlatform.NATIVE_ONLY;
 
 import com.oracle.svm.core.AlwaysInline;
 import com.oracle.svm.core.BuildPhaseProvider.AfterHostedUniverse;
@@ -58,7 +59,13 @@ public static DynamicHubSupport currentLayer() {
     @AlwaysInline("GC performance")
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static InstanceReferenceMap getInstanceReferenceMap(DynamicHub hub) {
-        return InstanceReferenceMapDecoder.getReferenceMap(hub.getCompressedReferenceMapOffset());
+        if (Platform.includedIn(NATIVE_ONLY.class)) {
+            return InstanceReferenceMapDecoder.getReferenceMap(hub.getCompressedReferenceMapOffset());
+        } 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());
+        }
     }
 
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/WebImageCodeGen.java

@@ -31,18 +31,23 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import org.graalvm.collections.UnmodifiableEconomicMap;
 
 import com.oracle.graal.pointsto.util.Timer;
 import com.oracle.graal.pointsto.util.TimerCollection;
 import com.oracle.svm.core.BuildArtifacts;
+import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.NativeImageGenerator;
+import com.oracle.svm.hosted.image.NativeImageHeap;
 import com.oracle.svm.hosted.meta.HostedMetaAccess;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedUniverse;
@@ -192,6 +197,19 @@ protected void buildImage() {
         postProcess();
     }
 
+    protected void afterHeapLayout() {
+        // after this point, the layout is final and must not be changed anymore
+        assert !hasDuplicatedObjects(codeCache.nativeImageHeap) : "heap.getObjects() must not contain any duplicates";
+        BuildPhaseProvider.markHeapLayoutFinished();
+        codeCache.nativeImageHeap.getLayouter().afterLayout(codeCache.nativeImageHeap);
+    }
+
+    protected boolean hasDuplicatedObjects(NativeImageHeap heap) {
+        Set<NativeImageHeap.ObjectInfo> deduplicated = Collections.newSetFromMap(new IdentityHashMap<>());
+        deduplicated.addAll(heap.getObjects());
+        return deduplicated.size() != heap.getObjectCount();
+    }
+
     /**
      * Emit JS code into {@link #codeBuffer}.
      */

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/WebImageJSCodeGen.java

@@ -142,6 +142,8 @@ protected WebImageJSProviders getProviders() {
 
     @Override
     protected void emitCode() {
+        /* The JS backend doesn't really do any heap layouting, */
+        afterHeapLayout();
         emitJSCode();
     }
 

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/codegen/WebImageWasmCodeGen.java

@@ -35,23 +35,18 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.TreeMap;
 
 import com.oracle.svm.core.BuildArtifacts;
-import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.InvalidMethodPointerHandler;
 import com.oracle.svm.core.image.ImageHeapLayoutInfo;
 import com.oracle.svm.core.meta.MethodPointer;
 import com.oracle.svm.hosted.HeapBreakdownProvider;
 import com.oracle.svm.hosted.NativeImageGenerator;
 import com.oracle.svm.hosted.image.AbstractImage;
-import com.oracle.svm.hosted.image.NativeImageHeap;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.webimage.WebImageCodeCache;
 import com.oracle.svm.hosted.webimage.WebImageHostedConfiguration;
@@ -338,19 +333,6 @@ protected void validateModule() {
         new WasmValidator().visitModule(module);
     }
 
-    protected void afterHeapLayout() {
-        // after this point, the layout is final and must not be changed anymore
-        assert !hasDuplicatedObjects(codeCache.nativeImageHeap) : "heap.getObjects() must not contain any duplicates";
-        BuildPhaseProvider.markHeapLayoutFinished();
-        codeCache.nativeImageHeap.getLayouter().afterLayout(codeCache.nativeImageHeap);
-    }
-
-    protected boolean hasDuplicatedObjects(NativeImageHeap heap) {
-        Set<NativeImageHeap.ObjectInfo> deduplicated = Collections.newSetFromMap(new IdentityHashMap<>());
-        deduplicated.addAll(heap.getObjects());
-        return deduplicated.size() != heap.getObjectCount();
-    }
-
     @Override
     protected void emitPreamble() {
         // Nothing to do.