Add missing interface to resolved Dynamic and MethodHandle constant

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/ResolvedDynamicConstant.java

@@ -24,13 +24,14 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+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 +42,16 @@ 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");
+    }
+
     default StaticObject guestBoxedValue(Meta meta) {
         Object value = value();
         if (value instanceof StaticObject) {

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();