fix check in hasArrayElements

timfel · fangerer · commit 953280408291 · 2019-03-26T11:25:07.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -205,7 +205,7 @@ public boolean hasArrayElements(
                     @Shared("isSequenceNode") @Cached IsSequenceNode isSequenceNode,
                     @Shared("isMapping") @Cached IsMappingNode isMapping,
                     @Shared("isIterableNode") @Cached IsIterableNode isIterableNode) {
-        return (isSequenceNode.execute(this) && !isMapping.execute(this)) || isIterableNode.execute(this);
+        return (isSequenceNode.execute(this) || isIterableNode.execute(this)) && !isMapping.execute(this);
     }
 
     @ExportMessage

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public boolean hasArrayElements(`
`205`	`205`	`@Shared("isSequenceNode") @Cached IsSequenceNode isSequenceNode,`
`206`	`206`	`@Shared("isMapping") @Cached IsMappingNode isMapping,`
`207`	`207`	`@Shared("isIterableNode") @Cached IsIterableNode isIterableNode) {`
`208`		`- return (isSequenceNode.execute(this) && !isMapping.execute(this)) \|\| isIterableNode.execute(this);`
	`208`	`+ return (isSequenceNode.execute(this) \|\| isIterableNode.execute(this)) && !isMapping.execute(this);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@ExportMessage`