From a34bb009675952e0541ae0e27c6679b25e453032 Mon Sep 17 00:00:00 2001 From: eduardo-elizondo Date: Wed, 21 Feb 2018 11:28:18 -0800 Subject: [PATCH 1/5] [Build] Fix debug build errors --- Objects/listobject.c | 2 +- Objects/object.c | 3 ++- Objects/tupleobject.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Objects/listobject.c b/Objects/listobject.c index f0fe962be94126..c8ffeff09368de 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 fef57fce7ba7e6..220aa90bf59c5b 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 39d43dd04a592d..9bb91a5e65a0a0 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; } From 0c436a132c4c4ed3c15e5f4bcadfadb81178783b Mon Sep 17 00:00:00 2001 From: eduardo-elizondo Date: Wed, 21 Feb 2018 12:37:31 -0800 Subject: [PATCH 2/5] Add ACKS --- Misc/ACKS | 1 + 1 file changed, 1 insertion(+) diff --git a/Misc/ACKS b/Misc/ACKS index b15b20e6c1c02f..2eddc56d34d3d3 100644 --- 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 From e8384ffa0ca6d2917aee0295b858897d97571ade Mon Sep 17 00:00:00 2001 From: eduardo-elizondo Date: Wed, 21 Feb 2018 12:51:18 -0800 Subject: [PATCH 3/5] Added News --- Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst 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 00000000000000..f30c2beefc8fee --- /dev/null +++ b/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst @@ -0,0 +1 @@ +Fix the debug python build when using COUNT_ALLOCS From 65b1143f51e0d4b4aab923b3246641e2fd39c5df Mon Sep 17 00:00:00 2001 From: eduardo-elizondo Date: Wed, 21 Feb 2018 12:51:56 -0800 Subject: [PATCH 4/5] Fix --- Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index f30c2beefc8fee..1bf4c4104adcef 100644 --- 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 @@ -1 +1 @@ -Fix the debug python build when using COUNT_ALLOCS +Fix the python debug build when using COUNT_ALLOCS From 941615c3b6456ab4627237d4365cf390bcc472aa Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 21 Feb 2018 20:23:03 -0800 Subject: [PATCH 5/5] add period --- Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1bf4c4104adcef..4c75466bfd0f59 100644 --- 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 @@ -1 +1 @@ -Fix the python debug build when using COUNT_ALLOCS +Fix the python debug build when using COUNT_ALLOCS.