Skip to content

[3.7] closes bpo-32898: Fix debug build crash with COUNT_ALLOCS (GH-5800) #5806

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

Merged
miss-islington merged 1 commit into from
Feb 22, 2018
Merged

[3.7] closes bpo-32898: Fix debug build crash with COUNT_ALLOCS (GH-5800) #5806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ Tal Einat
Eric Eisner
Andrew Eland
Julien Élie
Eduardo Elizondo
Lance Ellinghaus
Daniel Ellis
Phil Elson
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the python debug build when using COUNT_ALLOCS.
2 changes: 1 addition & 1 deletion Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static void
show_alloc(void)
{
PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) {
if (!interp->core_config.show_alloc_count) {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ void
dump_counts(FILE* f)
{
PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) {
if (!interp->core_config.show_alloc_count) {
return;
}

PyTypeObject *tp;
for (tp = type_list; tp; tp = tp->tp_next)
fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, "
"freed: %" PY_FORMAT_SIZE_T "d, "
Expand Down
2 changes: 1 addition & 1 deletion Objects/tupleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static void
show_track(void)
{
PyInterpreterState *interp = PyThreadState_GET()->interp;
if (!inter->core_config.show_alloc_count) {
if (!interp->core_config.show_alloc_count) {
return;
}

Expand Down