diff options
| -rw-r--r-- | Include/cpython/optimizer.h | 2 | ||||
| -rw-r--r-- | Include/cpython/sysmodule.h | 5 | ||||
| -rw-r--r-- | Include/internal/pycore_sysmodule.h | 6 | ||||
| -rw-r--r-- | Modules/_io/bytesio.c | 2 | ||||
| -rw-r--r-- | Modules/_pickle.c | 3 | ||||
| -rw-r--r-- | Modules/_threadmodule.c | 1 | ||||
| -rw-r--r-- | Modules/faulthandler.c | 1 | ||||
| -rw-r--r-- | Python/_warnings.c | 2 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 1 | ||||
| -rw-r--r-- | Python/intrinsics.c | 3 | ||||
| -rw-r--r-- | Python/sysmodule.c | 1 | ||||
| -rw-r--r-- | Python/traceback.c | 1 |
12 files changed, 20 insertions, 8 deletions
diff --git a/Include/cpython/optimizer.h b/Include/cpython/optimizer.h index e3fe0e8..10457af 100644 --- a/Include/cpython/optimizer.h +++ b/Include/cpython/optimizer.h @@ -38,7 +38,7 @@ PyAPI_FUNC(void) PyUnstable_SetOptimizer(_PyOptimizerObject* optimizer); PyAPI_FUNC(_PyOptimizerObject *) PyUnstable_GetOptimizer(void); -PyAPI_FUNC(_PyExecutorObject *)PyUnstable_GetExecutor(PyCodeObject *code, int offset); +PyAPI_FUNC(_PyExecutorObject *) PyUnstable_GetExecutor(PyCodeObject *code, int offset); struct _PyInterpreterFrame * _PyOptimizer_BackEdge(struct _PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest, PyObject **stack_pointer); diff --git a/Include/cpython/sysmodule.h b/Include/cpython/sysmodule.h index 19d9ddd..e028fb7 100644 --- a/Include/cpython/sysmodule.h +++ b/Include/cpython/sysmodule.h @@ -2,11 +2,6 @@ # error "this header file must not be included directly" #endif -PyAPI_FUNC(PyObject *) _PySys_GetAttr(PyThreadState *tstate, - PyObject *name); - -PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); - typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *); PyAPI_FUNC(int) PySys_Audit( diff --git a/Include/internal/pycore_sysmodule.h b/Include/internal/pycore_sysmodule.h index aec9c20..9b8eafd 100644 --- a/Include/internal/pycore_sysmodule.h +++ b/Include/internal/pycore_sysmodule.h @@ -8,6 +8,12 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif +// Export for '_pickle' shared extension +PyAPI_FUNC(PyObject*) _PySys_GetAttr(PyThreadState *tstate, PyObject *name); + +// Export for '_pickle' shared extension +PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); + extern int _PySys_Audit( PyThreadState *tstate, const char *event, diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 3ab503c..f307420 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -1,5 +1,7 @@ #include "Python.h" #include "pycore_object.h" +#include "pycore_sysmodule.h" // _PySys_GetSizeOf() + #include <stddef.h> // offsetof() #include "_iomodule.h" diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 4f26ffe..b975248 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -17,10 +17,11 @@ #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_runtime.h" // _Py_ID() #include "pycore_setobject.h" // _PySet_NextEntry() - +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include <stdlib.h> // strtol() + PyDoc_STRVAR(pickle_module_doc, "Optimized C implementation for the Python pickle module."); diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index 229abfb..2cf866c 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -9,6 +9,7 @@ #include "pycore_moduleobject.h" // _PyModule_GetState() #include "pycore_pylifecycle.h" #include "pycore_pystate.h" // _PyThreadState_SetCurrent() +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_weakref.h" // _PyWeakref_GET_REF() #include <stddef.h> // offsetof() diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index d8cfc13..5ec34d4 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -3,6 +3,7 @@ #include "pycore_pyerrors.h" // _Py_DumpExtensionModules #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_signal.h" // Py_NSIG +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_traceback.h" // _Py_DumpTracebackThreads #include <object.h> diff --git a/Python/_warnings.c b/Python/_warnings.c index 40ec5f6..9e562d7 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -7,6 +7,8 @@ #include "pycore_pyerrors.h" #include "pycore_pylifecycle.h" // _Py_IsInterpreterFinalizing() #include "pycore_pystate.h" // _PyThreadState_GET() +#include "pycore_sysmodule.h" // _PySys_GetAttr() + #include "clinic/_warnings.c.h" #define MODULE_NAME "_warnings" diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 787f53f..ac9bc72 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -12,6 +12,7 @@ #include "pycore_object.h" // _Py_AddToAllObjects() #include "pycore_pyerrors.h" // _PyErr_NoMemory() #include "pycore_pystate.h" // _PyThreadState_GET() +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_tuple.h" // _PyTuple_FromArray() #include "clinic/bltinmodule.c.h" diff --git a/Python/intrinsics.c b/Python/intrinsics.c index 5267c10..fefee0f 100644 --- a/Python/intrinsics.c +++ b/Python/intrinsics.c @@ -4,10 +4,11 @@ #include "Python.h" #include "pycore_frame.h" #include "pycore_function.h" -#include "pycore_runtime.h" #include "pycore_global_objects.h" #include "pycore_intrinsics.h" #include "pycore_pyerrors.h" +#include "pycore_runtime.h" +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_typevarobject.h" diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 94d0f01..0ec763c 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -31,6 +31,7 @@ Data members: #include "pycore_pymem.h" // _PyMem_SetDefaultAllocator() #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_structseq.h" // _PyStructSequence_InitBuiltinWithFlags() +#include "pycore_sysmodule.h" // Define _PySys_GetSizeOf() #include "pycore_tuple.h" // _PyTuple_FromArray() #include "frameobject.h" // PyFrame_FastToLocalsWithError() diff --git a/Python/traceback.c b/Python/traceback.c index 61ace38..657ddab 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -13,6 +13,7 @@ #include "pycore_pyarena.h" // _PyArena_Free() #include "pycore_pyerrors.h" // _PyErr_GetRaisedException() #include "pycore_pystate.h" // _PyThreadState_GET() +#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_traceback.h" // EXCEPTION_TB_HEADER #include "../Parser/pegen.h" // _PyPegen_byte_offset_to_character_offset() |