closes bpo-32898: Fix debug build crash with COUNT_ALLOCS (GH-5800)

This commit is contained in:
Eddie Elizondo 2018-02-21 20:55:18 -08:00 committed by Benjamin Peterson
parent c84cf6c03f
commit 745dc65b17
5 changed files with 6 additions and 3 deletions

View file

@ -425,6 +425,7 @@ Tal Einat
Eric Eisner Eric Eisner
Andrew Eland Andrew Eland
Julien Élie Julien Élie
Eduardo Elizondo
Lance Ellinghaus Lance Ellinghaus
Daniel Ellis Daniel Ellis
Phil Elson Phil Elson

View file

@ -0,0 +1 @@
Fix the python debug build when using COUNT_ALLOCS.

View file

@ -86,7 +86,7 @@ static void
show_alloc(void) show_alloc(void)
{ {
PyInterpreterState *interp = PyThreadState_GET()->interp; PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) { if (!interp->core_config.show_alloc_count) {
return; return;
} }

View file

@ -97,10 +97,11 @@ void
dump_counts(FILE* f) dump_counts(FILE* f)
{ {
PyInterpreterState *interp = PyThreadState_GET()->interp; PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) { if (!interp->core_config.show_alloc_count) {
return; return;
} }
PyTypeObject *tp;
for (tp = type_list; tp; tp = tp->tp_next) for (tp = type_list; tp; tp = tp->tp_next)
fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, " fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, "
"freed: %" PY_FORMAT_SIZE_T "d, " "freed: %" PY_FORMAT_SIZE_T "d, "

View file

@ -45,7 +45,7 @@ static void
show_track(void) show_track(void)
{ {
PyInterpreterState *interp = PyThreadState_GET()->interp; PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) { if (!interp->core_config.show_alloc_count) {
return; return;
} }