commit be17295280c89771c80f317da072f6c0d016cc60
author Pablo Galindo <Pablogsal@gmail.com> Thu Sep 03 16:35:17 2020 +0100
committer GitHub <noreply@github.com> Thu Sep 03 16:35:17 2020 +0100
tree 493b010d08d201ce1770ce7a143945f6f195bc78
parent a5d0232b0d2cbcbdeb0d89ea3d8826241a53a7c7

[3.9] bpo-41697: Correctly handle KeywordOrStarred when parsing arguments in the parser (GH-22077) (GH-22079)

(cherry picked from commit 315a61f7a9418d904e0eea14b1f054fac3a90e9f)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

Parser/pegen/parse.c

diff --git a/Parser/pegen/parse.c b/Parser/pegen/parse.c
index c7304ed..f74b6f2 100644
--- a/Parser/pegen/parse.c
+++ b/Parser/pegen/parse.c
@@ -12271,7 +12271,16 @@
         )
         {
             D(fprintf(stderr, "%*c+ args[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.(starred_expression | named_expression !'=')+ [',' kwargs]"));
-            _res = _PyPegen_collect_call_seqs ( p , a , b );
+            Token *_token = _PyPegen_get_last_nonnwhitespace_token(p);
+            if (_token == NULL) {
+                D(p->level--);
+                return NULL;
+            }
+            int _end_lineno = _token->end_lineno;
+            UNUSED(_end_lineno); // Only used by EXTRA macro
+            int _end_col_offset = _token->end_col_offset;
+            UNUSED(_end_col_offset); // Only used by EXTRA macro
+            _res = _PyPegen_collect_call_seqs ( p , a , b , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);