bug

Author: teshull

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/OpenTypeWorldFeature.java

@@ -99,10 +99,7 @@ public void beforeCompilation(BeforeCompilationAccess access) {
     public static void computeIndirectCallTargets(HostedUniverse hUniverse, Map<AnalysisMethod, HostedMethod> methods) {
         Map<HostedType, HostedType[]> allInterfacesMap = new HashMap<>();
         methods.forEach((aMethod, hMethod) -> {
-            if (!aMethod.isOriginalMethod()) {
-                // We don't need to set this; only original methods will be call targets
-                return;
-            }
+            assert aMethod.isOriginalMethod();
 
             var aAlias = calculateIndirectCallTarget(allInterfacesMap, hMethod);
             HostedMethod hAlias;

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

@@ -395,19 +395,8 @@ public HostedMethod getIndirectCallTarget() {
         return indirectCallTarget;
     }
 
-    void finalizeVTableIndex(boolean closedTypeWorld) {
-        if (closedTypeWorld) {
-            /*
-             * In the closed type word we do not have a different indirectCallTarget, so the
-             * vtableIndex is always the original vtable index.
-             */
-            indirectCallVTableIndex = computedVTableIndex;
-        } else {
-            /*
-             * In the open type word we must use the vtable index from the indirect call target.
-             */
-            indirectCallVTableIndex = indirectCallTarget.computedVTableIndex;
-        }
+    void finalizeIndirectCallVTableIndex() {
+        indirectCallVTableIndex = indirectCallTarget.computedVTableIndex;
     }
 
     @Override
@@ -673,6 +662,9 @@ public HostedMethod getOrCreateMultiMethod(MultiMethodKey key) {
         return (HostedMethod) multiMethodMap.computeIfAbsent(key, (k) -> {
             HostedMethod newMultiMethod = create0(wrapped, holder, signature, constantPool, handlers, k, multiMethodMap, localVariableTable);
             newMultiMethod.implementations = implementations;
+            newMultiMethod.computedVTableIndex = computedVTableIndex;
+            newMultiMethod.indirectCallTarget = indirectCallTarget;
+            newMultiMethod.indirectCallVTableIndex = indirectCallVTableIndex;
             return newMultiMethod;
         });
     }

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

@@ -182,8 +182,15 @@ public void build(DebugContext debug) {
                 HostedMethod previous = hUniverse.methods.put(aMethod, origHMethod);
                 assert previous == null : "Overwriting analysis key";
             }
+
+            // see SharedMethod#getIndirectCallTarget for more information
             if (!SubstrateOptions.useClosedTypeWorldHubLayout()) {
                 OpenTypeWorldFeature.computeIndirectCallTargets(hUniverse, hUniverse.methods);
+            } else {
+                hUniverse.methods.forEach((aMethod, hMethod) -> {
+                    assert aMethod.isOriginalMethod();
+                    hMethod.setIndirectCallTarget(hMethod);
+                });
             }
 
             HostedConfiguration.initializeDynamicHubLayout(hMetaAccess);

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

@@ -60,10 +60,10 @@ public static void buildTables(HostedUniverse hUniverse, HostedMetaAccess hMetaA
         VTableBuilder builder = new VTableBuilder(hUniverse, hMetaAccess);
         if (SubstrateOptions.useClosedTypeWorldHubLayout()) {
             builder.buildClosedTypeWorldVTables();
-            hUniverse.methods.forEach((k, v) -> v.finalizeVTableIndex(true));
+            hUniverse.methods.forEach((k, v) -> v.finalizeIndirectCallVTableIndex());
         } else {
             builder.buildOpenTypeWorldDispatchTables();
-            hUniverse.methods.forEach((k, v) -> v.finalizeVTableIndex(false));
+            hUniverse.methods.forEach((k, v) -> v.finalizeIndirectCallVTableIndex());
             assert builder.verifyOpenTypeWorldDispatchTables();
         }
     }