ExecutePositionalStarargsNode: raise TypeError on *None

cosminbasca · cosminbasca · commit 31f79d2c0b10 · 2020-11-26T10:37:14.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/positional/ExecutePositionalStarargsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/positional/ExecutePositionalStarargsNode.java
@@ -122,8 +122,9 @@ static Object[] doSet(PSet starargs,
     }
 
     @Specialization
-    static Object[] doNone(@SuppressWarnings("unused") PNone none) {
-        return PythonUtils.EMPTY_OBJECT_ARRAY;
+    static Object[] doNone(PNone none,
+                   @Cached PRaiseNode raise) {
+        throw raise.raise(PythonErrorType.TypeError, ErrorMessages.ARG_AFTER_MUST_BE_ITERABLE, none);
     }
 
     @Specialization(limit = "getCallSiteInlineCacheMaxDepth()")
@@ -196,8 +197,9 @@ static Object[] doSet(PSet starargs,
         }
 
         @Specialization
-        static Object[] starargs(@SuppressWarnings("unused") PNone none) {
-            return ExecutePositionalStarargsNode.doNone(none);
+        static Object[] starargs(PNone none,
+                        @Cached PRaiseNode raise) {
+            return ExecutePositionalStarargsNode.doNone(none, raise);
         }
 
         @Specialization(limit = "getCallSiteInlineCacheMaxDepth()")

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,9 @@ static Object[] doSet(PSet starargs,`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Specialization`
`125`		`- static Object[] doNone(@SuppressWarnings("unused") PNone none) {`
`126`		`- return PythonUtils.EMPTY_OBJECT_ARRAY;`
	`125`	`+ static Object[] doNone(PNone none,`
	`126`	`+ @Cached PRaiseNode raise) {`
	`127`	`+ throw raise.raise(PythonErrorType.TypeError, ErrorMessages.ARG_AFTER_MUST_BE_ITERABLE, none);`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`@Specialization(limit = "getCallSiteInlineCacheMaxDepth()")`
`@@ -196,8 +197,9 @@ static Object[] doSet(PSet starargs,`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`@Specialization`
`199`		`- static Object[] starargs(@SuppressWarnings("unused") PNone none) {`
`200`		`- return ExecutePositionalStarargsNode.doNone(none);`
	`200`	`+ static Object[] starargs(PNone none,`
	`201`	`+ @Cached PRaiseNode raise) {`
	`202`	`+ return ExecutePositionalStarargsNode.doNone(none, raise);`
`201`	`203`	`}`
`202`	`204`
`203`	`205`	`@Specialization(limit = "getCallSiteInlineCacheMaxDepth()")`