Suppress TypeError in GetLengthNode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorNodes.java

@@ -40,20 +40,30 @@
  */
 package com.oracle.graal.python.builtins.objects.iterator;
 
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__LENGTH_HINT__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
+
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode;
+import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class IteratorNodes {
 
@@ -86,22 +96,51 @@ int length(VirtualFrame frame, Object iterable,
                         @Cached CastToJavaIntLossyNode cast,
                         @Cached("create(__LEN__)") LookupAttributeInMRONode lenNode,
                         @Cached("create(__LENGTH_HINT__)") LookupAttributeInMRONode lenHintNode,
-                        @Cached CallUnaryMethodNode dispatchGetattribute) {
-            Object len;
+                        @Cached CallUnaryMethodNode dispatchGetattribute,
+                        @Cached IsBuiltinClassProfile errorProfile,
+                        @Cached ConditionProfile hasLenProfile,
+                        @Cached ConditionProfile hasLenghtHintProfile,
+                        @Cached PRaiseNode raiseNode) {
             Object clazz = plib.getLazyPythonClass(iterable);
             Object attrLenObj = lenNode.execute(clazz);
-            if (attrLenObj != PNone.NO_VALUE && attrLenObj != PNone.NONE) {
-                len = dispatchGetattribute.executeObject(frame, attrLenObj, iterable);
-            } else {
-                Object attrLenHintObj = lenHintNode.execute(clazz);
-                if (attrLenHintObj != PNone.NO_VALUE && attrLenHintObj != PNone.NONE) {
-                    len = dispatchGetattribute.executeObject(frame, attrLenHintObj, iterable);
-                } else {
-                    return -1;
+            if (hasLenProfile.profile(attrLenObj != PNone.NO_VALUE && attrLenObj != PNotImplemented.NOT_IMPLEMENTED)) {
+                Object len = null;
+                try {
+                    len = dispatchGetattribute.executeObject(frame, attrLenObj, iterable);
+                } catch (PException e) {
+                    e.expect(TypeError, errorProfile);
+                }
+                if (len != null) {
+                    if (toInt.canBeIndex(len)) {
+                        int intLen = cast.execute(toInt.asIndex(len));
+                        if (intLen < 0) {
+                            throw raiseNode.raise(TypeError, ErrorMessages.LEN_SHOULD_RETURN_MT_ZERO);
+                        }
+                        return intLen;
+                    } else {
+                        throw raiseNode.raise(TypeError, ErrorMessages.MUST_BE_INTEGER, __LEN__, len);
+                    }
                 }
             }
-            if (toInt.canBeIndex(len)) {
-                return cast.execute(toInt.asIndex(len));
+            Object attrLenHintObj = lenHintNode.execute(clazz);
+            if (hasLenghtHintProfile.profile(attrLenHintObj != PNone.NO_VALUE && attrLenHintObj != PNotImplemented.NOT_IMPLEMENTED)) {
+                Object len = null;
+                try {
+                    len = dispatchGetattribute.executeObject(frame, attrLenHintObj, iterable);
+                } catch (PException e) {
+                    e.expect(TypeError, errorProfile);
+                }
+                if (len != null) {
+                    if (toInt.canBeIndex(len)) {
+                        int intLen = cast.execute(toInt.asIndex(len));
+                        if (intLen < 0) {
+                            throw raiseNode.raise(TypeError, ErrorMessages.LENGTH_HINT_SHOULD_RETURN_MT_ZERO);
+                        }
+                        return intLen;
+                    } else {
+                        throw raiseNode.raise(TypeError, ErrorMessages.MUST_BE_INTEGER, __LENGTH_HINT__, len);
+                    }
+                }
             }
             return -1;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -316,6 +316,7 @@ public abstract class ErrorMessages {
     public static final String LAZY_INITIALIZATION_FAILED = "lazy initialization of type %s failed";
     public static final String LEFT_BRACKET_WO_RIGHT_BRACKET_IN_ARG = "')' without '(' in argument parsing";
     public static final String LEN_SHOULD_RETURN_MT_ZERO = "__len__() should return >= 0";
+    public static final String LENGTH_HINT_SHOULD_RETURN_MT_ZERO = "__length_hint__() should return >= 0";
     public static final String LIST_ASSIGMENT_INDEX_OUT_OF_RANGE = "list assignment index out of range";
     public static final String LIST_INDEX_OUT_OF_RANGE = "list index out of range";
     public static final String LIST_LENGTH_OUT_OF_RANGE = "list length out of range";
@@ -340,6 +341,7 @@ public abstract class ErrorMessages {
     public static final String MUST_BE_A_CELL = "%s must be a cell";
     public static final String MUST_BE_BYTE_STRING_LEGTH1_NOT_P = "must be a byte string of length 1, not %p";
     public static final String MUST_BE_EITHER_OR = "%s: '%s' must be either %s or %s";
+    public static final String MUST_BE_INTEGER = "%s must be an integer, not %p";
     public static final String MUST_BE_NON_NEGATIVE = "%s must be non-negative";
     public static final String MUST_BE_NON_NEGATIVE_INTEGER = "%s must be non-negative integer";
     public static final String MUST_BE_NUMERIC = "must be numeric, not %p";