get attributes from the object __dict__ (if set)

Author: cosminbasca

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

@@ -66,3 +66,5 @@ class MyClass(object):
     assert m.__dict__ == {}
     m.__dict__ = {'a': 10}
     assert m.__dict__ == {'a': 10}
+    assert m.a == 10
+

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

@@ -57,6 +57,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 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.HashingStorageNodes;
 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;
@@ -401,6 +402,19 @@ private LazyPythonClass getDataClass(Object descr) {
     @Builtin(name = SpecialMethodNames.__GETATTR__, fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class GetattrNode extends PythonBinaryBuiltinNode {
+        @Specialization
+        Object getattr(PythonObject object, Object key,
+                        @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
+            PHashingCollection dict = object.getDict();
+            if (dict != null) {
+                Object value = getItemNode.execute(dict.getDictStorage(), key);
+                if (value != null) {
+                    return value;
+                }
+            }
+            throw raise(AttributeError, "'%p' object has no attribute %s", object, key);
+        }
+
         @Specialization
         Object getattr(Object object, Object key) {
             throw raise(AttributeError, "'%p' object has no attribute %s", object, key);
@@ -489,7 +503,7 @@ Object dict(PythonClass self, PNone none) {
             throw new AssertionError();
         }
 
-        @Specialization(guards = {"!isBuiltinObject(self)", "!isClass(self)", "!isExactObjectInstance(self)"})
+        @Specialization(guards = {"!isBuiltinObject(self)", "!isClass(self)", "!isExactObjectInstance(self)", "isNoValue(none)"})
         Object dict(PythonObject self, @SuppressWarnings("unused") PNone none) {
             PHashingCollection dict = self.getDict();
             if (dict == null) {