[GR-57335] Add getters to KnownOffsets and helper to determine itable…

… start offsets in OpenTypeWorld PullRequest: graal/18989
oracle · Oct 18, 2024 · e49891c · e49891c
2 parents d93364d + 35d63a5
commit e49891c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java
@@ -110,6 +110,14 @@ private boolean isFullyInitialized() {
         return vtableEntrySize > 0;
     }
 
+    public int getVTableBaseOffset() {
+        return vtableBaseOffset;
+    }
+
+    public int getVTableEntrySize() {
+        return vtableEntrySize;
+    }
+
     /**
      * Returns of the offset of the index either relative to the start of the vtable
      * ({@code fromDynamicHubStart} == false) or start of the dynamic hub

diff --git a/...e.svm.core/src/com/oracle/svm/core/graal/snippets/OpenTypeWorldDispatchTableSnippets.java b/...e.svm.core/src/com/oracle/svm/core/graal/snippets/OpenTypeWorldDispatchTableSnippets.java
@@ -72,7 +72,7 @@ private static long loadDispatchTableStartingOffset(
         }
     }
 
-    private static long determineITableStartingOffset(
+    public static long determineITableStartingOffset(
                     DynamicHub checkedHub,
                     int interfaceID) {
 
@@ -120,7 +120,7 @@ class DispatchTableStartingOffsetLowering implements NodeLoweringProvider<LoadOp
         @Override
         public void lower(LoadOpenTypeWorldDispatchTableStartingOffset node, LoweringTool tool) {
             SharedMethod target = node.getTarget();
-            int vtableStartingOffset = KnownOffsets.singleton().getVTableOffset(0, true);
+            int vtableStartingOffset = KnownOffsets.singleton().getVTableBaseOffset();
             if (target != null) {
                 /*
                  * If the target is known, then we know whether to use the class dispatch table or