Adapt class file dumping to use the new hybrid CP support.

Author: mukel

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserConstantPool.java

@@ -29,6 +29,7 @@
 import java.util.function.Function;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
 import com.oracle.truffle.espresso.classfile.descriptors.ModifiedUTF8;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 
@@ -107,7 +108,10 @@ public byte[] toBytesForSerialization() {
     }
 
     @FunctionalInterface
-    public interface Symbolify<T extends ModifiedUTF8> extends Function<byte[], Symbol<T>> {
+    public interface Symbolify<T extends ModifiedUTF8> extends Function<ByteSequence, Symbol<T>> {
+        default Symbol<T> apply(String string) {
+            return apply(ByteSequence.create(string));
+        }
     }
 
     /**
@@ -130,7 +134,7 @@ public static ParserConstantPool fromBytesForSerialization(byte[] bytes, Symboli
             int symbolLength = bb.getInt();
             byte[] symbolBytes = new byte[symbolLength];
             bb.get(symbolBytes);
-            symbols[i] = symbolify.apply(symbolBytes);
+            symbols[i] = symbolify.apply(ByteSequence.wrap(symbolBytes));
         }
         assert !bb.hasRemaining();
         return new ParserConstantPool(tags, entries, symbols, majorVersion, minorVersion);

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/descriptors/TypeSymbols.java

@@ -31,6 +31,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.espresso.classfile.JavaKind;
+import com.oracle.truffle.espresso.classfile.ParserConstantPool;
 import com.oracle.truffle.espresso.classfile.ParserException;
 
 /**
@@ -430,6 +431,29 @@ public static ByteSequence nameToType(ByteSequence name) {
         return wrap;
     }
 
+    /**
+     * Reverse operation of {@link #fromClassNameEntry(Symbol)}. This conversion is <b>NOT</b> valid
+     * for primitive types, to avoid ambiguity e.g. LI; vs I
+     */
+    public static ByteSequence toClassNameEntry(Symbol<Type> type) {
+        assert !isPrimitive(type);
+        if (isArray(type)) {
+            return type;
+        }
+        assert type.byteAt(0) == 'L';
+        assert type.byteAt(type.length() - 1) == ';';
+        return type.subSequence(1, type.length() - 1);
+    }
+
+    /**
+     * Reverse operation of {@link #fromClassNameEntry(Symbol)}. This conversion is <b>NOT</b> valid
+     * for primitive types, to avoid ambiguity e.g. LI; vs I
+     */
+    public static Symbol<Name> toClassNameEntry(Symbol<Type> type, ParserConstantPool.Symbolify<Name> symbolify) {
+        ByteSequence className = toClassNameEntry(type);
+        return symbolify.apply(className);
+    }
+
     public static ByteSequence getRuntimePackage(ByteSequence symbol) {
         if (symbol.byteAt(0) == '[') {
             int arrayDimensions = getArrayDimensions(symbol);

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

@@ -164,7 +164,7 @@ public boolean isJavaLangObject() {
     @Override
     public Symbol<Name> getSymbolicName() {
         // This is assumed to be low-traffic
-        return SymbolsSupport.getNames().getOrCreate(TypeSymbols.typeToName(type));
+        return SymbolsSupport.getNames().getOrCreate(TypeSymbols.toClassNameEntry(type));
     }
 
     @Override

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/serialization/Serializers.java

@@ -40,7 +40,6 @@
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.espresso.classfile.ParserConstantPool;
-import com.oracle.svm.espresso.classfile.descriptors.ByteSequence;
 import com.oracle.svm.espresso.classfile.descriptors.ModifiedUTF8;
 import com.oracle.svm.espresso.classfile.descriptors.Symbol;
 import com.oracle.svm.interpreter.metadata.InterpreterConstantPool;
@@ -532,8 +531,7 @@ public static ValueSerializer<ReferenceConstant<?>> newReferenceConstantSerializ
 
                         @SuppressWarnings("unchecked")
                         ParserConstantPool parserConstantPool = ParserConstantPool.fromBytesForSerialization(parserConstantPoolBytes,
-                                        bytes -> {
-                                            ByteSequence byteSequence = ByteSequence.wrap(bytes);
+                                        byteSequence -> {
                                             return (Symbol<ModifiedUTF8>) SymbolsSupport.getUtf8().getOrCreateValidUtf8(byteSequence);
                                         });
                         Object[] cachedEntries = context.readerFor(Object[].class).read(context, in);

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/BuildTimeConstantPool.java

@@ -55,7 +55,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedUniverse;
-import com.oracle.svm.interpreter.constantpool.ConstantPoolBuilder;
+import com.oracle.svm.interpreter.classfile.ConstantPoolBuilder;
 import com.oracle.svm.interpreter.metadata.BytecodeStream;
 import com.oracle.svm.interpreter.metadata.Bytecodes;
 import com.oracle.svm.interpreter.metadata.InterpreterConstantPool;

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/CremaSupportImpl.java

@@ -31,7 +31,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.oracle.svm.interpreter.constantpool.RuntimeInterpreterConstantPool;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.nativeimage.Platform;

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/constantpool/RuntimeInterpreterConstantPool.java renamed to substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/RuntimeInterpreterConstantPool.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.interpreter.constantpool;
+package com.oracle.svm.interpreter;
 
 import com.oracle.svm.core.hub.registry.SymbolsSupport;
 import com.oracle.svm.core.util.VMError;
@@ -32,9 +32,6 @@
 import com.oracle.svm.espresso.classfile.descriptors.Symbol;
 import com.oracle.svm.espresso.classfile.descriptors.Type;
 import com.oracle.svm.espresso.classfile.descriptors.TypeSymbols;
-import com.oracle.svm.interpreter.CremaLinkResolver;
-import com.oracle.svm.interpreter.CremaRuntimeAccess;
-import com.oracle.svm.interpreter.SemanticJavaException;
 import com.oracle.svm.interpreter.metadata.InterpreterConstantPool;
 import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaField;
 import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaMethod;