[GR-11971] set __dict__

PullRequest: graalpython/214

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_object.py

@@ -0,0 +1,130 @@
+# Copyright (c) 2018, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def assert_raises(err, fn, *args, **kwargs):
+    raised = False
+    try:
+        fn(*args, **kwargs)
+    except err:
+        raised = True
+    assert raised
+
+
+def test_set_dict_attr_builtin_extension():
+    class MyList(list):
+        pass
+
+    lst = MyList()
+    assert lst.__dict__ == {}
+    lst.__dict__ = {'a': 9}
+    assert lst.a == 9
+    assert lst.__dict__ == {'a': 9}
+
+
+def test_get_dict_attr():
+    o = object()
+
+    def get_dict_attr():
+        return o.__dict__
+
+    def set_dict_attr():
+        o.__dict__ = {'a': 10}
+
+    assert_raises(AttributeError, get_dict_attr)
+    assert_raises(AttributeError, set_dict_attr)
+
+
+def test_set_dict_attr():
+    class MyClass(object):
+        def __init__(self):
+            self.a = 9
+
+    m = MyClass()
+    assert m.a == 9
+    assert m.__dict__ == {'a': 9}
+    assert m.a == 9
+    m.__dict__ = {'a': 10}
+    assert m.__dict__ == {'a': 10}
+    assert m.a == 10
+    m.d = 20
+    assert m.d == 20
+    assert "d" in m.__dict__
+    assert m.__dict__ == {'a': 10, 'd': 20}
+
+
+def test_set_attr_builtins():
+    lst = list()
+
+    def set_attr():
+        lst.a = 10
+
+    assert_raises(AttributeError, set_attr)
+
+    class MyList(list):
+        pass
+
+    mlst = MyList()
+    mlst.a = 10
+    assert mlst.a == 10
+
+
+def test_set_dict_attr_with_getattr_defined():
+    class MyOtherClass(object):
+        def __getattribute__(self, item):
+            return object.__getattribute__(self, item)
+
+        def __getattr__(self, item):
+            if item == "my_attr":
+                return 10
+            raise AttributeError
+
+    m1 = MyOtherClass()
+
+    def get_non_existing_attr():
+        return m1.my_attr_2
+
+    assert_raises(AttributeError, get_non_existing_attr)
+    assert m1.my_attr == 10
+    assert "my_attr" not in m1.__dict__
+
+    m1.__dict__ = {'d': 10}
+    assert m1.my_attr == 10
+    assert "my_attr" not in m1.__dict__
+    assert m1.d == 10

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeWrappers.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage.PythonObjectDictStorage;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -113,8 +114,12 @@ public DynamicObjectNativeWrapper(Object delegate) {
         }
 
         public PythonObjectDictStorage createNativeMemberStore() {
+            return createNativeMemberStore(null);
+        }
+
+        public PythonObjectDictStorage createNativeMemberStore(Assumption dictStableAssumption) {
             if (nativeMemberStore == null) {
-                nativeMemberStore = new PythonObjectDictStorage(SHAPE.newInstance());
+                nativeMemberStore = new PythonObjectDictStorage(SHAPE.newInstance(), dictStableAssumption);
             }
             return nativeMemberStore;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -680,7 +680,7 @@ Object doTpSubclasses(PythonClass object, @SuppressWarnings("unused") String key
         Object doMdDef(PythonObject object, @SuppressWarnings("unused") String key, Object value) {
             DynamicObjectNativeWrapper nativeWrapper = ((PythonAbstractObject) object).getNativeWrapper();
             assert nativeWrapper != null;
-            getSetItemNode().execute(nativeWrapper.createNativeMemberStore(), NativeMemberNames.MD_DEF, value);
+            getSetItemNode().execute(nativeWrapper.createNativeMemberStore(object.getDictUnsetOrSameAsStorageAssumption()), NativeMemberNames.MD_DEF, value);
             return value;
         }
 
@@ -701,7 +701,7 @@ Object doTpDict(PythonClass object, @SuppressWarnings("unused") String key, Obje
                 if (existing != null) {
                     d.setDictStorage(existing.getDictStorage());
                 } else {
-                    d.setDictStorage(new DynamicObjectStorage.PythonObjectDictStorage(object.getStorage()));
+                    d.setDictStorage(new DynamicObjectStorage.PythonObjectDictStorage(object.getStorage(), object.getDictUnsetOrSameAsStorageAssumption()));
                 }
                 object.setDict(d);
             } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java

@@ -42,6 +42,7 @@
 
 import java.util.ArrayList;
 
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Layout;
@@ -159,8 +160,19 @@ public HashingStorage copy(Equivalence eq) {
     }
 
     public static class PythonObjectDictStorage extends DynamicObjectStorage {
+        private final Assumption dictUnsetOrSameAsStorage;
+
         public PythonObjectDictStorage(DynamicObject store) {
+            this(store, null);
+        }
+
+        public PythonObjectDictStorage(DynamicObject store, Assumption dictUnsetOrSameAsStorage) {
             super(store);
+            this.dictUnsetOrSameAsStorage = dictUnsetOrSameAsStorage;
+        }
+
+        public Assumption getDictUnsetOrSameAsStorage() {
+            return dictUnsetOrSameAsStorage;
         }
 
         @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -90,6 +90,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -240,6 +241,10 @@ protected static DynamicObjectStorage switchToFastDictStorage(HashingStorage sto
         }
 
         protected static PythonObjectHybridDictStorage switchToHybridDictStorage(PythonObjectDictStorage dictStorage) {
+            Assumption dictUnsetOrSameAsStorage = dictStorage.getDictUnsetOrSameAsStorage();
+            if (dictUnsetOrSameAsStorage != null) {
+                dictUnsetOrSameAsStorage.invalidate();
+            }
             return new PythonObjectHybridDictStorage(dictStorage);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java

@@ -158,7 +158,7 @@ Object set(GetSetDescriptor descr, Object obj, Object value) {
                 return callNode.executeObject(descr.getSet(), obj, value);
             } else {
                 branchProfile.enter();
-                throw raise(AttributeError, "attribute '%s' of '%s' objects is not writable", descr.getName(), descr.getType().getName());
+                throw raise(AttributeError, "attribute '%s' of '%s' object is not writable", descr.getName(), descr.getType().getName());
             }
         }
     }

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

@@ -58,6 +58,7 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
+import com.oracle.graal.python.builtins.objects.dict.PDict;
 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;
@@ -80,6 +81,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -402,7 +404,7 @@ private LazyPythonClass getDataClass(Object descr) {
     public abstract static class GetattrNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object getattr(Object object, Object key) {
-            throw raise(AttributeError, "'%p' object has no attribute %s", object, key);
+            throw raise(AttributeError, "'%p' object has no attribute '%s'", object, key);
         }
     }
 
@@ -469,22 +471,28 @@ protected PNone doIt(Object object, Object key,
             if (descr != PNone.NO_VALUE) {
                 throw raise(AttributeError, "attribute % is read-only", key);
             } else {
-                throw raise(AttributeError, "%s object has no attribute %s", object, key);
+                throw raise(AttributeError, "%s object has no attribute '%s'", object, key);
             }
         }
     }
 
-    @Builtin(name = __DICT__, fixedNumOfPositionalArgs = 1, isGetter = true)
+    @Builtin(name = __DICT__, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
     @GenerateNodeFactory
-    static abstract class DictNode extends PythonUnaryBuiltinNode {
-        @Specialization
-        Object dict(@SuppressWarnings("unused") PythonClass self) {
-            CompilerDirectives.transferToInterpreter();
-            throw new AssertionError();
+    static abstract class DictNode extends PythonBinaryBuiltinNode {
+        private final IsBuiltinClassProfile exactObjInstanceProfile = IsBuiltinClassProfile.create();
+        private final IsBuiltinClassProfile exactBuiltinInstanceProfile = IsBuiltinClassProfile.create();
+
+        protected boolean isExactObjectInstance(PythonObject self) {
+            return exactObjInstanceProfile.profileObject(self, PythonBuiltinClassType.PythonObject);
+        }
+
+        protected boolean isBuiltinObjectExact(PythonObject self) {
+            // any builtin class except Modules
+            return exactBuiltinInstanceProfile.profileIsOtherBuiltinObject(self, PythonBuiltinClassType.PythonModule);
         }
 
-        @Specialization(guards = {"!isBuiltinObject(self)", "!isClass(self)"})
-        Object dict(PythonObject self) {
+        @Specialization(guards = {"!isBuiltinObjectExact(self)", "!isClass(self)", "!isExactObjectInstance(self)", "isNoValue(none)"})
+        Object dict(PythonObject self, @SuppressWarnings("unused") PNone none) {
             PHashingCollection dict = self.getDict();
             if (dict == null) {
                 dict = factory().createDictFixedStorage(self);
@@ -493,8 +501,15 @@ Object dict(PythonObject self) {
             return dict;
         }
 
+        @Specialization(guards = {"!isBuiltinObjectExact(self)", "!isClass(self)", "!isExactObjectInstance(self)"})
+        Object dict(PythonObject self, PDict dict) {
+            self.getDictUnsetOrSameAsStorageAssumption().invalidate();
+            self.setDict(dict);
+            return PNone.NONE;
+        }
+
         @Fallback
-        Object dict(Object self) {
+        Object dict(Object self, @SuppressWarnings("unused") Object dict) {
             throw raise(AttributeError, "'%p' object has no attribute '__dict__'", self);
         }
 

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

@@ -39,9 +39,9 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Property;
@@ -50,6 +50,7 @@
 public class PythonObject extends PythonAbstractObject {
     @CompilationFinal private LazyPythonClass pythonClass;
     private final Assumption classStable = Truffle.getRuntime().createAssumption("class unchanged");
+    private final Assumption dictUnsetOrSameAsStorage = Truffle.getRuntime().createAssumption("dict unset or same as instance attributes");
     private final DynamicObject storage;
     private PHashingCollection dict;
 
@@ -103,6 +104,10 @@ public final Assumption getClassStableAssumption() {
         return classStable;
     }
 
+    public final Assumption getDictUnsetOrSameAsStorageAssumption() {
+        return dictUnsetOrSameAsStorage;
+    }
+
     public final DynamicObject getStorage() {
         return storage;
     }