[3.13] gh-120642: Move _PyCode_CODE() to the internal C API (GH-121644) (#121729)

miss-islington · vstinner · web-flow · commit 48a96d23a837 · 2024-07-13T21:31:30.000Z
gh-120642: Move _PyCode_CODE() to the internal C API (GH-121644) Move _PyCode_CODE() and _PyCode_NBYTES() macros to the internal C API since they use _Py_CODEUNIT which is only part of the internal C API. (cherry picked from commit a2bec77) Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
@@ -194,9 +194,6 @@ Py_DEPRECATED(3.13) static inline int PyCode_GetFirstFree(PyCodeObject *op) {
     return PyUnstable_Code_GetFirstFree(op);
 }
 
-#define _PyCode_CODE(CO) _Py_RVALUE((_Py_CODEUNIT *)(CO)->co_code_adaptive)
-#define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))
-
 /* Unstable public interface */
 PyAPI_FUNC(PyCodeObject *) PyUnstable_Code_New(
         int, int, int, int, int, PyObject *, PyObject *,
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -30,6 +30,9 @@ typedef union {
     _Py_BackoffCounter counter;  // First cache entry of specializable op
 } _Py_CODEUNIT;
 
+#define _PyCode_CODE(CO) _Py_RVALUE((_Py_CODEUNIT *)(CO)->co_code_adaptive)
+#define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))
+
 
 /* These macros only remain defined for compatibility. */
 #define _Py_OPCODE(word) ((word).op.code)

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,6 @@ Py_DEPRECATED(3.13) static inline int PyCode_GetFirstFree(PyCodeObject *op) {`
`194`	`194`	`return PyUnstable_Code_GetFirstFree(op);`
`195`	`195`	`}`
`196`	`196`
`197`		`-#define _PyCode_CODE(CO) _Py_RVALUE((_Py_CODEUNIT *)(CO)->co_code_adaptive)`
`198`		`-#define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))`
`199`		`-`
`200`	`197`	`/* Unstable public interface */`
`201`	`198`	`PyAPI_FUNC(PyCodeObject *) PyUnstable_Code_New(`
`202`	`199`	`int, int, int, int, int, PyObject , PyObject ,`