Fix method __doc__ descriptor

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/FunctionBuiltins.java

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorValue;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.GetObjectArrayNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.getsetdescriptor.DescriptorDeleteMarker;
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes;
@@ -305,18 +306,24 @@ static Object setCode(PFunction self, PCode code,
         }
     }
 
-    @Builtin(name = J___DOC__, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
+    @Builtin(name = J___DOC__, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true, allowsDelete = true)
     @GenerateNodeFactory
     abstract static class DocNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "isNoValue(none)")
         Object get(PFunction self, @SuppressWarnings("unused") Object none) {
             return self.getDoc();
         }
 
-        @Specialization(guards = "!isNoValue(value)")
+        @Specialization(guards = {"!isNoValue(value)", "!isDeleteMarker(value)"})
         Object set(PFunction self, Object value) {
             self.setDoc(value);
             return PNone.NONE;
         }
+
+        @Specialization
+        Object delete(PFunction self, @SuppressWarnings("unused") DescriptorDeleteMarker marker) {
+            self.setDoc(PNone.NONE);
+            return PNone.NONE;
+        }
     }
 }

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

@@ -64,7 +64,6 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -256,22 +255,16 @@ static Object getModule(@SuppressWarnings("unused") PMethod self, @SuppressWarni
     abstract static class DocNode extends PythonUnaryBuiltinNode {
         @Specialization
         static Object getDoc(PMethod self,
-                        @Shared @Cached ReadAttributeFromObjectNode readNode) {
-            Object doc = readNode.execute(self.getFunction(), T___DOC__);
-            if (doc == PNone.NO_VALUE) {
-                return PNone.NONE;
-            }
-            return doc;
+                        @Bind("this") Node inliningTarget,
+                        @Shared @Cached PyObjectGetAttr getAttr) {
+            return getAttr.execute(inliningTarget, self.getFunction(), T___DOC__);
         }
 
         @Specialization
         static Object getDoc(PBuiltinMethod self,
-                        @Shared @Cached ReadAttributeFromObjectNode readNode) {
-            Object doc = readNode.execute(self.getFunction(), T___DOC__);
-            if (doc == PNone.NO_VALUE) {
-                return PNone.NONE;
-            }
-            return doc;
+                        @Bind("this") Node inliningTarget,
+                        @Shared @Cached PyObjectGetAttr getAttr) {
+            return getAttr.execute(inliningTarget, self.getFunction(), T___DOC__);
         }
     }