mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-131296: fix clang-cl warning in tracemalloc.c (#131514)

Browse source 
Always set MAX_NFRAME to UINT16_MAX.

Avoid the complicated code which emitted a compiler warning.
This commit is contained in:
Victor Stinner 2025-03-22 10:38:47 +01:00 • committed by GitHub
parent 8b7d20d3a9
commit 9962469943
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/tracemalloc.c
View file

@ -48,10 +48,7 @@ typedef struct tracemalloc_traceback traceback_t;
#define TRACEBACK_SIZE(NFRAME) \ #define TRACEBACK_SIZE(NFRAME) \
(sizeof(traceback_t) + sizeof(frame_t) * (NFRAME - 1)) (sizeof(traceback_t) + sizeof(frame_t) * (NFRAME - 1))
/* The maximum number of frames is either: static const int MAX_NFRAME = UINT16_MAX;
- The maximum number of frames we can store in `traceback_t.nframe`
- The maximum memory size_t we can allocate */
static const unsigned long MAX_NFRAME = Py_MIN(UINT16_MAX, ((SIZE_MAX - sizeof(traceback_t)) / sizeof(frame_t) + 1));
#define tracemalloc_empty_traceback _PyRuntime.tracemalloc.empty_traceback #define tracemalloc_empty_traceback _PyRuntime.tracemalloc.empty_traceback
@ -791,9 +788,9 @@ tracemalloc_deinit(void)
int int
_PyTraceMalloc_Start(int max_nframe) _PyTraceMalloc_Start(int max_nframe)
{ {
if (max_nframe < 1 || (unsigned long) max_nframe > MAX_NFRAME) { if (max_nframe < 1 || max_nframe > MAX_NFRAME) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"the number of frames must be in range [1; %lu]", "the number of frames must be in range [1; %i]",
MAX_NFRAME); MAX_NFRAME);
return -1; return -1;
} }