include: drop pointless __compiler_offsetof indirection
PATCH 1/1 include: drop pointless __compiler_offsetof indirection
(1) compiler_types.h is unconditionally included via an -include flag (see scripts/Makefile.lib), and it defines __compiler_offsetof unconditionally. So testing for definedness of __compiler_offsetof is mostly pointless.
(2) Every relevant compiler provides __builtin_offsetof (even sparse has had that for 14 years), and if for whatever reason one would end up picking up the poor man's fallback definition (C file compiler with completely custom CFLAGS?), newer clang versions won't treat the result as an Integer Constant Expression, so if used in place where such is required (static initializer or static_assert), one would get errors like
t.c:11:16: error: static_assert expression is not an integral constant expression
t.c:11:16: note: cast that performs the conversions of a reinterpret_cast is not allowed in a constant expression t.c:4:33: note: expanded from macro 'offsetof'
#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
So just define offsetof unconditionally and directly in terms of __builtin_offsetof.
--- include/linux/compiler_types.h | 2 -- include/linux/stddef.h | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-)
include/linux/compiler_types.h +0 -2
@@ -137,8 +137,6 @@ struct ftrace_likely_data {*/ #define __naked __attribute__((__naked__)) notrace -#define __compiler_offsetof (a, b) __builtin_offsetof(a, b) -/* * Prefer gnu_inline, so that extern inline functions do not emit an * externally visible function. This makes extern inline behave as per gnu89
include/linux/stddef.h +1 -5
@@ -13,11 +13,7 @@ enum { };#undef offsetof -#ifdef __compiler_offsetof -#define offsetof (TYPE ,MEMBER ) __compiler_offsetof(TYPE, MEMBER) -#else -#define offsetof (TYPE ,MEMBER ) ((size_t)&((TYPE *)0)->MEMBER) -#endif +#define offsetof (TYPE ,MEMBER ) __builtin_offsetof(TYPE, MEMBER)/** * sizeof_field() - Report the size of a struct field in bytes
Signature · 1 line
2.31.1
Quoted 5 lines · Rasmus Villemoes
(1)
compiler_types.his unconditionally included via an -include flag (seescripts/Makefile.lib), and it defines__compiler_offsetofunconditionally. So testing for definedness of__compiler_offsetofis mostly pointless.
Sounds good to me.
By the way, there are a bunch of #include <linux/compiler_types.h> around that could be removed.
Quoted 1 line
(2) Every relevant compiler provides
__builtin_offsetof(even sparse
Indeed, even GCC 4.
Cheers,
Miguel
Quoted 18 lines · Rasmus Villemoes
(1)
compiler_types.his unconditionally included via an -include flag (seescripts/Makefile.lib), and it defines__compiler_offsetofunconditionally. So testing for definedness of__compiler_offsetofis mostly pointless.(2) Every relevant compiler provides
__builtin_offsetof(even sparse has had that for 14 years), and if for whatever reason one would end up picking up the poor man's fallback definition (C file compiler with completely custom CFLAGS?), newer clang versions won't treat the result as an Integer Constant Expression, so if used in place where such is required (static initializer orstatic_assert), one would get errors liket.c:11:16: error:
static_assertexpression is not an integral constant expression
t.c:11:16: note: cast that performs the conversions of areinterpret_castis not allowed in a constant expression t.c:4:33: note: expanded from macro 'offsetof'
#defineoffsetof(TYPE, MEMBER)((size_t)&((TYPE *)0)->MEMBER)
Quoted 4 lines
So just define offsetof unconditionally and directly in terms of
__builtin_offsetof.Signed-off-by Rasmus Villemoes <[email protected]>
Quoted 38 lines
--- include/linux/compiler_types.h | 2 -- include/linux/stddef.h | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-)include/linux/compiler_types.h +0
-2@@ -137,8 +137,6 @@ struct ftrace_likely_data {*/ #define __naked __attribute__((__naked__)) notrace -#define __compiler_offsetof (a, b) __builtin_offsetof(a, b) -/* * Prefer gnu_inline, so that extern inline functions do not emit an * externally visible function. This makes extern inline behave as per gnu89 include/linux/stddef.h +1
-5@@ -13,11 +13,7 @@ enum { };#undef offsetof -#ifdef __compiler_offsetof -#define offsetof (TYPE ,MEMBER ) __compiler_offsetof(TYPE, MEMBER) -#else -#define offsetof (TYPE ,MEMBER ) ((size_t)&((TYPE *)0)->MEMBER) -#endif +#define offsetof (TYPE ,MEMBER ) __builtin_offsetof(TYPE, MEMBER)/** * sizeof_field() - Report the size of a struct field in bytes Signature · 1 line
2.31.1
Quoted 18 lines · Rasmus Villemoes
(1)
compiler_types.his unconditionally included via an -include flag (seescripts/Makefile.lib), and it defines__compiler_offsetofunconditionally. So testing for definedness of__compiler_offsetofis mostly pointless.(2) Every relevant compiler provides
__builtin_offsetof(even sparse has had that for 14 years), and if for whatever reason one would end up picking up the poor man's fallback definition (C file compiler with completely custom CFLAGS?), newer clang versions won't treat the result as an Integer Constant Expression, so if used in place where such is required (static initializer orstatic_assert), one would get errors liket.c:11:16: error:
static_assertexpression is not an integral constant expression
t.c:11:16: note: cast that performs the conversions of areinterpret_castis not allowed in a constant expression t.c:4:33: note: expanded from macro 'offsetof'
#defineoffsetof(TYPE, MEMBER)((size_t)&((TYPE *)0)->MEMBER)
Quoted 4 lines
So just define offsetof unconditionally and directly in terms of
__builtin_offsetof.Signed-off-by Rasmus Villemoes <[email protected]>
Yes please. :)
Signature · 1 line
Kees Cook
Quoted 46 lines · Rasmus Villemoes
(1)
compiler_types.his unconditionally included via an -include flag (seescripts/Makefile.lib), and it defines__compiler_offsetofunconditionally. So testing for definedness of__compiler_offsetofis mostly pointless.(2) Every relevant compiler provides
__builtin_offsetof(even sparse has had that for 14 years), and if for whatever reason one would end up picking up the poor man's fallback definition (C file compiler with completely custom CFLAGS?), newer clang versions won't treat the result as an Integer Constant Expression, so if used in place where such is required (static initializer orstatic_assert), one would get errors liket.c:11:16: error:
static_assertexpression is not an integral constant expression
t.c:11:16: note: cast that performs the conversions of areinterpret_castis not allowed in a constant expression t.c:4:33: note: expanded from macro 'offsetof'
#defineoffsetof(TYPE, MEMBER)((size_t)&((TYPE *)0)->MEMBER)So just define offsetof unconditionally and directly in terms of
__builtin_offsetof.Signed-off-by Rasmus Villemoes <[email protected]>--- include/linux/compiler_types.h | 2 -- include/linux/stddef.h | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-)include/linux/compiler_types.h +0
-2@@ -137,8 +137,6 @@ struct ftrace_likely_data {*/ #define __naked __attribute__((__naked__)) notrace -#define __compiler_offsetof (a, b) __builtin_offsetof(a, b) -/* * Prefer gnu_inline, so that extern inline functions do not emit an * externally visible function. This makes extern inline behave as per gnu89 include/linux/stddef.h +0
-0
include/linux/stddef.h enum { · line 19
Quoted 7 lines
include/linux/stddef.h +0
-4@@ -13,11 +13,7 @@ enum { };#undef offsetof -#ifdef __compiler_offsetof -#define offsetof (TYPE ,MEMBER ) __compiler_offsetof(TYPE, MEMBER) -#else -#define offsetof (TYPE ,MEMBER ) ((size_t)&((TYPE *)0)->MEMBER)
RIP ((size_t)&((TYPE *)0)->MEMBER); you were beautiful in a way only a mother could love.
Quoted 8 lines
include/linux/stddef.h +1
-2-#endif +#define offsetof (TYPE ,MEMBER ) __builtin_offsetof(TYPE, MEMBER)/** * sizeof_field() - Report the size of a struct field in bytes -- 2.31.1
Signature · 2 lines
Thanks, ~Nick Desaulniers