Skip to content

gh-127295: ctypes: Switch field accessors to fixed-width integers #127297

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
encukou merged 20 commits into from
Dec 20, 2024
Merged

gh-127295: ctypes: Switch field accessors to fixed-width integers #127297

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eeb0d4e
Consistently pass the size to getfunc/setfunc
encukou Nov 19, 2024
e33c929
Switch to fixed-width integers
encukou Nov 22, 2024
a11c0d9
Remove comment for obsolete idea
encukou Nov 26, 2024
c69b65f
Fix the size argument
encukou Nov 26, 2024
eb8cf98
Re-run Clinic
encukou Nov 26, 2024
b9ed727
Regen Clinic
encukou Nov 26, 2024
7cbe57c
Specify signedness of the FFI types, don't match the C types
encukou Nov 26, 2024
144a3b0
Avoid compiler warnings
encukou Nov 26, 2024
fcae66b
Silence the GCC warning in a more local way. It's a GCC bug.
encukou Nov 26, 2024
05ba989
Apply suggestions from code review
encukou Dec 6, 2024
7c08d60
Add parens around macro argument
encukou Dec 6, 2024
50c82be
Fix refcounting for _CTYPES_DEBUG_KEEP builds
encukou Dec 6, 2024
7375c09
Consistency in comments. Why not.
encukou Dec 6, 2024
6e8a4de
Merge in the main branch
encukou Dec 6, 2024
870a038
Include <stdbool.h> & use `bool` rather than `_Bool`
encukou Dec 9, 2024
1b41ace
Use a mutex around _ctypes_init_fielddesc
encukou Dec 9, 2024
07d7ded
Merge in the main branch
encukou Dec 13, 2024
34098c3
Nitpick: Use true/false for bool
encukou Dec 13, 2024
5155293
Avoid unaligned load
encukou Dec 18, 2024
821a7b8
Merge branch 'main' into ctypes-fixint
encukou Dec 19, 2024
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
Prev Previous commit
Next Next commit
Silence the GCC warning in a more local way. It's a GCC bug.
  • Loading branch information
@encukou
encukou committed Nov 26, 2024
commit fcae66bf1f432d7ba8fa85f60e018986bc8ec461
5 changes: 0 additions & 5 deletions Include/pyport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,25 +288,20 @@ extern "C" {
#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push")
#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
_Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
#define _Py_COMP_DIAG_IGNORE_TYPE_LIMITS
#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop")
#elif defined(__GNUC__) \
&& ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push")
#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
#define _Py_COMP_DIAG_IGNORE_TYPE_LIMITS \
_Pragma("GCC diagnostic ignored \"-Wtype-limits\"")
#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop")
#elif defined(_MSC_VER)
#define _Py_COMP_DIAG_PUSH __pragma(warning(push))
#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996))
#define _Py_COMP_DIAG_IGNORE_TYPE_LIMITS
#define _Py_COMP_DIAG_POP __pragma(warning(pop))
#else
#define _Py_COMP_DIAG_PUSH
#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS
#define _Py_COMP_DIAG_IGNORE_TYPE_LIMITS
#define _Py_COMP_DIAG_POP
#endif

Expand Down
18 changes: 13 additions & 5 deletions Modules/_ctypes/cfield.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,12 +1283,20 @@ for nbytes in 8, 16, 32, 64:
Py_UNREACHABLE();
}

/* Macro to call _ctypes_fixint_fielddesc for a given C type.
* The signedness check expands an expression that's always true or false;
* we silence the GCC warning '-Wtype-limits' for this.
*/

/* Macro to call _ctypes_fixint_fielddesc for a given C type. */

_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_TYPE_LIMITS
#if defined(__GNUC__) && (__GNUC__ < 14)
/* The signedness check expands to an expression that's always true or false.
* Older GCC gives a '-Wtype-limits' warning for this, which is a GCC bug
* (docs say it should "not warn for constant expressions"):
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86647
* Silence that warning.
*/
#pragma GCC diagnostic ignored "-Wtype-limits"
#endif

#define FIXINT_FIELDDESC_FOR(C_TYPE) \
_ctypes_fixint_fielddesc(sizeof(C_TYPE), (C_TYPE)-1 < 0)

Expand Down