Make CremaMethodAccess runtime-only

Author: gilles-duboscq

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/CremaMethodAccess.java

@@ -32,7 +32,6 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.registry.SymbolsSupport;
 import com.oracle.svm.espresso.classfile.attributes.LineNumberTableAttribute;
-import com.oracle.svm.espresso.classfile.descriptors.ByteSequence;
 import com.oracle.svm.espresso.classfile.descriptors.Name;
 import com.oracle.svm.espresso.classfile.descriptors.ParserSymbols;
 import com.oracle.svm.espresso.classfile.descriptors.Signature;
@@ -105,20 +104,6 @@ static InterpreterResolvedJavaMethod toJVMCI(Executable executable) {
         return holder.lookupMethod(name, signature);
     }
 
-    static Symbol<Signature> toSymbol(InterpreterUnresolvedSignature jvmciSignature, SignatureSymbols signatures) {
-        // hidden classes and SVM stable proxy name contain a `.`, replace with a `+`
-        StringBuilder sb = new StringBuilder();
-        sb.append('(');
-        for (int i = 0; i < jvmciSignature.getParameterCount(false); i++) {
-            sb.append(jvmciSignature.getParameterType(i, null).getName().replace('.', '+'));
-        }
-        sb.append(')');
-        sb.append(jvmciSignature.getReturnType(null).getName().replace('.', '+'));
-        Symbol<Signature> symbol = signatures.getOrCreateValidSignature(ByteSequence.create(sb.toString()));
-        assert symbol != null : jvmciSignature;
-        return symbol;
-    }
-
     static JavaType toJavaType(Symbol<Type> typeSymbol) {
         if (TypeSymbols.isPrimitive(typeSymbol)) {
             return InterpreterResolvedPrimitiveType.fromKind(JavaKind.fromPrimitiveOrVoidTypeChar((char) typeSymbol.byteAt(0)));

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/InterpreterResolvedJavaMethod.java

@@ -58,6 +58,7 @@
 import com.oracle.svm.espresso.classfile.JavaVersion;
 import com.oracle.svm.espresso.classfile.ParserMethod;
 import com.oracle.svm.espresso.classfile.attributes.CodeAttribute;
+import com.oracle.svm.espresso.classfile.descriptors.ByteSequence;
 import com.oracle.svm.espresso.classfile.descriptors.Name;
 import com.oracle.svm.espresso.classfile.descriptors.ParserSymbols;
 import com.oracle.svm.espresso.classfile.descriptors.Signature;
@@ -283,7 +284,7 @@ public static InterpreterResolvedJavaMethod createForDeserialization(String name
                     byte[] code, ExceptionHandler[] exceptionHandlers, LineNumberTable lineNumberTable, LocalVariableTable localVariableTable,
                     ReferenceConstant<FunctionPointerHolder> nativeEntryPoint, int vtableIndex, int gotOffset, int enterStubOffset, int methodId) {
         Symbol<Name> nameSymbol = SymbolsSupport.getNames().getOrCreate(name);
-        Symbol<Signature> signatureSymbol = CremaMethodAccess.toSymbol(signature, SymbolsSupport.getSignatures());
+        Symbol<Signature> signatureSymbol = toSymbol(signature);
         return new InterpreterResolvedJavaMethod(nameSymbol, maxLocals, maxStackSize, flags, declaringClass, signature, signatureSymbol, code,
                         exceptionHandlers, lineNumberTable, localVariableTable, nativeEntryPoint, vtableIndex, gotOffset, enterStubOffset, methodId);
     }
@@ -296,12 +297,26 @@ public static InterpreterResolvedJavaMethod createAtBuildTime(ResolvedJavaMethod
                     byte[] code, ExceptionHandler[] exceptionHandlers, LineNumberTable lineNumberTable, LocalVariableTable localVariableTable,
                     ReferenceConstant<FunctionPointerHolder> nativeEntryPoint, int vtableIndex, int gotOffset, int enterStubOffset, int methodId) {
         Symbol<Name> nameSymbol = SymbolsSupport.getNames().getOrCreate(name);
-        Symbol<Signature> signatureSymbol = CremaMethodAccess.toSymbol(signature, SymbolsSupport.getSignatures());
+        Symbol<Signature> signatureSymbol = toSymbol(signature);
         int flags = createFlags(modifiers, declaringClass, signatureSymbol, isSubstitutedNative, originalMethod);
         return new InterpreterResolvedJavaMethod(originalMethod, nameSymbol, maxLocals, maxStackSize, flags, declaringClass, signature, signatureSymbol, code,
                         exceptionHandlers, lineNumberTable, localVariableTable, nativeEntryPoint, vtableIndex, gotOffset, enterStubOffset, methodId);
     }
 
+    private static Symbol<Signature> toSymbol(InterpreterUnresolvedSignature jvmciSignature) {
+        // hidden classes and SVM stable proxy name contain a `.`, replace with a `+`
+        StringBuilder sb = new StringBuilder();
+        sb.append('(');
+        for (int i = 0; i < jvmciSignature.getParameterCount(false); i++) {
+            sb.append(jvmciSignature.getParameterType(i, null).getName().replace('.', '+'));
+        }
+        sb.append(')');
+        sb.append(jvmciSignature.getReturnType(null).getName().replace('.', '+'));
+        Symbol<Signature> symbol = SymbolsSupport.getSignatures().getOrCreateValidSignature(ByteSequence.create(sb.toString()));
+        assert symbol != null : jvmciSignature;
+        return symbol;
+    }
+
     @Platforms(Platform.HOSTED_ONLY.class)
     private static int createFlags(int modifiers, InterpreterResolvedObjectType declaringClass, Symbol<Signature> signatureSymbol, boolean isSubstitutedNative, ResolvedJavaMethod originalMethod) {
         int newModifiers = modifiers;