Skip to content

gh-99069: Consolidate checks for static_assert #94766

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 9 commits into from
Apr 5, 2023
Merged

gh-99069: Consolidate checks for static_assert #94766

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e75e612
gh-99069: Consolidate checks for static_assert
jmroot Jul 12, 2022
783604d
Workaround for MSVC
jmroot Jul 12, 2022
08106d7
Indicate blank lines are part of the comment
jmroot Nov 7, 2022
6c36647
Restrict static_assert define to gcc/clang C11+
jmroot Nov 21, 2022
ce67d71
Add more explanation of __STDC_VERSION__ check
jmroot Dec 2, 2022
cdd52ce
Update Include/pymacro.h
vstinner Dec 3, 2022
a5ceb00
Update Include/pymacro.h
vstinner Dec 5, 2022
57950a3
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 11, 2023
3ca0a69
C2x compatibility for static_assert
jmroot Mar 15, 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
25 changes: 13 additions & 12 deletions Include/pymacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@

// gh-91782: On FreeBSD 12, if the _POSIX_C_SOURCE and _XOPEN_SOURCE macros are
// defined, <sys/cdefs.h> disables C11 support and <assert.h> does not define
// the static_assert() macro. Define the static_assert() macro in Python until
// <sys/cdefs.h> suports C11:
// the static_assert() macro.
// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255290
#if defined(__FreeBSD__) && !defined(static_assert)
# define static_assert _Static_assert
#endif

// static_assert is defined in glibc from version 2.16. Before it requires
// compiler support (gcc >= 4.6) and is called _Static_assert.
//
// macOS <= 10.10 doesn't define static_assert in assert.h at all despite
// having C11 compiler support.
//
// static_assert is defined in glibc from version 2.16. Compiler support for
// the C11 _Static_assert keyword is in gcc >= 4.6.
//
// MSVC makes static_assert a keyword, contrary to the C standard.
//
// In C++ 11 static_assert is a keyword, redefining is undefined behaviour.
#if (defined(__GLIBC__) \
&& (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 16)) \
&& !(defined(__cplusplus) && __cplusplus >= 201103L) \
&& !defined(static_assert))
// So only define if building as C (if __STDC_VERSION__ is defined), not C++.
#if !defined(static_assert) && defined(__GNUC__) \
&& defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
# define static_assert _Static_assert
#endif

Expand Down