Fixes.

Author: peter-hofer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java

@@ -87,6 +87,7 @@
 import com.oracle.svm.core.imagelayer.ImageLayerSection;
 import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
 import com.oracle.svm.core.jdk.RuntimeSupport;
+import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.option.RuntimeOptionParser;
 import com.oracle.svm.core.os.CommittedMemoryProvider;
@@ -216,7 +217,7 @@ private static void initCodeBase() {
             int codeStartEntry = ImageLayerSection.getEntryOffset(ImageLayerSection.SectionEntries.CODE_START);
             codeBase = initialLayerSection.readWord(codeStartEntry);
         } else {
-            ImageCodeInfo imageCodeInfo = ImageSingletons.lookup(ImageCodeInfo.class);
+            ImageCodeInfo imageCodeInfo = MultiLayeredImageSingleton.getForLayer(ImageCodeInfo.class, MultiLayeredImageSingleton.INITIAL_LAYER_NUMBER);
             codeBase = imageCodeInfo.getCodeStart();
         }
         writeCurrentVMCodeBase(codeBase);

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

@@ -268,7 +268,8 @@ private void writeConstant(RelocatableBuffer buffer, int index, JavaKind kind, O
             if (!(method instanceof HostedMethod)) {
                 method = metaAccess.getUniverse().lookup(method);
             }
-            if (NativeImage.isInjectedNotCompiled((HostedMethod) method)) {
+            if (imageLayer && NativeImage.isInjectedNotCompiled((HostedMethod) method)) {
+                // Will be patched in a future layer (even if it ends up not being compiled at all)
                 addWordConstantRelocation(buffer, index, methodOffset);
                 return;
             }