simplify usages of PythonObject.getAttribute

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

@@ -86,7 +86,6 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
@@ -332,7 +331,8 @@ public int run(@SuppressWarnings("unused") Object noName) {
     public abstract static class CreateBuiltin extends PythonBuiltinNode {
         @SuppressWarnings("unused")
         @Specialization
-        public Object run(VirtualFrame frame, PythonObject moduleSpec) {
+        @TruffleBoundary
+        public Object run(PythonObject moduleSpec) {
             Object origin = moduleSpec.getAttribute("origin");
             Object name = moduleSpec.getAttribute("name");
             if ("built-in".equals(origin)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonModule.java

@@ -52,15 +52,6 @@ public String getModuleName() {
         return name;
     }
 
-    @Override
-    public PythonObject getValidStorageFullLookup(String attributeId) {
-        if (isOwnAttribute(attributeId)) {
-            return this;
-        } else {
-            return null;
-        }
-    }
-
     @Override
     public String toString() {
         return "<module '" + this.getAttribute(__NAME__) + "'>";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -25,14 +25,11 @@
  */
 package com.oracle.graal.python.builtins.objects.object;
 
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
@@ -97,27 +94,9 @@ public final Location getOwnValidLocation(String attributeId) {
         }
     }
 
-    public PythonObject getValidStorageFullLookup(String attributeId) {
-        PythonObject s = null;
-        if (isOwnAttribute(attributeId)) {
-            s = this;
-        } else if (pythonClass != null) {
-            s = pythonClass.getValidStorageFullLookup(attributeId);
-        }
-        return s;
-    }
-
     @TruffleBoundary
-    public Object getAttribute(String name) {
-        // Find the storage location
-        Location storageLocation = getOwnValidLocation(name);
-
-        // Continue the look up in PythonType.
-        if (storageLocation == null) {
-            return pythonClass == null ? PNone.NO_VALUE : pythonClass.getAttribute(name);
-        }
-
-        return storageLocation.get(getStorage());
+    public final Object getAttribute(String name) {
+        return getStorage().get(name, PNone.NO_VALUE);
     }
 
     @TruffleBoundary
@@ -126,16 +105,6 @@ public void setAttribute(Object name, Object value) {
         getStorage().define(name, value);
     }
 
-    @TruffleBoundary
-    public void deleteAttribute(String name) {
-        // Find the storage location
-        if (!getStorage().containsKey(name)) {
-            throw PythonLanguage.getCore().raise(AttributeError, "%s object has no attribute %s", this, name);
-        } else {
-            getStorage().delete(name);
-        }
-    }
-
     @TruffleBoundary
     public List<String> getAttributeNames() {
         ArrayList<String> keyList = new ArrayList<>();
@@ -194,7 +163,7 @@ public int compareTo(Object o) {
      */
     @Override
     public String toString() {
-        return "<" + pythonClass.getName() + " object at 0x" + Integer.toHexString(hashCode()) + ">";
+        return "<" + getPythonClass().getName() + " object at 0x" + Integer.toHexString(hashCode()) + ">";
     }
 
     /**

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

@@ -40,7 +40,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
-import com.oracle.graal.python.builtins.objects.function.PythonCallable;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -258,30 +257,6 @@ PythonClass[] mergeMROs(MROMergeState[] toMerge, List<PythonClass> mro) {
         return mro.toArray(new PythonClass[mro.size()]);
     }
 
-    @Override
-    public PythonObject getValidStorageFullLookup(String attributeId) {
-        PythonObject store = null;
-
-        if (isOwnAttribute(attributeId)) {
-            store = this;
-        } else if (getBaseClasses().length > 0) {
-            store = getBaseClasses()[0].getValidStorageFullLookup(attributeId);
-        }
-
-        return store;
-    }
-
-    public PythonCallable lookUpMethod(String methodName) {
-        Object attr = getAttribute(methodName);
-        assert attr != null;
-
-        if (attr instanceof PythonCallable) {
-            return (PythonCallable) attr;
-        }
-
-        return null;
-    }
-
     public void addMethod(PFunction method) {
         setAttribute(method.getName(), method);
     }
@@ -295,24 +270,6 @@ public void setAttribute(Object key, Object value) {
         super.setAttribute(key, value);
     }
 
-    @Override
-    @TruffleBoundary
-    public void deleteAttribute(String key) {
-        invalidateAttributeInMROFinalAssumptions(key);
-        super.deleteAttribute(key);
-    }
-
-    @Override
-    @TruffleBoundary
-    public Object getAttribute(String name) {
-        for (PythonClass o : methodResolutionOrder) {
-            if (o.getStorage().containsKey(name)) {
-                return o.getStorage().get(name);
-            }
-        }
-        return PNone.NO_VALUE;
-    }
-
     /**
      * This method supports initialization and solves boot-order problems and should not normally be
      * used.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java

@@ -185,4 +185,16 @@ protected static Object lookupSlow(PythonClass klass, Object key, ReadAttributeF
         }
         return PNone.NO_VALUE;
     }
+
+    public static Object lookupSlow(PythonClass klass, String key) {
+        PythonClass[] mro = klass.getMethodResolutionOrder();
+        for (int i = 0; i < mro.length; i++) {
+            PythonClass kls = mro[i];
+            Object value = kls.getAttribute(key);
+            if (value != PNone.NO_VALUE) {
+                return value;
+            }
+        }
+        return PNone.NO_VALUE;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java

@@ -119,7 +119,7 @@ public static LookupAndCallBinaryNode create(String name, String rname, Supplier
     }
 
     protected Object getMethod(Object receiver, String methodName) {
-        return GetClassNode.getItSlowPath(receiver).getAttribute(methodName);
+        return LookupAttributeInMRONode.lookupSlow(GetClassNode.getItSlowPath(receiver), methodName);
     }
 
     protected boolean isReversible() {
@@ -154,7 +154,7 @@ private UnexpectedResultException handleLeftURE(Object left, Object right, Unexp
 
     protected PythonBinaryBuiltinNode getBuiltin(Object receiver) {
         assert receiver instanceof Boolean || receiver instanceof Integer || receiver instanceof Long || receiver instanceof Double || receiver instanceof String;
-        Object attribute = GetClassNode.getItSlowPath(receiver).getAttribute(name);
+        Object attribute = LookupAttributeInMRONode.lookupSlow(GetClassNode.getItSlowPath(receiver), name);
         if (attribute instanceof PBuiltinFunction) {
             PBuiltinFunction builtinFunction = (PBuiltinFunction) attribute;
             if (PythonBinaryBuiltinNode.class.isAssignableFrom(builtinFunction.getBuiltinNodeFactory().getNodeClass())) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
@@ -103,7 +104,7 @@ public static LookupAndCallUnaryNode create(String name, Supplier<NoAttributeHan
 
     protected PythonUnaryBuiltinNode getBuiltin(Object receiver) {
         assert receiver instanceof Boolean || receiver instanceof Integer || receiver instanceof Long || receiver instanceof Double || receiver instanceof String || receiver instanceof PNone;
-        Object attribute = GetClassNode.getItSlowPath(receiver).getAttribute(name);
+        Object attribute = LookupAttributeInMRONode.lookupSlow(GetClassNode.getItSlowPath(receiver), name);
         if (attribute instanceof PBuiltinFunction) {
             PBuiltinFunction builtinFunction = (PBuiltinFunction) attribute;
             if (PythonUnaryBuiltinNode.class.isAssignableFrom(builtinFunction.getBuiltinNodeFactory().getNodeClass())) {