From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 16 Mar 2023 15:26:42 +0000 (-0600)
Subject: gh-102737: Un-ignore ceval.c in the CI globals check (gh-102745)
X-Git-Tag: v3.12.0a7~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84e20c689a8b3b6cebfd50d044c62af5d0e7dec1;p=thirdparty%2FPython%2Fcpython.git

gh-102737: Un-ignore ceval.c in the CI globals check (gh-102745)

The tool now allows user-added #LINE preprocessor directives.

https://github.com/python/cpython/issues/102737
---

diff --git a/Tools/c-analyzer/c_parser/preprocessor/gcc.py b/Tools/c-analyzer/c_parser/preprocessor/gcc.py
index 24c1b0e9b9d4..c680f351f224 100644
--- a/Tools/c-analyzer/c_parser/preprocessor/gcc.py
+++ b/Tools/c-analyzer/c_parser/preprocessor/gcc.py
@@ -153,9 +153,13 @@ def _iter_top_include_lines(lines, topfile, cwd,
                 # XXX How can a file return to line 1?
                 #assert lno > 1, (line, lno)
             else:
-                # It's the next line from the file.
-                assert included == files[-1], (line, files)
-                assert lno > 1, (line, lno)
+                if included == files[-1]:
+                    # It's the next line from the file.
+                    assert lno > 1, (line, lno)
+                else:
+                    # We ran into a user-added #LINE directive,
+                    # which we promptly ignore.
+                    pass
         elif not files:
             raise NotImplementedError((line,))
         elif filter_reqfile(files[-1]):
diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py
index a2911e030ffe..acf30e2c4020 100644
--- a/Tools/c-analyzer/cpython/_parser.py
+++ b/Tools/c-analyzer/cpython/_parser.py
@@ -96,10 +96,6 @@ EXCLUDED += clean_lines('''
 # has gone wrong where # we handle "maybe inline actual"
 # in Tools/c-analyzer/c_parser/parser/_global.py.
 Modules/expat/xmlparse.c
-
-# The parser doesn't like the #line directives
-# that originate from generated_cases.c.h
-Python/ceval.c
 ''')
 
 INCL_DIRS = clean_lines('''