blob: 1dff9c0f8c46a930ed355d503bbae947a3b56936 [file] [log] [blame]
Andrew Geisslerc5535c92023-01-27 16:10:19 -06001From 6b3c202b46b9312c5bb0789145f13d8086e70948 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 02:34:17 -0800
4Subject: [PATCH] fiddle: Use C11 _Alignof to define ALIGN_OF when possible
5
6WG14 N2350 made very clear that it is an UB having type definitions
7within "offsetof" [1]. This patch enhances the implementation of macro
8ALIGN_OF to use builtin "_Alignof" to avoid undefined behavior
9when using std=c11 or newer
10
11clang 16+ has started to flag this [2]
12
13Fixes build when using -std >= gnu11 and using clang16+
14
15Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
16may support C11, exclude those compiler versions
17
18[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
19[2] https://reviews.llvm.org/D133574
20
21Upstream-Status: Submitted [https://github.com/ruby/fiddle/pull/120]
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 ext/fiddle/fiddle.h | 12 +++++++++++-
25 1 file changed, 11 insertions(+), 1 deletion(-)
26
27diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
28index 10eb9ce..ffb395e 100644
29--- a/ext/fiddle/fiddle.h
30+++ b/ext/fiddle/fiddle.h
31@@ -196,7 +196,17 @@
32 #endif
33 #define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
34
35-#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
36+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
37+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
38+ clang versions < 8.0.0 have the same bug. */
39+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
40+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
41+ && !defined __clang__) \
42+ || (defined __clang__ && __clang_major__ < 8))
43+# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
44+#else
45+# define ALIGN_OF(type) _Alignof(type)
46+#endif
47
48 #define ALIGN_VOIDP ALIGN_OF(void*)
49 #define ALIGN_CHAR ALIGN_OF(char)
50--
512.39.0
52