Simplify AbstractObjectGetBasesNode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -837,7 +837,7 @@ boolean isInstance(VirtualFrame frame, Object cls, Object instance,
                         @Cached AbstractObjectIsSubclassNode abstractIsSubclassNode,
                         @Cached AbstractObjectGetBasesNode getBasesNode,
                         @Cached PRaiseNode raiseNode) {
-            if (typeErrorProfile.profile(inliningTarget, getBasesNode.execute(frame, cls) == null)) {
+            if (typeErrorProfile.profile(inliningTarget, getBasesNode.execute(frame, inliningTarget, cls) == null)) {
                 throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.ISINSTANCE_ARG_2_MUST_BE_TYPE_OR_TUPLE_OF_TYPE, instance);
             }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.java

@@ -41,72 +41,32 @@
 package com.oracle.graal.python.nodes.classes;
 
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___BASES__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETATTRIBUTE__;
 
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
-import com.oracle.graal.python.lib.PyObjectGetAttr;
+import com.oracle.graal.python.lib.PyObjectLookupAttr;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
-import com.oracle.graal.python.runtime.exception.PException;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.ImportStatic;
-import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 
+@GenerateInline
+@GenerateCached(false)
 @GenerateUncached
-@ImportStatic({SpecialMethodNames.class})
-@SuppressWarnings("truffle-inlining")       // footprint reduction 44 -> 26
 public abstract class AbstractObjectGetBasesNode extends PNodeWithContext {
-    @NeverDefault
-    public static AbstractObjectGetBasesNode create() {
-        return AbstractObjectGetBasesNodeGen.create();
-    }
-
-    protected abstract PTuple executeInternal(Frame frame, Object cls);
-
-    public final PTuple execute(VirtualFrame frame, Object cls) {
-        return executeInternal(frame, cls);
-    }
 
-    @Specialization(guards = "!isUncachedNode()")
-    static PTuple getBasesCached(VirtualFrame frame, Object cls,
-                    @Bind("this") Node inliningTarget,
-                    @Cached PyObjectGetAttr getAttributeNode,
-                    @Exclusive @Cached IsBuiltinObjectProfile exceptionMaskProfile) {
-        try {
-            Object bases = getAttributeNode.execute(frame, inliningTarget, cls, T___BASES__);
-            if (bases instanceof PTuple) {
-                return (PTuple) bases;
-            }
-        } catch (PException pe) {
-            pe.expectAttributeError(inliningTarget, exceptionMaskProfile);
-        }
-        return null;
-    }
+    public abstract PTuple execute(Frame frame, Node inliningTarget, Object cls);
 
-    @Specialization(replaces = "getBasesCached")
-    static PTuple getBasesUncached(VirtualFrame frame, Object cls,
-                    @Bind("this") Node inliningTarget,
-                    @Cached LookupInheritedAttributeNode.Dynamic lookupGetattributeNode,
-                    @Cached CallNode callGetattributeNode,
-                    @Exclusive @Cached IsBuiltinObjectProfile exceptionMaskProfile) {
-        Object getattr = lookupGetattributeNode.execute(inliningTarget, cls, T___GETATTRIBUTE__);
-        try {
-            Object bases = callGetattributeNode.execute(frame, getattr, cls, T___BASES__);
-            if (bases instanceof PTuple) {
-                return (PTuple) bases;
-            }
-        } catch (PException pe) {
-            pe.expectAttributeError(inliningTarget, exceptionMaskProfile);
+    @Specialization
+    static PTuple getBasesCached(VirtualFrame frame, Node inliningTarget, Object cls,
+                    @Cached PyObjectLookupAttr lookupAttr) {
+        Object bases = lookupAttr.execute(frame, inliningTarget, cls, T___BASES__);
+        if (bases instanceof PTuple) {
+            return (PTuple) bases;
         }
         return null;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectIsSubclassNode.java

@@ -106,7 +106,7 @@ static boolean doSubclass(VirtualFrame frame, @SuppressWarnings("unused") Object
                     @Cached AbstractObjectIsSubclassNode isSubclassNode,
                     @Shared @Cached GetObjectArrayNode getObjectArrayNode) {
         CompilerAsserts.partialEvaluationConstant(depth);
-        PTuple bases = getBasesNode.execute(frame, cachedDerived);
+        PTuple bases = getBasesNode.execute(frame, inliningTarget, cachedDerived);
         if (bases == null || isEmpty(bases)) {
             return false;
         }
@@ -158,7 +158,7 @@ static boolean doGeneric(VirtualFrame frame, Object derived, Object cls, int dep
             return true;
         }
 
-        PTuple bases = getBasesNode.execute(frame, derived);
+        PTuple bases = getBasesNode.execute(frame, inliningTarget, derived);
         if (bases == null || isEmpty(bases)) {
             return false;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java

@@ -336,11 +336,11 @@ static boolean fallback(VirtualFrame frame, Object derived, Object cls,
                     @Exclusive @Cached InlinedConditionProfile exceptionDerivedProfile,
                     @Exclusive @Cached InlinedConditionProfile exceptionClsProfile,
                     @Cached PRaiseNode raise) {
-        if (exceptionDerivedProfile.profile(inliningTarget, getBasesNode.execute(frame, derived) == null)) {
+        if (exceptionDerivedProfile.profile(inliningTarget, getBasesNode.execute(frame, inliningTarget, derived) == null)) {
             throw raise.raise(inliningTarget, PythonErrorType.TypeError, ErrorMessages.ARG_D_MUST_BE_S, "issubclass()", 1, "class");
         }
 
-        if (exceptionClsProfile.profile(inliningTarget, getBasesNode.execute(frame, cls) == null)) {
+        if (exceptionClsProfile.profile(inliningTarget, getBasesNode.execute(frame, inliningTarget, cls) == null)) {
             throw raise.raise(inliningTarget, PythonErrorType.TypeError, ErrorMessages.ISSUBCLASS_MUST_BE_CLASS_OR_TUPLE);
         }