KeywordArgumentsNode: fix non mapping case

cosminbasca · cosminbasca · commit 49d3dce7c767 · 2020-11-26T10:37:14.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/KeywordArgumentsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/KeywordArgumentsNode.java
@@ -93,12 +93,17 @@ PKeyword[] doDict(PKeyword[] arguments, PDict starargs,
         return internalNode.execute(arguments, starArgs);
     }
 
-    @Specialization
+    protected boolean isNonMapping(PKeyword[] arguments, Object starargs) {
+        return (arguments.length == 0 && PGuards.isPNone(starargs)) ||
+                (!PGuards.isDict(starargs) && !PGuards.isPNone(starargs));
+    }
+
+    @Specialization(guards = "arguments.length > 0")
     PKeyword[] doNone(PKeyword[] arguments, @SuppressWarnings("unused") PNone starargs) {
         return arguments;
     }
 
-    @Specialization(guards = {"!isDict(starargs)", "!isPNone(starargs)"})
+    @Specialization(guards = "isNonMapping(arguments, starargs)")
     PKeyword[] doGeneral(@SuppressWarnings("unused") PKeyword[] arguments, Object starargs) {
         throw new NonMappingException(starargs);
     }

Original file line number	Diff line number	Diff line change
`@@ -93,12 +93,17 @@ PKeyword[] doDict(PKeyword[] arguments, PDict starargs,`
`93`	`93`	`return internalNode.execute(arguments, starArgs);`
`94`	`94`	`}`
`95`	`95`
`96`		`- @Specialization`
	`96`	`+ protected boolean isNonMapping(PKeyword[] arguments, Object starargs) {`
	`97`	`+ return (arguments.length == 0 && PGuards.isPNone(starargs)) \|\|`
	`98`	`+ (!PGuards.isDict(starargs) && !PGuards.isPNone(starargs));`
	`99`	`+ }`
	`100`	`+`
	`101`	`+ @Specialization(guards = "arguments.length > 0")`
`97`	`102`	`PKeyword[] doNone(PKeyword[] arguments, @SuppressWarnings("unused") PNone starargs) {`
`98`	`103`	`return arguments;`
`99`	`104`	`}`
`100`	`105`
`101`		`- @Specialization(guards = {"!isDict(starargs)", "!isPNone(starargs)"})`
	`106`	`+ @Specialization(guards = "isNonMapping(arguments, starargs)")`
`102`	`107`	`PKeyword[] doGeneral(@SuppressWarnings("unused") PKeyword[] arguments, Object starargs) {`
`103`	`108`	`throw new NonMappingException(starargs);`
`104`	`109`	`}`