[GR-17643] setattr via decorator on class member

PullRequest: graalpython/611

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_class-set-attrib.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -102,3 +102,24 @@ def test_assignments():
   assert object.baz == 119, "custom set"
 
 
+def test_setattr_via_decorator():
+  def setdec(func):
+    setattr(func, 'SPECIAL_ATTR', {'a': 1, 'b': 2})
+    return func
+
+  @setdec
+  def f():
+    return 1
+
+  assert hasattr(f, 'SPECIAL_ATTR')
+  assert getattr(f, 'SPECIAL_ATTR') == {'a': 1, 'b': 2}
+
+
+  class MyClass(object):
+    @setdec
+    def f(self):
+      return 1
+
+  m = MyClass()
+  assert hasattr(m.f, 'SPECIAL_ATTR')
+  assert getattr(m.f, 'SPECIAL_ATTR') == {'a': 1, 'b': 2}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java

@@ -28,8 +28,10 @@
 
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CODE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DEFAULTS__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FUNC__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__KWDEFAULTS__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REDUCE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
@@ -43,6 +45,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
@@ -54,6 +57,8 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -93,6 +98,32 @@ protected Object doIt(VirtualFrame frame, PMethod self,
         }
     }
 
+    @Builtin(name = __DICT__, minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    public abstract static class DictNode extends PythonBuiltinNode {
+        @Specialization
+        protected Object doIt(VirtualFrame frame, PMethod self,
+                        @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getDict) {
+            return getDict.executeObject(frame, self.getFunction(), __DICT__);
+        }
+    }
+
+    @Builtin(name = __GETATTRIBUTE__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class GetattributeNode extends PythonBuiltinNode {
+        @Specialization
+        protected Object doIt(VirtualFrame frame, PMethod self, Object key,
+                        @Cached("create()") ObjectBuiltins.GetAttributeNode objectGetattrNode,
+                        @Cached("create()") IsBuiltinClassProfile errorProfile) {
+            try {
+                return objectGetattrNode.execute(frame, self, key);
+            } catch (PException e) {
+                e.expectAttributeError(errorProfile);
+                return objectGetattrNode.execute(frame, self.getFunction(), key);
+            }
+        }
+    }
+
     @Builtin(name = __REPR__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {