[3.14] gh-134768: Fix definition of mt_continue_should_break() (GH-134769) (#134916)

miss-islington · thesamesam · web-flow · commit e0e8f28f27bb · 2025-05-30T05:08:43.000Z
gh-134768: Fix definition of `mt_continue_should_break()` (GH-134769) In 121ed71, mt_continue_should_break was changed to be guarded by `Py_DEBUG`, but it's used in `compress_mt_continue_lock_held` with just `assert`, so it needs to be available when `NDEBUG` is undefined too. `Py_DEBUG` implies `NDEBUG` is undefined, so we can check just that. (cherry picked from commit 2f2bee2) Fixes: 121ed71 Co-authored-by: Sam James <sam@gentoo.org>
diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
@@ -512,7 +512,7 @@ compress_lock_held(ZstdCompressor *self, Py_buffer *data,
     return NULL;
 }
 
-#ifdef Py_DEBUG
+#ifndef NDEBUG
 static inline int
 mt_continue_should_break(ZSTD_inBuffer *in, ZSTD_outBuffer *out)
 {

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ compress_lock_held(ZstdCompressor self, Py_buffer data,`
`512`	`512`	`return NULL;`
`513`	`513`	`}`
`514`	`514`
`515`		`-#ifdef Py_DEBUG`
	`515`	`+#ifndef NDEBUG`
`516`	`516`	`static inline int`
`517`	`517`	`mt_continue_should_break(ZSTD_inBuffer in, ZSTD_outBuffer out)`
`518`	`518`	`{`