From a1dee39312af260ef7081a2567d0c7a1e8da0775 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Fri, 18 Jul 2025 14:35:12 +0200
Subject: [PATCH] Ensure SVMImageLayerLoader looks up information via the base
 layer type id.

---
 .../oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
index 8fcb44df7d7b..f6318850a544 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
@@ -1018,7 +1018,7 @@ public StructList.Reader<SharedLayerSnapshotCapnProtoSchemaHolder.DynamicHubInfo
     }
 
     public DynamicHubInfo.Reader getDynamicHubInfo(AnalysisType aType) {
-        DynamicHubInfo.Reader result = CapnProtoAdapters.binarySearchUnique(aType.getId(), snapshot.getDynamicHubInfos(), DynamicHubInfo.Reader::getTypeId);
+        DynamicHubInfo.Reader result = CapnProtoAdapters.binarySearchUnique(getBaseLayerTypeId(aType), snapshot.getDynamicHubInfos(), DynamicHubInfo.Reader::getTypeId);
         assert result != null : aType;
         return result;
     }
@@ -1794,8 +1794,8 @@ private void scanCompanionField(DynamicHub hub) {
         instance.readFieldValue(metaAccess.lookupJavaField(dynamicHubCompanionField));
     }
 
-    public ClassInitializationInfo getClassInitializationInfo(AnalysisType type) {
-        PersistedAnalysisType.Reader typeData = findType(type.getId());
+    public ClassInitializationInfo getClassInitializationInfo(AnalysisType aType) {
+        PersistedAnalysisType.Reader typeData = findType(getBaseLayerTypeId(aType));
         var initInfo = typeData.getClassInitializationInfo();
         if (initInfo.getIsNoInitializerNoTracking()) {
             return ClassInitializationInfo.forNoInitializerInfo(false);