From: Guido van Rossum <guido@python.org>
Date: Fri, 1 May 2020 16:42:32 +0000 (-0700)
Subject: Ensure that tok->type_comments is set on every path (GH-19828)
X-Git-Tag: v3.9.0b1~218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9d6eadf003605f4cdb55e38df2168dd1bc0dbd5;p=thirdparty%2FPython%2Fcpython.git

Ensure that tok->type_comments is set on every path (GH-19828)
---

diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index a7add8fbb144..6ff09b3b31f7 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -1017,6 +1017,8 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
         return (Parser *) PyErr_NoMemory();
     }
     assert(tok != NULL);
+    tok->type_comments = (flags & PyPARSE_TYPE_COMMENTS) > 0;
+    tok->async_hacks = (flags & PyPARSE_ASYNC_HACKS) > 0;
     p->tok = tok;
     p->keywords = NULL;
     p->n_keyword_lists = -1;
@@ -1172,9 +1174,6 @@ _PyPegen_run_parser_from_string(const char *str, int start_rule, PyObject *filen
 
     int parser_flags = compute_parser_flags(flags);
     int feature_version = flags ? flags->cf_feature_version : PY_MINOR_VERSION;
-    tok->type_comments = (parser_flags & PyPARSE_TYPE_COMMENTS) > 0;
-    tok->async_hacks = (parser_flags & PyPARSE_ASYNC_HACKS) > 0;
-
     Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, feature_version,
                                     NULL, arena);
     if (p == NULL) {