8000 [3.14] gh-132775: Support Fallbacks in _PyObject_GetXIData() (gh-133482) by miss-islington · Pull Request #134418 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.14] gh-132775: Support Fallbacks in _PyObject_GetXIData() (gh-133482) #134418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
+32,041 −31,540
Merged

[3.14] gh-132775: Support Fallbacks in _PyObject_GetXIData() (gh-133482) #134418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50e1340
gh-132775: Support Fallbacks in _PyObject_GetXIData() (gh-133482)
ericsnowcurrently May 21, 2025
21a0235
Update python3.14.abi for internal-only ABI changes
ericsnowcurrently May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62,861 changes: 31,460 additions & 31,401 deletions Doc/data/python3.14.abi
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 23 additions & 2 deletions Include/internal/pycore_crossinterp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,23 @@ PyAPI_FUNC(void) _PyXIData_Clear(PyInterpreterState *, _PyXIData_t *);

/* getting cross-interpreter data */

typedef int (*xidatafunc)(PyThreadState *tstate, PyObject *, _PyXIData_t *);
typedef int xidata_fallback_t;
#define _PyXIDATA_XIDATA_ONLY (0)
#define _PyXIDATA_FULL_FALLBACK (1)

// Technically, we don't need two different function types;
// we could go with just the fallback one. However, only container
// types like tuple need it, so always having the extra arg would be
// a bit unfortunate. It's also nice to be able to clearly distinguish
// between types that might call _PyObject_GetXIData() and those that won't.
//
typedef int (*xidatafunc)(PyThreadState *, PyObject *, _PyXIData_t *);
typedef int (*xidatafbfunc)(
PyThreadState *, PyObject *, xidata_fallback_t, _PyXIData_t *);
typedef struct {
xidatafunc basic;
xidatafbfunc fallback;
} _PyXIData_getdata_t;

PyAPI_FUNC(PyObject *) _PyXIData_GetNotShareableErrorType(PyThreadState *);
PyAPI_FUNC(void) _PyXIData_SetNotShareableError(PyThreadState *, const char *);
Expand All @@ -140,16 +156,21 @@ PyAPI_FUNC(void) _PyXIData_FormatNotShareableError(
const char *,
...);

PyAPI_FUNC(xidatafunc) _PyXIData_Lookup(
PyAPI_FUNC(_PyXIData_getdata_t) _PyXIData_Lookup(
PyThreadState *,
PyObject *);
PyAPI_FUNC(int) _PyObject_CheckXIData(
PyThreadState *,
PyObject *);

PyAPI_FUNC(int) _PyObject_GetXIDataNoFallback(
PyThreadState *,
PyObject *,
_PyXIData_t *);
PyAPI_FUNC(int) _PyObject_GetXIData(
PyThreadState *,
PyObject *,
xidata_fallback_t,
_PyXIData_t *);

// _PyObject_GetXIData() for bytes
Expand Down
4 changes: 2 additions & 2 deletions Include/internal/pycore_crossinterp_data_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ typedef struct _xid_regitem {
/* This is NULL for builtin types. */
PyObject *weakref;
size_t refcount;
xidatafunc getdata;
_PyXIData_getdata_t getdata;
} _PyXIData_regitem_t;

typedef struct {
Expand All @@ -30,7 +30,7 @@ typedef struct {
PyAPI_FUNC(int) _PyXIData_RegisterClass(
PyThreadState *,
PyTypeObject *,
xidatafunc);
_PyXIData_getdata_t);
PyAPI_FUNC(int) _PyXIData_UnregisterClass(
PyThreadState *,
PyTypeObject *);
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/support/import_helper.py
View file 75CA
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,5 +438,5 @@ def ensure_module_imported(name, *, clearnone=True):
if sys.modules.get(name) is not None:
mod = sys.modules[name]
else:
mod, _, _ = _force_import(name, False, True, clearnone)
mod, _, _ = _ensure_module(name, False, True, clearnone)
return mod
Loading
Loading
0