Skip to content

_ctypes callbacks.c uses _Py_COMP_DIAG_IGNORE_DEPR_DECLS #105732

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
Jun 14, 2023
Merged

_ctypes callbacks.c uses _Py_COMP_DIAG_IGNORE_DEPR_DECLS #105732

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa3fb28
_ctypes callbacks.c uses _Py_COMP_DIAG_IGNORE_DEPR_DECLS
vstinner Jun 13, 2023
36de8ec
rephase the macOS part
vstinner Jun 13, 2023
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
36 changes: 20 additions & 16 deletions Modules/_ctypes/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,25 +416,29 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
PyErr_Format(PyExc_NotImplementedError, "ffi_prep_closure_loc() is missing");
goto error;
#else
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
// GH-85272, GH-23327, GH-100540: On macOS,
// HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME is checked at runtime because the
// symbol might not be available at runtime when targeting macOS 10.14
// or earlier. Even if ffi_prep_closure_loc() is called in practice,
// the deprecated ffi_prep_closure() code path is needed if
// HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME is false.
//
// On non-macOS platforms, even if HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME is
// defined as 1 and ffi_prep_closure_loc() is used in practice, this
// code path is still compiled and emits a compiler warning. The
// deprecated code path is likely to be removed by a simple
// optimization pass.
//
// Ignore the compiler warning on the ffi_prep_closure() deprecation,
// rather than using complex #if/#else code paths for the different
// platforms.
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
result = ffi_prep_closure(p->pcl_write, &p->cif, closure_fcn, p);

#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic pop
#endif

_Py_COMP_DIAG_POP
#endif
}

if (result != FFI_OK) {
PyErr_Format(PyExc_RuntimeError,
"ffi_prep_closure failed with %d", result);
Expand Down