minor improvements and fixes

Author: lukasstadler

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

@@ -755,10 +755,13 @@ private Object getId(PythonObject obj) {
             if (readId == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 readId = insert(ReadAttributeFromObjectNode.create());
-                writeId = insert(WriteAttributeToObjectNode.create());
             }
             Object id = readId.execute(obj, ID_KEY);
             if (id == NO_VALUE) {
+                if (writeId == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    writeId = insert(WriteAttributeToObjectNode.create());
+                }
                 id = getContext().getNextGlobalId();
                 writeId.execute(obj, ID_KEY, id);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -62,6 +62,8 @@
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -255,7 +257,7 @@ private HashingStorageNodes.GetItemNode getGetItemNode() {
 
     @Builtin(name = __GETITEM__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
-    public abstract static class GetItemNode extends PythonBuiltinNode {
+    public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object getItem(PDict self, Object key,
                         @Cached("create()") HashingStorageNodes.GetItemNode getItemNode,
@@ -297,7 +299,7 @@ Object run(Object self, Object key,
 
     @Builtin(name = __SETITEM__, fixedNumOfArguments = 3)
     @GenerateNodeFactory
-    public abstract static class SetItemNode extends PythonBuiltinNode {
+    public abstract static class SetItemNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object run(PDict self, Object key, Object value,
                         @Cached("create()") HashingStorageNodes.SetItemNode setItemNode) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java

@@ -47,6 +47,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
@@ -144,7 +145,7 @@ private HashingStorageNodes.GetItemNode getGetItemNode() {
 
     @Builtin(name = __GETITEM__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
-    public abstract static class GetItemNode extends PythonBuiltinNode {
+    public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object getItem(PMappingproxy self, Object key,
                         @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
@@ -158,7 +159,7 @@ Object getItem(PMappingproxy self, Object key,
 
     @Builtin(name = __SETITEM__, fixedNumOfArguments = 3)
     @GenerateNodeFactory
-    public abstract static class SetItemNode extends PythonBuiltinNode {
+    public abstract static class SetItemNode extends PythonTernaryBuiltinNode {
         @Specialization
         @SuppressWarnings("unused")
         Object run(PMappingproxy self, Object key, Object value) {

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

@@ -57,7 +57,6 @@
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.function.PythonCallable;
-import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
@@ -87,7 +86,6 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-import com.oracle.truffle.api.profiles.ValueProfile;
 
 @CoreFunctions(extendClasses = PythonObject.class)
 public class ObjectBuiltins extends PythonBuiltins {
@@ -224,16 +222,15 @@ private LookupAndCallBinaryNode getCallEqNode() {
 
     @Builtin(name = __GETATTRIBUTE__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
-    public abstract static class GetattributeNode extends PythonBinaryBuiltinNode {
+    public abstract static class GetAttributeNode extends PythonBinaryBuiltinNode {
         private final BranchProfile hasDescProfile = BranchProfile.create();
         private final BranchProfile isDescProfile = BranchProfile.create();
         private final BranchProfile hasValueProfile = BranchProfile.create();
         private final BranchProfile errorProfile = BranchProfile.create();
         private final ConditionProfile typeIsObjectProfile = ConditionProfile.createBinaryProfile();
 
         @Child private LookupAttributeInMRONode.Dynamic lookup = LookupAttributeInMRONode.Dynamic.create();
-        private final ValueProfile typeProfile = ValueProfile.createIdentityProfile();
-        @Child private GetClassNode getObjectClassNode;
+        @Child private GetClassNode getObjectClassNode = GetClassNode.create();
         @Child private GetClassNode getDataClassNode;
         @Child private LookupAttributeInMRONode lookupGetNode;
         @Child private LookupAttributeInMRONode lookupSetNode;
@@ -244,7 +241,7 @@ public abstract static class GetattributeNode extends PythonBinaryBuiltinNode {
 
         @Specialization
         protected Object doIt(Object object, Object key) {
-            PythonClass type = getObjectClass(object);
+            PythonClass type = getObjectClassNode.execute(object);
             Object descr = lookup.execute(type, key);
             PythonClass dataDescClass = null;
             if (descr != PNone.NO_VALUE) {
@@ -338,14 +335,6 @@ private Object lookupSet(PythonClass dataDescClass) {
             return lookupSetNode.execute(dataDescClass);
         }
 
-        private PythonClass getObjectClass(Object object) {
-            if (getObjectClassNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getObjectClassNode = insert(GetClassNode.create());
-            }
-            return typeProfile.profile(getObjectClassNode.execute(object));
-        }
-
         private PythonClass getDataClass(Object descr) {
             if (getDataClassNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();