Fix flags when instantiating polymorphic signature methods

In particular the resulting method shouldn't have the VARARGS flag.

Author: gilles-duboscq

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

@@ -29,10 +29,13 @@
 import static com.oracle.truffle.espresso.bytecode.Bytecodes.PUTSTATIC;
 import static com.oracle.truffle.espresso.bytecode.Bytecodes.RETURN;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_CALLER_SENSITIVE;
+import static com.oracle.truffle.espresso.classfile.Constants.ACC_FINAL;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_FORCE_INLINE;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_NATIVE;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_SCOPED;
+import static com.oracle.truffle.espresso.classfile.Constants.ACC_STATIC;
+import static com.oracle.truffle.espresso.classfile.Constants.ACC_SYNTHETIC;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_VARARGS;
 import static com.oracle.truffle.espresso.classfile.Constants.REF_invokeInterface;
 import static com.oracle.truffle.espresso.classfile.Constants.REF_invokeSpecial;
@@ -128,9 +131,8 @@ public final class Method extends Member<Signature> implements TruffleObject, Co
     private final Method proxy;
     private String genericSignature;
 
-    // always null unless the raw signature exposed for this method should be
-    // different from the one in the linkedKlass
     private final Symbol<Signature> rawSignature;
+    private final int rawFlags;
 
     // the parts of the method that can change when it's redefined
     // are encapsulated within the methodVersion
@@ -148,6 +150,7 @@ public final class Method extends Member<Signature> implements TruffleObject, Co
 
     private Method(Method method, CodeAttribute split) {
         this.rawSignature = method.rawSignature;
+        this.rawFlags = method.rawFlags;
         this.declaringKlass = method.declaringKlass;
         this.methodVersion = new MethodVersion(method.getMethodVersion().klassVersion, method.getRuntimeConstantPool(), method.getLinkedMethod(),
                         method.getMethodVersion().poisonPill, split);
@@ -166,12 +169,13 @@ private Method(Method method, CodeAttribute split) {
     }
 
     Method(ObjectKlass.KlassVersion klassVersion, LinkedMethod linkedMethod, RuntimeConstantPool pool) {
-        this(klassVersion, linkedMethod, linkedMethod.getRawSignature(), pool);
+        this(klassVersion, linkedMethod, linkedMethod.getRawSignature(), pool, linkedMethod.getFlags());
     }
 
-    Method(ObjectKlass.KlassVersion klassVersion, LinkedMethod linkedMethod, Symbol<Signature> rawSignature, RuntimeConstantPool pool) {
+    Method(ObjectKlass.KlassVersion klassVersion, LinkedMethod linkedMethod, Symbol<Signature> rawSignature, RuntimeConstantPool pool, int rawFlags) {
         this.declaringKlass = klassVersion.getKlass();
         this.rawSignature = rawSignature;
+        this.rawFlags = rawFlags;
         this.methodVersion = new MethodVersion(klassVersion, pool, linkedMethod, false, (CodeAttribute) linkedMethod.getAttribute(CodeAttribute.NAME));
 
         try {
@@ -522,7 +526,7 @@ public boolean isClassInitializer() {
 
     @Override
     public int getModifiers() {
-        return getMethodVersion().getModifiers();
+        return rawFlags;
     }
 
     public boolean isCallerSensitive() {
@@ -813,7 +817,18 @@ public int getCatchLocation(int bci, StaticObject ex) {
     // Spawns a placeholder method for MH intrinsics
     public Method createIntrinsic(Symbol<Signature> polymorphicRawSignature) {
         assert isPolySignatureIntrinsic();
-        return new Method(declaringKlass.getKlassVersion(), getLinkedMethod(), polymorphicRawSignature, getRuntimeConstantPool());
+        int flags;
+        MethodHandleIntrinsics.PolySigIntrinsics iid = MethodHandleIntrinsics.getId(this);
+        if (iid == MethodHandleIntrinsics.PolySigIntrinsics.InvokeGeneric) {
+            flags = getModifiers() & ~ACC_VARARGS;
+        } else {
+            flags = ACC_NATIVE | ACC_SYNTHETIC | ACC_FINAL;
+            if (iid.isStaticPolymorphicSignature()) {
+                flags |= ACC_STATIC;
+            }
+        }
+        assert Modifier.isNative(flags);
+        return new Method(declaringKlass.getKlassVersion(), getLinkedMethod(), polymorphicRawSignature, getRuntimeConstantPool(), flags);
     }
 
     public MethodHandleIntrinsicNode spawnIntrinsicNode(EspressoLanguage language, Meta meta, ObjectKlass accessingKlass, Symbol<Name> mname, Symbol<Signature> signature) {
@@ -1547,7 +1562,7 @@ public String getGenericSignatureAsString() {
 
         @Override
         public int getModifiers() {
-            return linkedMethod.getFlags();
+            return getMethod().getModifiers();
         }
 
         @Override