diff options
| author | Eddie Elizondo <eduardo.elizondorueda@gmail.com> | 2018-02-22 04:55:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2018-02-22 04:55:18 (GMT) |
| commit | 745dc65b17b3936e3f9f4099f735f174d30c4e0c (patch) | |
| tree | 23b81a11c1e61eb12828acfd356e85866a7edf24 | |
| parent | c84cf6c03fce1fb73bfaf91d7909f1c2708f14a2 (diff) | |
| download | cpython-745dc65b17b3936e3f9f4099f735f174d30c4e0c.zip cpython-745dc65b17b3936e3f9f4099f735f174d30c4e0c.tar.gz cpython-745dc65b17b3936e3f9f4099f735f174d30c4e0c.tar.bz2 | |
closes bpo-32898: Fix debug build crash with COUNT_ALLOCS (GH-5800)
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst | 1 | ||||
| -rw-r--r-- | Objects/listobject.c | 2 | ||||
| -rw-r--r-- | Objects/object.c | 3 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 2 |
5 files changed, 6 insertions, 3 deletions
@@ -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 new file mode 100644 index 0000000..4c75466 --- /dev/null +++ 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 index f0fe962..c8ffeff 100644 --- 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 index fef57fc..220aa90 100644 --- 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 index 39d43dd..9bb91a5 100644 --- 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; } |