From 0e427c6d159e86f17270770cd8dc37372e3c4004 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 25 Mar 2020 21:22:55 +0100 Subject: bpo-39947: Add _PyThreadState_GetDict() function (GH-19160) --- Python/pystate.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'Python/pystate.c') diff --git a/Python/pystate.c b/Python/pystate.c index c7154ea706..66a1d3b492 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -4,9 +4,10 @@ #include "Python.h" #include "pycore_ceval.h" #include "pycore_initconfig.h" +#include "pycore_pyerrors.h" +#include "pycore_pylifecycle.h" #include "pycore_pymem.h" #include "pycore_pystate.h" -#include "pycore_pylifecycle.h" /* -------------------------------------------------------------------------- CAUTION @@ -979,20 +980,28 @@ PyThreadState_Swap(PyThreadState *newts) PyThreadState_GetDict() returns NULL, an exception has *not* been raised and the caller should assume no per-thread state is available. */ +PyObject * +_PyThreadState_GetDict(PyThreadState *tstate) +{ + assert(tstate != NULL); + if (tstate->dict == NULL) { + tstate->dict = PyDict_New(); + if (tstate->dict == NULL) { + _PyErr_Clear(tstate); + } + } + return tstate->dict; +} + + PyObject * PyThreadState_GetDict(void) { PyThreadState *tstate = _PyThreadState_GET(); - if (tstate == NULL) + if (tstate == NULL) { return NULL; - - if (tstate->dict == NULL) { - PyObject *d; - tstate->dict = d = PyDict_New(); - if (d == NULL) - PyErr_Clear(); } - return tstate->dict; + return _PyThreadState_GetDict(tstate); } -- cgit v1.2.1