fixup: address reviewer comments

Author: teshull

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java

@@ -201,7 +201,6 @@ public Object getRawImplementations() {
     public void setSubstrateDataAfterCompilation(SubstrateMethod indirectCallTarget, int vTableIndex) {
         this.indirectCallTarget = indirectCallTarget;
         this.vTableIndex = vTableIndex;
-
     }
 
     public void setSubstrateDataAfterHeapLayout(int imageCodeOffset, int imageCodeDeoptOffset) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java

@@ -828,7 +828,7 @@ private void loadMethod(PersistedAnalysisMethod.Reader methodData) {
                 type.getClassInitializer();
             } else {
                 ResolvedSignature<AnalysisType> signature = ResolvedSignature.fromArray(parameterTypes, returnType);
-                tryFindMethod(type, name, signature);
+                tryLoadMethod(type, name, signature);
             }
         }
 
@@ -847,7 +847,7 @@ private void loadMethod(PersistedAnalysisMethod.Reader methodData) {
      * We also need this because reflection cannot find all declared methods within class; one
      * example it will not find is bridge methods inserted for covariant overrides.
      */
-    private void tryFindMethod(AnalysisType type, String name, ResolvedSignature<AnalysisType> signature) {
+    private void tryLoadMethod(AnalysisType type, String name, ResolvedSignature<AnalysisType> signature) {
         ResolvedJavaType wrapped = type.getWrapped();
         assert !(wrapped instanceof BaseLayerType) : type;
         for (ResolvedJavaMethod method : wrapped.getAllMethods(false)) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java

@@ -616,9 +616,8 @@ private static void finishMethodBeforeCompilation(JNICallableJavaMethod method,
             if (SubstrateOptions.useClosedTypeWorldHubLayout()) {
                 interfaceTypeID = JNIAccessibleMethod.INTERFACE_TYPEID_UNNEEDED;
             } else {
-                HostedType declaringClass = hTarget.getIndirectCallTarget().getDeclaringClass();
-                interfaceTypeID = declaringClass.isInterface() ? declaringClass.getTypeID() : JNIAccessibleMethod.INTERFACE_TYPEID_CLASS_TABLE;
-                VMError.guarantee(!(interfaceTypeID == JNIAccessibleMethod.INTERFACE_TYPEID_CLASS_TABLE && !declaringClass.equals(hTarget.getDeclaringClass())));
+                HostedType indirectCallTargetClass = hTarget.getIndirectCallTarget().getDeclaringClass();
+                interfaceTypeID = indirectCallTargetClass.isInterface() ? indirectCallTargetClass.getTypeID() : JNIAccessibleMethod.INTERFACE_TYPEID_CLASS_TABLE;
             }
         }
         CodePointer nonvirtualTarget = new MethodPointer(hTarget);

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

@@ -107,7 +107,7 @@ public final class HostedMethod extends HostedElement implements SharedMethod, W
      * When using the open type world we must differentiate between this method's vtable index and
      * the vtable index used for virtual calls. This is because sometimes JVMCI will expose to
      * analysis special methods HotSpot introduces into vtables, such as miranda and overpass
-     * methods. In the open type word we only include declared methods in vtables and hence must
+     * methods. In the open type world we only include declared methods in vtables and hence must
      * adjust indirect call targets accordingly.
      *
      * Note normally {@code indirectCallTarget == this}. Only for special HotSpot methods such as
@@ -117,8 +117,8 @@ public final class HostedMethod extends HostedElement implements SharedMethod, W
      *
      * For additional information, see {@link SharedMethod#getIndirectCallTarget}.
      */
-    int indirectCallVTableIndex = MISSING_VTABLE_IDX;
-    HostedMethod indirectCallTarget = null;
+    private int indirectCallVTableIndex = MISSING_VTABLE_IDX;
+    private HostedMethod indirectCallTarget = null;
 
     /**
      * The address offset of the compiled code relative to the code of the first method in the
@@ -383,9 +383,9 @@ public void setIndirectCallTarget(HostedMethod alias) {
             /*
              * When there is an indirectCallTarget installed which is not the original method, we
              * currently expect the target method to either have an interface as its declaring class
-             * or for the declaring class to be unchanged. If we change this in the future, then we
-             * will need to adjust the JNI (JNIAccessFeature) and reflection (ReflectionFeature)
-             * code as well.
+             * or for the declaring class to be unchanged. If the declaring class is different, then
+             * we must ensure that the layout of the vtable matches for all relevant indexes between
+             * the original and alias methods' declaring classes.
              */
             VMError.guarantee(alias.getDeclaringClass().isInterface() || alias.getDeclaringClass().equals(getDeclaringClass()), "Invalid indirect call target for %s: %s", this, alias);
         }
@@ -398,7 +398,7 @@ public HostedMethod getIndirectCallTarget() {
         return indirectCallTarget;
     }
 
-    public void finalizeVTableIndex(boolean closedTypeWorld) {
+    void finalizeVTableIndex(boolean closedTypeWorld) {
         if (closedTypeWorld) {
             /*
              * In the closed type word we do not have a different indirectCallTarget, so the

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java

@@ -534,7 +534,6 @@ public Object transform(Object receiver, Object originalValue) {
         if (indirectCallTarget.getDeclaringClass().isInterface()) {
             return indirectCallTarget.getDeclaringClass().getTypeID();
         }
-        VMError.guarantee(method.equals(indirectCallTarget));
         return SubstrateMethodAccessor.INTERFACE_TYPEID_CLASS_TABLE;
     }
 }