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

eduardo-elizondo · benjaminp · commit 745dc65b17b3 · 2018-02-21T20:55:18.000-08:00
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -425,6 +425,7 @@ Tal Einat
 Eric Eisner
 Andrew Eland
 Julien Élie
+Eduardo Elizondo
 Lance Ellinghaus
 Daniel Ellis
 Phil Elson
diff --git a/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst b/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst
@@ -0,0 +1 @@
+Fix the python debug build when using COUNT_ALLOCS.
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -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;
     }
 
diff --git a/Objects/object.c b/Objects/object.c
@@ -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, "
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix the python debug build when using COUNT_ALLOCS.`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static void`
`86`	`86`	`show_alloc(void)`
`87`	`87`	`{`
`88`	`88`	`PyInterpreterState *interp = PyThreadState_GET()->interp;`
`89`		`- if (!inter->core_config.show_alloc_count) {`
	`89`	`+ if (!interp->core_config.show_alloc_count) {`
`90`	`90`	`return;`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,11 @@ void`
`97`	`97`	`dump_counts(FILE* f)`
`98`	`98`	`{`
`99`	`99`	`PyInterpreterState *interp = PyThreadState_GET()->interp;`
`100`		`- if (!inter->core_config.show_alloc_count) {`
	`100`	`+ if (!interp->core_config.show_alloc_count) {`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ PyTypeObject *tp;`
`104`	`105`	`for (tp = type_list; tp; tp = tp->tp_next)`
`105`	`106`	`fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, "`
`106`	`107`	`"freed: %" PY_FORMAT_SIZE_T "d, "`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static void`
`45`	`45`	`show_track(void)`
`46`	`46`	`{`
`47`	`47`	`PyInterpreterState *interp = PyThreadState_GET()->interp;`
`48`		`- if (!inter->core_config.show_alloc_count) {`
	`48`	`+ if (!interp->core_config.show_alloc_count) {`
`49`	`49`	`return;`
`50`	`50`	`}`
`51`	`51`