[GR-60163] [GR-60166] Minor fixes to (Invoke)Dynamic constant pool entries.

PullRequest: graal/19459

Author: gilles-duboscq

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

@@ -33,7 +33,9 @@ public interface BootstrapMethodConstant extends PoolConstant {
 
     int getBootstrapMethodAttrIndex();
 
-    Symbol<Name> getName(ConstantPool pool);
+    default Symbol<Name> getName(ConstantPool pool) {
+        return getNameAndType(pool).getName(pool);
+    }
 
     NameAndTypeConstant getNameAndType(ConstantPool pool);
 

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

@@ -24,14 +24,14 @@
 
 import java.nio.ByteBuffer;
 
-import com.oracle.truffle.espresso.classfile.descriptors.ValidationException;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
 import com.oracle.truffle.espresso.classfile.ConstantPool.Tag;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
 import com.oracle.truffle.espresso.classfile.descriptors.Types;
+import com.oracle.truffle.espresso.classfile.descriptors.ValidationException;
 
-public interface DynamicConstant extends PoolConstant {
+public interface DynamicConstant extends BootstrapMethodConstant {
 
     static DynamicConstant create(int bootstrapMethodAttrIndex, int nameAndTypeIndex) {
         return new Indexes(bootstrapMethodAttrIndex, nameAndTypeIndex);

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/Resolution.java

@@ -31,6 +31,7 @@
 import com.oracle.truffle.espresso.EspressoLanguage;
 import com.oracle.truffle.espresso.EspressoOptions;
 import com.oracle.truffle.espresso.classfile.ConstantPool.Tag;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.classfile.attributes.BootstrapMethodsAttribute;
 import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.ClassMethodRefConstant;
@@ -540,17 +541,18 @@ public static Resolvable.ResolvedConstant resolveInvokeDynamicConstant(InvokeDyn
     }
 
     private static ResolvedDynamicConstant makeResolved(Klass type, StaticObject result) {
-        switch (type.getJavaKind()) {
+        JavaKind kind = type.getJavaKind();
+        switch (kind) {
             case Boolean:
             case Byte:
             case Short:
             case Char: {
-                int value = (int) MHLinkToNode.rebasic(type.getMeta().unboxGuest(result), type.getJavaKind());
-                return new ResolvedIntDynamicConstant(value);
+                int value = (int) MHLinkToNode.rebasic(type.getMeta().unboxGuest(result), kind);
+                return new ResolvedIntDynamicConstant(value, kind);
             }
             case Int: {
                 int value = type.getMeta().unboxInteger(result);
-                return new ResolvedIntDynamicConstant(value);
+                return new ResolvedIntDynamicConstant(value, JavaKind.Int);
             }
             case Float: {
                 float value = type.getMeta().unboxFloat(result);

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedDoubleDynamicConstant.java

@@ -24,6 +24,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.nodes.EspressoFrame;
 
@@ -44,6 +45,11 @@ public Object value() {
         return resolved;
     }
 
+    @Override
+    public JavaKind getKind() {
+        return JavaKind.Double;
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + resolved + ")";

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedDynamicConstant.java

@@ -24,13 +24,15 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
+import com.oracle.truffle.espresso.classfile.constantpool.DynamicConstant;
+import com.oracle.truffle.espresso.classfile.constantpool.NameAndTypeConstant;
+import com.oracle.truffle.espresso.classfile.constantpool.Resolvable;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
+import com.oracle.truffle.espresso.meta.EspressoError;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
-import com.oracle.truffle.espresso.meta.EspressoError;
-import com.oracle.truffle.espresso.classfile.constantpool.DynamicConstant;
-import com.oracle.truffle.espresso.classfile.constantpool.Resolvable;
 import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
 
 public interface ResolvedDynamicConstant extends DynamicConstant, Resolvable.ResolvedConstant {
@@ -41,6 +43,18 @@ default Symbol<Type> getTypeSymbol(ConstantPool pool) {
         throw EspressoError.shouldNotReachHere("Getting type symbol of a resolved dynamic constant");
     }
 
+    @Override
+    default int getBootstrapMethodAttrIndex() {
+        throw EspressoError.shouldNotReachHere("Getting bootstrap method index of a resolved dynamic constant");
+    }
+
+    @Override
+    default NameAndTypeConstant getNameAndType(ConstantPool pool) {
+        throw EspressoError.shouldNotReachHere("Getting name and type of a resolved dynamic constant");
+    }
+
+    JavaKind getKind();
+
     default StaticObject guestBoxedValue(Meta meta) {
         Object value = value();
         if (value instanceof StaticObject) {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedFailDynamicConstant.java

@@ -25,6 +25,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.meta.EspressoError;
 import com.oracle.truffle.espresso.runtime.EspressoException;
@@ -53,6 +54,11 @@ public Object value() {
         throw EspressoError.shouldNotReachHere("Failure should have arose earlier.");
     }
 
+    @Override
+    public JavaKind getKind() {
+        return JavaKind.Illegal;
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + failure + ")";

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedFloatDynamicConstant.java

@@ -24,6 +24,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.nodes.EspressoFrame;
 
@@ -44,6 +45,11 @@ public Object value() {
         return resolved;
     }
 
+    @Override
+    public JavaKind getKind() {
+        return JavaKind.Float;
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + resolved + ")";

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedIntDynamicConstant.java

@@ -24,14 +24,20 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
+import com.oracle.truffle.espresso.meta.EspressoError;
+import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.nodes.EspressoFrame;
+import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
 
 public final class ResolvedIntDynamicConstant implements ResolvedDynamicConstant {
     final int resolved;
+    final JavaKind kind;
 
-    public ResolvedIntDynamicConstant(int resolved) {
+    public ResolvedIntDynamicConstant(int resolved, JavaKind kind) {
         this.resolved = resolved;
+        this.kind = kind;
     }
 
     @Override
@@ -44,6 +50,25 @@ public Object value() {
         return resolved;
     }
 
+    @Override
+    public JavaKind getKind() {
+        return kind;
+    }
+
+    @Override
+    public StaticObject guestBoxedValue(Meta meta) {
+        Object value = switch (kind) {
+            case Boolean -> resolved != 0;
+            case Byte -> (byte) resolved;
+            case Short -> (short) resolved;
+            case Char -> (char) resolved;
+            case Int -> resolved;
+            default ->
+                throw EspressoError.shouldNotReachHere(kind.toString());
+        };
+        return Meta.box(meta, value);
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + resolved + ")";

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedLongDynamicConstant.java

@@ -24,6 +24,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.nodes.EspressoFrame;
 
@@ -44,6 +45,11 @@ public Object value() {
         return resolved;
     }
 
+    @Override
+    public JavaKind getKind() {
+        return JavaKind.Long;
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + resolved + ")";

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedMethodHandleConstant.java

@@ -24,13 +24,15 @@
 
 import com.oracle.truffle.espresso.classfile.ConstantPool;
 import com.oracle.truffle.espresso.classfile.ConstantPool.Tag;
+import com.oracle.truffle.espresso.classfile.constantpool.MethodHandleConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.Resolvable;
+import com.oracle.truffle.espresso.meta.EspressoError;
 import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
 import com.oracle.truffle.espresso.substitutions.JavaType;
 
 import java.lang.invoke.MethodHandle;
 
-public final class ResolvedMethodHandleConstant implements Resolvable.ResolvedConstant {
+public final class ResolvedMethodHandleConstant implements MethodHandleConstant, Resolvable.ResolvedConstant {
     private final @JavaType(MethodHandle.class) StaticObject payload;
 
     ResolvedMethodHandleConstant(StaticObject payload) {
@@ -46,6 +48,16 @@ public Tag tag() {
         return Tag.METHODHANDLE;
     }
 
+    @Override
+    public int getRefKind() {
+        throw EspressoError.shouldNotReachHere("Getting ref kind of a resolved method handle constant");
+    }
+
+    @Override
+    public char getRefIndex() {
+        throw EspressoError.shouldNotReachHere("Getting ref index of a resolved method handle constant");
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return payload.toString();

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/ResolvedObjectDynamicConstant.java

@@ -24,6 +24,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.JavaKind;
 import com.oracle.truffle.espresso.nodes.BytecodeNode;
 import com.oracle.truffle.espresso.nodes.EspressoFrame;
 import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
@@ -45,6 +46,11 @@ public Object value() {
         return resolved;
     }
 
+    @Override
+    public JavaKind getKind() {
+        return JavaKind.Object;
+    }
+
     @Override
     public String toString(ConstantPool pool) {
         return "ResolvedDynamicConstant(" + resolved + ")";