Fix error handling in PyObjectGetMethod

Author: msimacek

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

@@ -40,13 +40,17 @@
  */
 package com.oracle.graal.python.lib;
 
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
+
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
+import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
@@ -108,6 +112,7 @@ static Object getFixedAttr(VirtualFrame frame, Object receiver, @SuppressWarning
                     @Shared("lookupSet") @Cached(parameters = "Set") LookupCallableSlotInMRONode lookupSet,
                     @Shared("callGet") @Cached CallTernaryMethodNode callGet,
                     @Shared("readAttr") @Cached ReadAttributeFromObjectNode readAttr,
+                    @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                     @Cached BranchProfile hasDescr,
                     @Cached BranchProfile returnDataDescr,
                     @Cached BranchProfile returnAttr,
@@ -146,7 +151,7 @@ static Object getFixedAttr(VirtualFrame frame, Object receiver, @SuppressWarning
             returnBoundDescr.enter();
             return new BoundDescriptor(callGet.execute(frame, getMethod, descr, receiver, lazyClass));
         }
-        return new BoundDescriptor(descr);
+        throw raiseNode.raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, receiver, name);
     }
 
     // No explicit branch profiling when we're looking up multiple things
@@ -159,7 +164,8 @@ static Object getDynamicAttr(Frame frame, Object receiver, String name,
                     @Shared("lookupGet") @Cached(parameters = "Get") LookupCallableSlotInMRONode lookupGet,
                     @Shared("lookupSet") @Cached(parameters = "Set") LookupCallableSlotInMRONode lookupSet,
                     @Shared("callGet") @Cached CallTernaryMethodNode callGet,
-                    @Shared("readAttr") @Cached ReadAttributeFromObjectNode readAttr) {
+                    @Shared("readAttr") @Cached ReadAttributeFromObjectNode readAttr,
+                    @Shared("raiseNode") @Cached PRaiseNode raiseNode) {
         boolean methodFound = false;
         Object descr = lookupNode.execute(lazyClass, name);
         Object getMethod = null;
@@ -185,6 +191,6 @@ static Object getDynamicAttr(Frame frame, Object receiver, String name,
         if (getMethod != null) {
             return new BoundDescriptor(callGet.execute(frame, getMethod, descr, receiver, lazyClass));
         }
-        return new BoundDescriptor(descr);
+        throw raiseNode.raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, receiver, name);
     }
 }