Improve isMember* node.

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/GetPrototypeNode.java

@@ -43,6 +43,7 @@
 import java.util.Set;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Tag;
@@ -60,6 +61,7 @@
 import com.oracle.truffle.js.runtime.objects.Null;
 import com.oracle.truffle.js.runtime.util.JSClassProfile;
 
+@GenerateUncached
 public abstract class GetPrototypeNode extends JavaScriptBaseNode {
     static final int MAX_SHAPE_COUNT = 2;
 
@@ -101,26 +103,26 @@ static Property getPrototypeProperty(Shape shape) {
     }
 
     @Specialization(guards = {"obj.getShape() == shape", "prototypeProperty != null"}, limit = "MAX_SHAPE_COUNT")
-    public DynamicObject doCachedShape(DynamicObject obj,
+    static DynamicObject doCachedShape(DynamicObject obj,
                     @Cached("obj.getShape()") Shape shape,
                     @Cached("getPrototypeProperty(shape)") Property prototypeProperty) {
         assert !JSGuards.isJSProxy(obj);
         return (DynamicObject) prototypeProperty.get(obj, shape);
     }
 
     @Specialization(guards = "!isJSProxy(obj)", replaces = "doCachedShape")
-    public DynamicObject doGeneric(DynamicObject obj) {
+    static DynamicObject doGeneric(DynamicObject obj) {
         return JSObjectUtil.getPrototype(obj);
     }
 
     @Specialization(guards = "isJSProxy(obj)")
-    public DynamicObject doProxy(DynamicObject obj,
+    static DynamicObject doProxy(DynamicObject obj,
                     @Cached("create()") JSClassProfile jsclassProfile) {
         return JSObject.getPrototype(obj, jsclassProfile);
     }
 
     @Specialization(guards = "!isDynamicObject(obj)")
-    public DynamicObject doNotObject(@SuppressWarnings("unused") Object obj) {
+    static DynamicObject doNotObject(@SuppressWarnings("unused") Object obj) {
         return Null.instance;
     }
 }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/IsExtensibleNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -42,6 +42,7 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+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.object.DynamicObject;
@@ -55,6 +56,7 @@
 /**
  * Implements abstract operation IsExtensible.
  */
+@GenerateUncached
 @ImportStatic({JSShape.class})
 public abstract class IsExtensibleNode extends JavaScriptBaseNode {
 

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

@@ -40,11 +40,14 @@
  */
 package com.oracle.truffle.js.nodes.interop;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.js.nodes.JavaScriptBaseNode;
-import com.oracle.truffle.js.runtime.JSRuntime;
+import com.oracle.truffle.js.nodes.access.GetPrototypeNode;
+import com.oracle.truffle.js.nodes.access.IsExtensibleNode;
+import com.oracle.truffle.js.nodes.unary.IsCallableNode;
 import com.oracle.truffle.js.runtime.builtins.JSProxy;
 import com.oracle.truffle.js.runtime.objects.JSObject;
 import com.oracle.truffle.js.runtime.objects.Null;
@@ -71,10 +74,13 @@ public abstract class KeyInfoNode extends JavaScriptBaseNode {
     public abstract boolean execute(DynamicObject receiver, String key, int query);
 
     @Specialization
-    static boolean member(DynamicObject target, String key, int query) {
+    static boolean member(DynamicObject target, String key, int query,
+                    @Cached GetPrototypeNode getPrototype,
+                    @Cached IsCallableNode isCallable,
+                    @Cached IsExtensibleNode isExtensible) {
         PropertyDescriptor desc = null;
         boolean isProxy = false;
-        for (DynamicObject proto = target; proto != Null.instance; proto = JSObject.getPrototype(proto)) {
+        for (DynamicObject proto = target; proto != Null.instance; proto = getPrototype.executeJSObject(proto)) {
             desc = JSObject.getOwnProperty(proto, key);
             if (JSProxy.isJSProxy(proto)) {
                 isProxy = true;
@@ -85,7 +91,7 @@ static boolean member(DynamicObject target, String key, int query) {
             }
         }
         if (desc == null) {
-            if ((query & INSERTABLE) != 0 && JSObject.isExtensible(target)) {
+            if ((query & INSERTABLE) != 0 && isExtensible.executeBoolean(target)) {
                 return true;
             }
             return false;
@@ -109,7 +115,7 @@ static boolean member(DynamicObject target, String key, int query) {
         if ((query & WRITE_SIDE_EFFECTS) != 0 && writeSideEffects) {
             return true;
         }
-        if ((query & INVOCABLE) != 0 && desc.isDataDescriptor() && JSRuntime.isCallable(desc.getValue())) {
+        if ((query & INVOCABLE) != 0 && desc.isDataDescriptor() && isCallable.executeBoolean(desc.getValue())) {
             return true;
         }
         if ((query & REMOVABLE) != 0 && desc.getConfigurable()) {