Skip to content

Commit 80e4f26

Browse files
ericsnowcurrentlyericsnowcurrently
authored
bpo-36876: Make sure the c-analyzer is checking all the source files.' (gh-31264)
https://bugs.python.org/issue36876
1 parent 035414a commit 80e4f26

File tree

5 files changed

+159
-22
lines changed

5 files changed

+159
-22
lines changed

‎Tools/c-analyzer/cpython/_analyzer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def render(self, fmt='line', *, itemonly=False):
307307
# XXX ???
308308
#if itemonly:
309309
# yield from rendered
310-
supported = self._supported
310+
supported = self.supported
311311
if fmt in ('line', 'brief'):
312312
rendered, = rendered
313313
parts = [

‎Tools/c-analyzer/cpython/_files.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66

77
GLOBS = [
88
'Include/*.h',
9+
# Technically, this is covered by "Include/*.h":
10+
#'Include/cpython/*.h',
911
'Include/internal/*.h',
1012
'Modules/**/*.h',
1113
'Modules/**/*.c',
1214
'Objects/**/*.h',
1315
'Objects/**/*.c',
14-
'Python/**/*.h',
16+
'Parser/**/*.h',
1517
'Parser/**/*.c',
1618
'Python/**/*.h',
17-
'Parser/**/*.c',
19+
'Python/**/*.c',
1820
]
1921
LEVEL_GLOBS = {
2022
'stable': 'Include/*.h',

‎Tools/c-analyzer/cpython/_parser.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ def clean_lines(text):
8181
Objects/unicodetype_db.h
8282
8383
# generated
84+
Python/deepfreeze/*.c
8485
Python/frozen_modules/*.h
8586
Python/opcode_targets.h
8687
Python/stdlib_module_names.h
@@ -157,6 +158,7 @@ def clean_lines(text):
157158
Modules/faulthandler.c Py_BUILD_CORE 1
158159
Modules/gcmodule.c Py_BUILD_CORE 1
159160
Modules/getpath.c Py_BUILD_CORE 1
161+
Modules/getpath_noop.c Py_BUILD_CORE 1
160162
Modules/itertoolsmodule.c Py_BUILD_CORE 1
161163
Modules/main.c Py_BUILD_CORE 1
162164
Modules/mathmodule.c Py_BUILD_CORE 1
@@ -169,9 +171,10 @@ def clean_lines(text):
169171
Modules/unicodedata.c Py_BUILD_CORE 1
170172
Objects/stringlib/codecs.h Py_BUILD_CORE 1
171173
Objects/stringlib/unicode_format.h Py_BUILD_CORE 1
174+
Parser/string_parser.h Py_BUILD_CORE 1
175+
Parser/pegen.h Py_BUILD_CORE 1
172176
Python/ceval_gil.h Py_BUILD_CORE 1
173177
Python/condvar.h Py_BUILD_CORE 1
174-
Modules/getpath_noop.c Py_BUILD_CORE 1
175178
176179
Modules/_json.c Py_BUILD_CORE_BUILTIN 1
177180
Modules/_pickle.c Py_BUILD_CORE_BUILTIN 1
@@ -293,6 +296,9 @@ def clean_lines(text):
293296
_abs('Modules/expat/expat.h'): (10_000, 400),
294297
_abs('Objects/stringlib/unicode_format.h'): (10_000, 400),
295298
_abs('Objects/typeobject.c'): (20_000, 200),
299+
_abs('Python/compile.c'): (20_000, 500),
300+
_abs('Python/pylifecycle.c'): (200_000, 5000),
301+
_abs('Python/pystate.c'): (200_000, 5000),
296302
}
297303

298304

‎Tools/c-analyzer/cpython/globals-to-fix.tsv‎

Lines changed: 101 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,28 @@ Objects/unionobject.c - _Py_UnionType -
106106
Objects/weakrefobject.c - _PyWeakref_CallableProxyType -
107107
Objects/weakrefobject.c - _PyWeakref_ProxyType -
108108
Objects/weakrefobject.c - _PyWeakref_RefType -
109+
Python/bltinmodule.c - PyFilter_Type -
110+
Python/bltinmodule.c - PyMap_Type -
111+
Python/bltinmodule.c - PyZip_Type -
112+
Python/context.c - PyContextToken_Type -
113+
Python/context.c - PyContextVar_Type -
114+
Python/context.c - PyContext_Type -
115+
Python/context.c - _PyContextTokenMissing_Type -
116+
Python/errors.c - UnraisableHookArgsType -
117+
Python/hamt.c - _PyHamtItems_Type -
118+
Python/hamt.c - _PyHamtKeys_Type -
119+
Python/hamt.c - _PyHamtValues_Type -
120+
Python/hamt.c - _PyHamt_ArrayNode_Type -
121+
Python/hamt.c - _PyHamt_BitmapNode_Type -
122+
Python/hamt.c - _PyHamt_CollisionNode_Type -
123+
Python/hamt.c - _PyHamt_Type -
124+
Python/symtable.c - PySTEntry_Type -
125+
Python/sysmodule.c - AsyncGenHooksType -
126+
Python/sysmodule.c - FlagsType -
127+
Python/sysmodule.c - Hash_InfoType -
128+
Python/sysmodule.c - VersionInfoType -
129+
Python/thread.c - ThreadInfoType -
130+
Python/traceback.c - PyTraceBack_Type -
109131

110132
#-----------------------
111133
# builtin exception types
@@ -306,12 +328,20 @@ Python/compile.c compiler_visit_annotations return_str -
306328
Python/import.c PyImport_Import builtins_str -
307329
# XXX This should have been found by the analyzer but wasn't:
308330
Python/import.c PyImport_Import import_str -
331+
Python/symtable.c - __class__ -
332+
Python/symtable.c - _annotation -
333+
Python/symtable.c - dictcomp -
334+
Python/symtable.c - genexpr -
335+
Python/symtable.c - lambda -
336+
Python/symtable.c - listcomp -
337+
Python/symtable.c - setcomp -
338+
Python/symtable.c - top -
309339
# XXX This should have been found by the analyzer but wasn't:
310340
Python/sysmodule.c - whatstrings -
311341
# XXX This should have been found by the analyzer but wasn't:
312342
Python/sysmodule.c sys_displayhook newline -
313343

314-
# _PyArg_Parser
344+
# _PyArg_Parser (holds tuple of strings)
315345
Objects/clinic/bytearrayobject.c.h bytearray___init__ _parser -
316346
Objects/clinic/bytearrayobject.c.h bytearray_decode _parser -
317347
Objects/clinic/bytearrayobject.c.h bytearray_hex _parser -
@@ -367,6 +397,9 @@ Python/clinic/sysmodule.c.h sys_addaudithook _parser -
367397
Python/clinic/sysmodule.c.h sys_set_coroutine_origin_tracking_depth _parser -
368398
Python/clinic/traceback.c.h tb_new _parser -
369399

400+
# holds strings
401+
Objects/typeobject.c - slotdefs -
402+
370403
# other
371404
Objects/typeobject.c - method_cache -
372405
Objects/unicodeobject.c - _string_module -
@@ -400,29 +433,73 @@ Python/import.c - extensions -
400433
# global non-objects to fix in core code
401434

402435
#-----------------------
403-
# initialized once
436+
# initialized/set once
404437

405438
# pre-allocated buffer
406439
Modules/getbuildinfo.c Py_GetBuildInfo buildinfo -
407440

408441
# during init
442+
Objects/typeobject.c - slotdefs_initialized -
443+
Objects/unicodeobject.c - bloom_linebreak -
409444
Parser/parser.c - Py_DebugFlag -
410-
411-
# other
412-
Objects/codeobject.c PyCode_NewEmpty nulltuple -
445+
Python/bootstrap_hash.c - _Py_HashSecret_Initialized -
446+
Python/bootstrap_hash.c py_getrandom getrandom_works -
447+
Python/pyhash.c - _Py_HashSecret -
448+
Python/pylifecycle.c - runtime_initialized -
449+
Python/sysmodule.c - _PySys_ImplCacheTag -
450+
Python/sysmodule.c - _PySys_ImplName -
451+
Python/sysmodule.c - _preinit_warnoptions -
452+
Python/sysmodule.c - _preinit_xoptions -
453+
Python/thread.c - thread_debug -
454+
Python/thread.c - initialized -
455+
456+
# lazy
457+
Objects/floatobject.c - double_format -
458+
Objects/floatobject.c - float_format -
459+
Objects/floatobject.c - detected_double_format -
460+
Objects/floatobject.c - detected_float_format -
413461
Objects/longobject.c PyLong_FromString log_base_BASE -
414462
Objects/longobject.c PyLong_FromString convwidth_base -
415463
Objects/longobject.c PyLong_FromString convmultmax_base -
416-
Objects/typeobject.c - slotdefs -
417-
Objects/typeobject.c - slotdefs_initialized -
418-
Objects/unicodeobject.c - bloom_linebreak -
419464
Objects/unicodeobject.c - ucnhash_capi -
420465
Parser/action_helpers.c _PyPegen_dummy_name cache -
421-
Parser/pegen.c _PyPegen_dummy_name cache -
466+
Python/dtoa.c - p5s -
467+
Python/fileutils.c - force_ascii -
468+
Python/fileutils.c set_inheritable ioctl_works -
422469
# XXX This should have been found by the analyzer but wasn't:
423470
Python/import.c - import_lock -
424471
# XXX This should have been found by the analyzer but wasn't:
425472
Python/import.c import_find_and_load header -
473+
Python/specialize.c - _list_append -
474+
475+
#-----------------------
476+
# unlikely to change after init (or main thread)
477+
478+
# through C-API
479+
Python/frozen.c - PyImport_FrozenModules -
480+
Python/frozen.c - _PyImport_FrozenAliases -
481+
Python/frozen.c - _PyImport_FrozenBootstrap -
482+
Python/frozen.c - _PyImport_FrozenStdlib -
483+
Python/frozen.c - _PyImport_FrozenTest -
484+
Python/import.c - inittab_copy -
485+
Python/import.c - PyImport_Inittab -
486+
Python/preconfig.c - Py_FileSystemDefaultEncoding -
487+
Python/preconfig.c - Py_HasFileSystemDefaultEncoding -
488+
Python/preconfig.c - Py_FileSystemDefaultEncodeErrors -
489+
Python/preconfig.c - _Py_HasFileSystemDefaultEncodeErrors -
490+
491+
# REPL
492+
Parser/myreadline.c - _PyOS_ReadlineLock -
493+
Parser/myreadline.c - _PyOS_ReadlineTState -
494+
Parser/myreadline.c - PyOS_InputHook -
495+
Parser/myreadline.c - PyOS_ReadlineFunctionPointer -
496+
497+
# handling C argv
498+
Python/getopt.c - _PyOS_optarg -
499+
Python/getopt.c - _PyOS_opterr -
500+
Python/getopt.c - _PyOS_optind -
501+
Python/getopt.c - opt_ptr -
502+
Python/pathconfig.c - _Py_path_config -
426503

427504
#-----------------------
428505
# state
@@ -444,20 +521,22 @@ Objects/obmalloc.c - unused_arena_objects -
444521
Objects/obmalloc.c - usable_arenas -
445522
Objects/obmalloc.c new_arena debug_stats -
446523

447-
# REPL
448-
Parser/myreadline.c - _PyOS_ReadlineLock -
449-
Parser/myreadline.c - _PyOS_ReadlineTState -
450-
Parser/myreadline.c - PyOS_InputHook -
451-
Parser/myreadline.c - PyOS_ReadlineFunctionPointer -
524+
# pre-allocated memory
525+
Python/dtoa.c - freelist -
526+
Python/dtoa.c - private_mem -
527+
528+
# local buffer
529+
Python/getversion.c Py_GetVersion version -
530+
Python/suggestions.c levenshtein_distance buffer -
531+
532+
# linked list
533+
Python/dtoa.c - pmem_next -
534+
Python/getargs.c - static_arg_parsers -
452535

453536
# other
454537
Objects/dictobject.c - _pydict_global_version -
455538
Objects/dictobject.c - next_dict_keys_version -
456539
Objects/dictobject.c - pydict_global_version -
457-
Objects/floatobject.c - double_format -
458-
Objects/floatobject.c - float_format -
459-
Objects/floatobject.c - detected_double_format -
460-
Objects/floatobject.c - detected_float_format -
461540
Objects/funcobject.c - next_func_version -
462541
Objects/moduleobject.c - max_module_number -
463542
Objects/object.c - _Py_RefTotal -
@@ -480,10 +559,14 @@ Python/import.c - import_lock_thread -
480559
Python/import.c import_find_and_load accumulated -
481560
# XXX This should have been found by the analyzer but wasn't:
482561
Python/import.c import_find_and_load import_level -
562+
Python/modsupport.c - _Py_PackageContext -
563+
Python/pyfpe.c - PyFPE_counter -
564+
Python/pylifecycle.c _Py_FatalErrorFormat reentrant -
483565
# XXX This should have been found by the analyzer but wasn't:
484566
Python/pylifecycle.c - _Py_UnhandledKeyboardInterrupt -
485567
# XXX This should have been found by the analyzer but wasn't:
486568
Python/pylifecycle.c fatal_error reentrant -
569+
Python/specialize.c - _Py_QuickenedCount -
487570

488571

489572
##################################

‎Tools/c-analyzer/cpython/ignored.tsv‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
filename funcname name reason
22
#??? - somevar ???
33

4+
##################################
5+
# ignored by design
6+
7+
Python/pylifecycle.c - _PyRuntime -
8+
9+
410
##################################
511
# forward/extern references
612
# XXX The analyzer should have ignored these.
@@ -384,6 +390,13 @@ Objects/interpreteridobject.c interpid_new kwlist -
384390
Objects/weakrefobject.c weakref_call kwlist -
385391
Objects/exceptions.c NameError_init kwlist -
386392
Objects/exceptions.c AttributeError_init kwlist -
393+
Python/_warnings.c warnings_warn_explicit kwd_list -
394+
Python/bltinmodule.c builtin___import__ kwlist -
395+
Python/bltinmodule.c min_max kwlist -
396+
Python/bltinmodule.c zip_new kwlist -
397+
Python/context.c contextvar_tp_new kwlist -
398+
Python/sysmodule.c sys_getsizeof kwlist -
399+
Python/sysmodule.c sys_set_asyncgen_hooks keywords -
387400

388401
#-----------------------
389402
# PyModuleDef
@@ -397,6 +410,13 @@ Modules/_threadmodule.c - thread_module -
397410
Modules/_typingmodule.c - typingmodule -
398411
Modules/signalmodule.c - signal_module -
399412
Modules/xxlimited_35.c - xxmodule -
413+
Python/Python-ast.c - _astmodule -
414+
Python/Python-tokenize.c - _tokenizemodule -
415+
Python/_warnings.c - warnings_module -
416+
Python/bltinmodule.c - builtinsmodule -
417+
Python/import.c - imp_module -
418+
Python/marshal.c - marshalmodule -
419+
Python/sysmodule.c - sysmodule -
400420

401421
#-----------------------
402422
# PyModuleDef_Slot
@@ -478,6 +498,8 @@ Modules/xxmodule.c - xx_slots -
478498
Modules/xxsubtype.c - xxsubtype_slots -
479499
Modules/zlibmodule.c - zlib_slots -
480500
Python/Python-ast.c - astmodule_slots -
501+
Python/Python-tokenize.c - tokenizemodule_slots -
502+
Python/_warnings.c - warnings_slots -
481503
Python/marshal.c - marshalmodule_slots -
482504

483505
#-----------------------
@@ -798,6 +820,7 @@ Objects/unionobject.c - union_methods -
798820
Objects/weakrefobject.c - proxy_methods -
799821
Objects/weakrefobject.c - weakref_methods -
800822
Python/Python-ast.c - ast_type_methods -
823+
Python/Python-tokenize.c - tokenize_methods -
801824
Python/_warnings.c - warnings_functions -
802825
Python/bltinmodule.c - builtin_methods -
803826
Python/bltinmodule.c - filter_methods -
@@ -807,6 +830,7 @@ Python/context.c - PyContextTokenType_methods -
807830
Python/context.c - PyContextVar_methods -
808831
Python/context.c - PyContext_methods -
809832
Python/hamt.c - PyHamt_methods -
833+
Python/import.c - imp_slots -
810834
Python/import.c - imp_methods -
811835
Python/marshal.c - marshal_methods -
812836
Python/sysmodule.c - sys_methods -
@@ -1218,6 +1242,7 @@ Modules/xxlimited_35.c - Xxo_Type_slots -
12181242
Modules/zlibmodule.c - Comptype_slots -
12191243
Modules/zlibmodule.c - Decomptype_slots -
12201244
Python/Python-ast.c - AST_type_slots -
1245+
Python/Python-tokenize.c - tokenizeriter_slots -
12211246

12221247
# PyType_Spec
12231248
Modules/_abc.c - _abc_data_type_spec -
@@ -1317,6 +1342,7 @@ Modules/xxlimited_35.c - Xxo_Type_spec -
13171342
Modules/zlibmodule.c - Comptype_spec -
13181343
Modules/zlibmodule.c - Decomptype_spec -
13191344
Python/Python-ast.c - AST_type_spec -
1345+
Python/Python-tokenize.c - tokenizeriter_spec -
13201346

13211347
#-----------------------
13221348
# for structseq
@@ -1470,4 +1496,24 @@ Objects/unicodeobject.c unicode_translate_call_errorhandler argparse -
14701496
Parser/parser.c - reserved_keywords -
14711497
Parser/parser.c - soft_keywords -
14721498
Parser/tokenizer.c - type_comment_prefix -
1499+
Python/ast_opt.c fold_unaryop ops -
1500+
Python/codecs.c - Py_hexdigits -
1501+
Python/codecs.c - ucnhash_capi -
1502+
Python/codecs.c _PyCodecRegistry_Init methods -
1503+
Python/dynload_shlib.c - _PyImport_DynLoadFiletab -
1504+
Python/dynload_stub.c - _PyImport_DynLoadFiletab -
1505+
Python/frozen.c - aliases -
1506+
Python/frozen.c - bootstrap_modules -
1507+
Python/frozen.c - stdlib_modules -
1508+
Python/frozen.c - test_modules -
1509+
Python/getopt.c - longopts -
1510+
Python/import.c - _PyImport_Inittab -
1511+
Python/import.c - _PySys_ImplCacheTag -
14731512
Python/opcode_targets.h - opcode_targets -
1513+
Python/pyhash.c - PyHash_Func -
1514+
Python/pylifecycle.c - _C_LOCALE_WARNING -
1515+
Python/pylifecycle.c - _PyOS_mystrnicmp_hack -
1516+
Python/pylifecycle.c - _TARGET_LOCALES -
1517+
Python/specialize.c - adaptive_opcodes -
1518+
Python/specialize.c - cache_requirements -
1519+
Python/specialize.c - compare_masks -

0 commit comments

Comments
 (0)