Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-106078: Suppress the warning caused by multi-phase initialization of decimal #107524

Merged
merged 6 commits into from
Oct 6, 2023
Merged

gh-106078: Suppress the warning caused by multi-phase initialization of decimal #107524

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0bf5f4
Suppress mpd_setminalloc warning
CharlieZhao95 Aug 1, 2023
473eed1
Update ignored.tsv
CharlieZhao95 Aug 1, 2023
20ea76e
Add constructor attribute
CharlieZhao95 Aug 1, 2023
ed8a2b3
Move `minalloc_is_set` outside
CharlieZhao95 Aug 1, 2023
ff0054b
Fix suppression
CharlieZhao95 Aug 9, 2023
7f87f4b
Merge branch 'main' into decimal/suppress_warning
AlexWaygood Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Modules/_decimal/_decimal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5876,6 +5876,7 @@ cfunc_noargs(PyTypeObject *t, const char *name)
return NULL;
}

static int minalloc_is_set = 0;

static int
_decimal_exec(PyObject *m)
Expand All @@ -5898,7 +5899,12 @@ _decimal_exec(PyObject *m)
mpd_reallocfunc = PyMem_Realloc;
mpd_callocfunc = mpd_callocfunc_em;
mpd_free = PyMem_Free;
mpd_setminalloc(_Py_DEC_MINALLOC);

/* Suppress the warning caused by multi-phase initialization */
if (minalloc_is_set) {
Eclips4 marked this conversation as resolved.
Show resolved Hide resolved
mpd_setminalloc(_Py_DEC_MINALLOC);
minalloc_is_set = 1;
}

decimal_state *state = get_module_state(m);

Expand Down
3 changes: 3 additions & 0 deletions Tools/c-analyzer/cpython/ignored.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ Python/pylifecycle.c fatal_error reentrant -
# explicitly protected, internal-only
Modules/_xxinterpchannelsmodule.c - _globals -

# set once during module init
Modules/_decimal/_decimal.c - minalloc_is_set -


##################################
## not significant
Expand Down
Loading