Fix binding non-descriptors in PyObjectGetMethod

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectGetMethod.java

@@ -120,7 +120,7 @@ static Object getFixedAttr(VirtualFrame frame, Object receiver, @SuppressWarning
                     @Cached BranchProfile returnBoundDescr) {
         boolean methodFound = false;
         Object descr = lookupNode.execute(lazyClass);
-        Object getMethod = null;
+        Object getMethod = PNone.NO_VALUE;
         if (descr != PNone.NO_VALUE) {
             hasDescr.enter();
             if (MaybeBindDescriptorNode.isMethodDescriptor(descr)) {
@@ -147,11 +147,14 @@ static Object getFixedAttr(VirtualFrame frame, Object receiver, @SuppressWarning
             returnUnboundMethod.enter();
             return descr;
         }
-        if (getMethod != null) {
+        if (getMethod != PNone.NO_VALUE) {
             // callGet is used twice, and cannot act as the profile here
             returnBoundDescr.enter();
             return new BoundDescriptor(callGet.execute(frame, getMethod, descr, receiver, lazyClass));
         }
+        if (descr != PNone.NO_VALUE) {
+            return new BoundDescriptor(descr);
+        }
         throw raiseNode.raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, receiver, name);
     }
 
@@ -169,7 +172,7 @@ static Object getDynamicAttr(Frame frame, Object receiver, String name,
                     @Shared("raiseNode") @Cached PRaiseNode raiseNode) {
         boolean methodFound = false;
         Object descr = lookupNode.execute(lazyClass, name);
-        Object getMethod = null;
+        Object getMethod = PNone.NO_VALUE;
         if (descr != PNone.NO_VALUE) {
             if (MaybeBindDescriptorNode.isMethodDescriptor(descr)) {
                 methodFound = true;
@@ -190,9 +193,12 @@ static Object getDynamicAttr(Frame frame, Object receiver, String name,
         if (methodFound) {
             return descr;
         }
-        if (getMethod != null) {
+        if (getMethod != PNone.NO_VALUE) {
             return new BoundDescriptor(callGet.execute(frame, getMethod, descr, receiver, lazyClass));
         }
+        if (descr != PNone.NO_VALUE) {
+            return new BoundDescriptor(descr);
+        }
         throw raiseNode.raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, receiver, name);
     }
 }