KeyInfoNode must look up property using TruffleString.

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/interop/KeyInfoNode.java

@@ -43,6 +43,7 @@
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
@@ -68,6 +69,7 @@
 /**
  * This node implements the {@code isMember*} messages.
  */
+@ImportStatic(Strings.class)
 @GenerateUncached
 public abstract class KeyInfoNode extends JavaScriptBaseNode {
     public static final int READABLE = 1 << 0;
@@ -85,13 +87,13 @@ public abstract class KeyInfoNode extends JavaScriptBaseNode {
     public abstract boolean execute(JSDynamicObject receiver, String key, int query);
 
     @Specialization(guards = {"!isJSProxy(target)", "property != null"}, limit = "2")
-    static boolean cachedOwnProperty(JSDynamicObject target, String key, int query,
+    static boolean cachedOwnProperty(JSDynamicObject target, @SuppressWarnings("unused") String key, int query,
                     @CachedLibrary("target") DynamicObjectLibrary objectLibrary,
-                    @Bind("objectLibrary.getProperty(target, key)") Property property,
+                    @Cached @SuppressWarnings("unused") TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Bind("fromJavaString(fromJavaStringNode, key)") TruffleString tStringKey,
+                    @Bind("objectLibrary.getProperty(target, tStringKey)") Property property,
                     @Cached IsCallableNode isCallable,
-                    @Cached BranchProfile proxyBranch,
-                    @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
-        TruffleString tStringKey = Strings.fromJavaString(fromJavaStringNode, key);
+                    @Cached BranchProfile proxyBranch) {
         if (JSProperty.isAccessor(property)) {
             Accessor accessor = (Accessor) Properties.getOrDefault(objectLibrary, target, tStringKey, null);
             if ((query & READABLE) != 0 && accessor.hasGetter()) {