mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-135755: Move SPECIAL_ constants to a private header (GH-135922)

Browse source 
Macros without a `Py`/`_Py` prefix should not be defined in public headers.
This commit is contained in:
Petr Viktorin 2025-06-25 13:03:05 +02:00 • committed by GitHub
parent dd59c786cf
commit 1b1ae82fab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Include/ceval.h
View file

@ -133,13 +133,6 @@ PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
#define FVS_MASK 0x4 #define FVS_MASK 0x4
#define FVS_HAVE_SPEC 0x4 #define FVS_HAVE_SPEC 0x4
/* Special methods used by LOAD_SPECIAL */
#define SPECIAL___ENTER__ 0
#define SPECIAL___EXIT__ 1
#define SPECIAL___AENTER__ 2
#define SPECIAL___AEXIT__ 3
#define SPECIAL_MAX 3
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
# define Py_CPYTHON_CEVAL_H # define Py_CPYTHON_CEVAL_H
# include "cpython/ceval.h" # include "cpython/ceval.h"

7
Include/internal/pycore_ceval.h
View file

@ -366,6 +366,13 @@ extern int _PyRunRemoteDebugger(PyThreadState *tstate);
PyAPI_FUNC(_PyStackRef) PyAPI_FUNC(_PyStackRef)
_PyForIter_VirtualIteratorNext(PyThreadState* tstate, struct _PyInterpreterFrame* frame, _PyStackRef iter, _PyStackRef *index_ptr); _PyForIter_VirtualIteratorNext(PyThreadState* tstate, struct _PyInterpreterFrame* frame, _PyStackRef iter, _PyStackRef *index_ptr);
/* Special methods used by LOAD_SPECIAL */
#define SPECIAL___ENTER__ 0
#define SPECIAL___EXIT__ 1
#define SPECIAL___AENTER__ 2
#define SPECIAL___AEXIT__ 3
#define SPECIAL_MAX 3
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
Modules/_opcode.c
View file

@ -5,7 +5,7 @@
#include "Python.h" #include "Python.h"
#include "compile.h" #include "compile.h"
#include "opcode.h" #include "opcode.h"
#include "pycore_ceval.h" #include "pycore_ceval.h" // SPECIAL_MAX
#include "pycore_code.h" #include "pycore_code.h"
#include "pycore_compile.h" #include "pycore_compile.h"
#include "pycore_intrinsics.h" #include "pycore_intrinsics.h"

2
Python/ceval.c
View file

@ -8,7 +8,7 @@
#include "pycore_backoff.h" #include "pycore_backoff.h"
#include "pycore_call.h" // _PyObject_CallNoArgs() #include "pycore_call.h" // _PyObject_CallNoArgs()
#include "pycore_cell.h" // PyCell_GetRef() #include "pycore_cell.h" // PyCell_GetRef()
#include "pycore_ceval.h" #include "pycore_ceval.h" // SPECIAL___ENTER__
#include "pycore_code.h" #include "pycore_code.h"
#include "pycore_dict.h" #include "pycore_dict.h"
#include "pycore_emscripten_signal.h" // _Py_CHECK_EMSCRIPTEN_SIGNALS #include "pycore_emscripten_signal.h" // _Py_CHECK_EMSCRIPTEN_SIGNALS

1
Python/codegen.c
View file

@ -28,6 +28,7 @@
#include "pycore_pystate.h" // _Py_GetConfig() #include "pycore_pystate.h" // _Py_GetConfig()
#include "pycore_symtable.h" // PySTEntryObject #include "pycore_symtable.h" // PySTEntryObject
#include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString #include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString
#include "pycore_ceval.h" // SPECIAL___ENTER__
#define NEED_OPCODE_METADATA #define NEED_OPCODE_METADATA
#include "pycore_opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed #include "pycore_opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed