[3.14] GH-132983: remove empty_bytes from _zstd module state (GH-133785) (#133788)

miss-islington · AA-Turner · web-flow · commit 9023b6ffae69 · 2025-05-09T20:42:55.000Z
GH-132983: remove empty_bytes from _zstd module state (GH-133785) (cherry picked from commit 98e2c3a) Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
diff --git a/Modules/_zstd/_zstdmodule.c b/Modules/_zstd/_zstdmodule.c
@@ -587,11 +587,6 @@ do {                                                                         \
     _zstd_state* const mod_state = get_zstd_state(m);
 
     /* Reusable objects & variables */
-    mod_state->empty_bytes = PyBytes_FromStringAndSize(NULL, 0);
-    if (mod_state->empty_bytes == NULL) {
-        return -1;
-    }
-
     mod_state->CParameter_type = NULL;
     mod_state->DParameter_type = NULL;
 
@@ -694,8 +689,6 @@ _zstd_traverse(PyObject *module, visitproc visit, void *arg)
 {
     _zstd_state* const mod_state = get_zstd_state(module);
 
-    Py_VISIT(mod_state->empty_bytes);
-
     Py_VISIT(mod_state->ZstdDict_type);
     Py_VISIT(mod_state->ZstdCompressor_type);
 
@@ -713,8 +706,6 @@ _zstd_clear(PyObject *module)
 {
     _zstd_state* const mod_state = get_zstd_state(module);
 
-    Py_CLEAR(mod_state->empty_bytes);
-
     Py_CLEAR(mod_state->ZstdDict_type);
     Py_CLEAR(mod_state->ZstdCompressor_type);
 
diff --git a/Modules/_zstd/_zstdmodule.h b/Modules/_zstd/_zstdmodule.h
@@ -35,8 +35,6 @@ extern PyType_Spec zstd_compressor_type_spec;
 extern PyType_Spec zstd_decompressor_type_spec;
 
 struct _zstd_state {
-    PyObject *empty_bytes;
-
     PyTypeObject *ZstdDict_type;
     PyTypeObject *ZstdCompressor_type;
     PyTypeObject *ZstdDecompressor_type;
diff --git a/Modules/_zstd/decompressor.c b/Modules/_zstd/decompressor.c
@@ -290,13 +290,7 @@ decompress_impl(ZstdDecompressor *self, ZSTD_inBuffer *in,
     /* The first AFE check for setting .at_frame_edge flag */
     if (type == TYPE_ENDLESS_DECOMPRESSOR) {
         if (self->at_frame_edge && in->pos == in->size) {
-            _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));
-            if (mod_state == NULL) {
-                return NULL;
-            }
-            ret = mod_state->empty_bytes;
-            Py_INCREF(ret);
-            return ret;
+            return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
         }
     }
 
@@ -747,16 +741,8 @@ _zstd_ZstdDecompressor_unused_data_get_impl(ZstdDecompressor *self)
 {
     PyObject *ret;
 
-    /* Thread-safe code */
-    Py_BEGIN_CRITICAL_SECTION(self);
-
     if (!self->eof) {
-        _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));
-        if (mod_state == NULL) {
-            return NULL;
-        }
-        ret = mod_state->empty_bytes;
-        Py_INCREF(ret);
+        return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
     }
     else {
         if (self->unused_data == NULL) {
@@ -772,8 +758,6 @@ _zstd_ZstdDecompressor_unused_data_get_impl(ZstdDecompressor *self)
         }
     }
 
-    Py_END_CRITICAL_SECTION();
-
     return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -290,13 +290,7 @@ decompress_impl(ZstdDecompressor self, ZSTD_inBuffer in,`
`290`	`290`	`/* The first AFE check for setting .at_frame_edge flag */`
`291`	`291`	`if (type == TYPE_ENDLESS_DECOMPRESSOR) {`
`292`	`292`	`if (self->at_frame_edge && in->pos == in->size) {`
`293`		`- _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));`
`294`		`- if (mod_state == NULL) {`
`295`		`- return NULL;`
`296`		`- }`
`297`		`- ret = mod_state->empty_bytes;`
`298`		`- Py_INCREF(ret);`
`299`		`- return ret;`
	`293`	`+ return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);`
`300`	`294`	`}`
`301`	`295`	`}`
`302`	`296`
`@@ -747,16 +741,8 @@ _zstd_ZstdDecompressor_unused_data_get_impl(ZstdDecompressor *self)`
`747`	`741`	`{`
`748`	`742`	`PyObject *ret;`
`749`	`743`
`750`		`- /* Thread-safe code */`
`751`		`- Py_BEGIN_CRITICAL_SECTION(self);`
`752`		`-`
`753`	`744`	`if (!self->eof) {`
`754`		`- _zstd_state* const mod_state = PyType_GetModuleState(Py_TYPE(self));`
`755`		`- if (mod_state == NULL) {`
`756`		`- return NULL;`
`757`		`- }`
`758`		`- ret = mod_state->empty_bytes;`
`759`		`- Py_INCREF(ret);`
	`745`	`+ return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);`
`760`	`746`	`}`
`761`	`747`	`else {`
`762`	`748`	`if (self->unused_data == NULL) {`
`@@ -772,8 +758,6 @@ _zstd_ZstdDecompressor_unused_data_get_impl(ZstdDecompressor *self)`
`772`	`758`	`}`
`773`	`759`	`}`
`774`	`760`
`775`		`- Py_END_CRITICAL_SECTION();`
`776`		`-`
`777`	`761`	`return ret;`
`778`	`762`	`}`
`779`	`763`