[GR-54923] Improve partial evaluation in espresso.

PullRequest: graal/18061

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/bytecode/Bytecodes.java

@@ -259,6 +259,9 @@ public final class Bytecodes {
     // Espresso quickened bytecodes.
     public static final int QUICK                = 203; // 0xCB
     public static final int SLIM_QUICK           = 204; // 0xCC
+    // Espresso special bytecodes.
+    public static final int RETURN_VALUE         = 205; // 0xCD
+    public static final int THROW_VALUE          = 206; // 0xCE
 
     public static final int ILLEGAL = 255;
     public static final int END = 256;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/classfile/constantpool/MemberRefConstant.java

@@ -24,6 +24,7 @@
 
 import java.nio.ByteBuffer;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
 import com.oracle.truffle.espresso.classfile.RuntimeConstantPool;
@@ -170,6 +171,7 @@ static boolean checkAccess(ObjectKlass accessingKlass, Klass resolvedKlass, Memb
         }
 
         if (accessingKlass.getHostClass() != null) {
+            CompilerAsserts.partialEvaluationConstant(accessingKlass);
             return checkAccess(accessingKlass.getHostClass(), resolvedKlass, member);
         }
         return false;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java

@@ -1447,6 +1447,7 @@ public final Field lookupField(Symbol<Name> fieldName, Symbol<Type> fieldType, L
             }
         }
 
+        CompilerAsserts.partialEvaluationConstant(this);
         if (getSuperKlass() != null) {
             return getSuperKlass().lookupField(fieldName, fieldType, mode);
         }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java

@@ -1063,7 +1063,7 @@ public Method itableLookup(Klass interfKlass, int methodIndex) {
         assert methodIndex >= 0 : "Undeclared interface method";
         int itableIndex = fastLookup(interfKlass, getiKlassTable());
         if (itableIndex < 0) {
-            Meta meta = getMeta();
+            Meta meta = interfKlass.getMeta();
             throw meta.throwExceptionWithMessage(meta.java_lang_IncompatibleClassChangeError, "Class %s does not implement interface %s", getName(), interfKlass.getName());
         }
         return getItable()[itableIndex][methodIndex].getMethod();
@@ -1200,6 +1200,7 @@ public Method lookupMethod(Symbol<Name> methodName, Symbol<Signature> signature,
             method = lookupPolysigMethod(methodName, signature, lookupMode);
         }
         if (method == null && getSuperKlass() != null) {
+            CompilerAsserts.partialEvaluationConstant(this);
             method = getSuperKlass().lookupMethod(methodName, signature, lookupMode);
         }
         return method;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/jni/JniEnv.java

@@ -441,6 +441,7 @@ public long sizeMax() {
      * @throws OutOfMemoryError: if the system runs out of memory.
      */
     @JniImpl
+    @TruffleBoundary
     public @Handle(Field.class) long GetFieldID(@JavaType(Class.class) StaticObject clazz, @Pointer TruffleObject namePtr, @Pointer TruffleObject typePtr) {
         String name = NativeUtils.interopPointerToString(namePtr);
         String type = NativeUtils.interopPointerToString(typePtr);
@@ -485,6 +486,7 @@ public long sizeMax() {
      * @throws OutOfMemoryError if the system runs out of memory.
      */
     @JniImpl
+    @TruffleBoundary
     public @Handle(Field.class) long GetStaticFieldID(@JavaType(Class.class) StaticObject clazz, @Pointer TruffleObject namePtr, @Pointer TruffleObject typePtr) {
         String name = NativeUtils.interopPointerToString(namePtr);
         String type = NativeUtils.interopPointerToString(typePtr);
@@ -529,6 +531,7 @@ public long sizeMax() {
      * @throws OutOfMemoryError if the system runs out of memory.
      */
     @JniImpl
+    @TruffleBoundary
     public @Handle(Method.class) long GetMethodID(@JavaType(Class.class) StaticObject clazz, @Pointer TruffleObject namePtr, @Pointer TruffleObject signaturePtr) {
         String name = NativeUtils.interopPointerToString(namePtr);
         String signature = NativeUtils.interopPointerToString(signaturePtr);
@@ -569,6 +572,7 @@ public long sizeMax() {
      * @throws OutOfMemoryError if the system runs out of memory.
      */
     @JniImpl
+    @TruffleBoundary
     public @Handle(Method.class) long GetStaticMethodID(@JavaType(Class.class) StaticObject clazz, @Pointer TruffleObject namePtr, @Pointer TruffleObject signaturePtr) {
         String name = NativeUtils.interopPointerToString(namePtr);
         String signature = NativeUtils.interopPointerToString(signaturePtr);

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java

@@ -116,4 +116,9 @@ static boolean isLastRecord(HostFrameRecord records) {
             return records == null;
         }
     }
+
+    @Override
+    public String toString() {
+        return super.toString() + "-Cont@" + bci;
+    }
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/ContinuableMethodWithBytecode.java

@@ -58,7 +58,8 @@ private EspressoFrame() {
     private static final int VALUES_START = 1;
 
     public static FrameDescriptor createFrameDescriptor(int locals, int stack) {
-        int slotCount = locals + stack;
+        // at least one stack slot for the return / exception value
+        int slotCount = locals + Math.max(stack, 1);
         FrameDescriptor.Builder builder = FrameDescriptor.newBuilder(slotCount + VALUES_START);
         int bciSlot = builder.addSlot(FrameSlotKind.Static, null, null); // BCI
         assert bciSlot == BCI_SLOT;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/EspressoFrame.java

@@ -54,4 +54,7 @@ public abstract class EspressoInstrumentableRootNode extends EspressoInstrumenta
     public WrapperNode createWrapper(ProbeNode probeNode) {
         return new EspressoInstrumentableRootNodeWrapper(this, probeNode);
     }
+
+    @Override
+    public abstract String toString();
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/EspressoInstrumentableRootNode.java

@@ -96,4 +96,9 @@ public boolean hasTag(Class<? extends Tag> tag) {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return methodVersion.getDeclaringKlass().getType() + "." + methodVersion.getName() + methodVersion.getRawSignature();
+    }
 }