Allow adding both a static and non-static substitution for a method

This is useful when a method changes its static status.

Author: gilles-duboscq

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

@@ -2218,7 +2218,7 @@ public int RegisterNative(@JavaType(Class.class) StaticObject clazz, @Pointer Tr
         }
 
         Symbol<Type> classType = clazz.getMirrorKlass(getMeta()).getType();
-        getSubstitutions().registerRuntimeSubstitution(classType, name, signature, factory, true);
+        getSubstitutions().registerRuntimeSubstitution(classType, name, signature, targetMethod.isStatic(), factory, true);
         return JNI_OK;
     }
 

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/libs/Lib.java

@@ -118,7 +118,7 @@ private static List<MethodKey> getRefs(EspressoContext ctx, JavaSubstitution.Fac
             Symbol<Name> methodName = ctx.getNames().getOrCreate(mName);
             Symbol<Type> holderType = ctx.getTypes().fromClassGetName(holderName);
 
-            refs.add(new MethodKey(holderType, methodName, signature));
+            refs.add(new MethodKey(holderType, methodName, signature, !factory.hasReceiver()));
         }
 
         return refs;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/MethodKey.java

@@ -35,22 +35,24 @@ public final class MethodKey {
     private final Symbol<Type> clazz;
     private final Symbol<Name> methodName;
     private final Symbol<Signature> signature;
+    private final boolean isStatic;
     private final int hash;
 
     public MethodKey(Method m) {
         this(m, m.getRawSignature());
     }
 
     public MethodKey(Method m, Symbol<Signature> signature) {
-        this(m.getDeclaringKlass().getType(), m.getName(), signature);
+        this(m.getDeclaringKlass().getType(), m.getName(), signature, m.isStatic());
     }
 
-    public MethodKey(Symbol<Type> clazz, Symbol<Name> methodName, Symbol<Signature> signature) {
+    public MethodKey(Symbol<Type> clazz, Symbol<Name> methodName, Symbol<Signature> signature, boolean isStatic) {
         assert clazz != null && methodName != null && signature != null;
         this.clazz = clazz;
         this.methodName = methodName;
         this.signature = signature;
-        this.hash = Objects.hash(clazz, methodName, signature);
+        this.isStatic = isStatic;
+        this.hash = Objects.hash(clazz, methodName, signature, isStatic);
     }
 
     @Override
@@ -64,7 +66,8 @@ public boolean equals(Object obj) {
         MethodKey other = (MethodKey) obj;
         return clazz == other.clazz &&
                         methodName == other.methodName &&
-                        signature == other.signature;
+                        signature == other.signature &&
+                        isStatic == other.isStatic;
     }
 
     @Override
@@ -74,7 +77,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return TypeSymbols.binaryName(clazz) + "#" + methodName + signature;
+        return (isStatic ? "static " : "") + TypeSymbols.binaryName(clazz) + "#" + methodName + signature;
     }
 
     public Symbol<Type> getHolderType() {
@@ -88,4 +91,8 @@ public Symbol<Name> getName() {
     public Symbol<Signature> getSignature() {
         return signature;
     }
+
+    public boolean isStatic() {
+        return isStatic;
+    }
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Substitutions.java

@@ -175,15 +175,15 @@ private static void registerStaticSubstitution(JavaSubstitution.Factory substitu
     }
 
     private static void registerStaticSubstitution(Symbol<Type> type, Symbol<Name> methodName, Symbol<Signature> signature, JavaSubstitution.Factory factory, boolean throwIfPresent) {
-        MethodKey key = new MethodKey(type, methodName, signature);
+        MethodKey key = new MethodKey(type, methodName, signature, !factory.hasReceiver());
         if (throwIfPresent && STATIC_SUBSTITUTIONS.containsKey(key)) {
             throw EspressoError.shouldNotReachHere("substitution already registered" + key);
         }
         STATIC_SUBSTITUTIONS.put(key, factory);
     }
 
-    public void registerRuntimeSubstitution(Symbol<Type> type, Symbol<Name> methodName, Symbol<Signature> signature, EspressoRootNodeFactory factory, boolean throwIfPresent) {
-        MethodKey key = new MethodKey(type, methodName, signature);
+    public void registerRuntimeSubstitution(Symbol<Type> type, Symbol<Name> methodName, Symbol<Signature> signature, boolean isStatic, EspressoRootNodeFactory factory, boolean throwIfPresent) {
+        MethodKey key = new MethodKey(type, methodName, signature, isStatic);
 
         if (STATIC_SUBSTITUTIONS.containsKey(key)) {
             getLogger().log(Level.FINE, "Runtime substitution shadowed by static one: " + key);