Commit 598f0ac1 authored by David Laight's avatar David Laight Committed by Andrew Morton
Browse files

compiler.h: move __is_constexpr() to compiler.h 

Prior to f747e666 __is_constexpr() was in its only user minmax.h. 
That commit moved it to const.h - but that file just defines ULL(x) and
UL(x) so that constants can be defined for .S and .c files.

So apart from the word 'const' it wasn't really a good location.  Instead
move the definition to compiler.h just before the similar

  is_signed_type() and is_unsigned_type().

This may not be a good long-term home, but the three definitions belong
together.

Link: https://lkml.kernel.org/r/2a6680bbe2e84459816a113730426782@AcuMS.aculab.com


Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent fbd126f5

include/linux/compiler.h

+8 −0
Original line number Diff line number Diff line
@@ -227,6 +227,14 @@ static inline void *offset_to_ptr(const int *off) 
/* &a[0] degrades to a pointer: a different type from an array */

#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))



/*

 * This returns a constant expression while determining if an argument is

 * a constant expression, most importantly without evaluating the argument.

 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>

 */

#define __is_constexpr(x) \

	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



/*

 * Whether 'type' is a signed type or an unsigned type. Supports scalar types,

 * bool and also pointer types.

include/linux/const.h

+0 −8
Original line number Diff line number Diff line
@@ -3,12 +3,4 @@ 


#include <vdso/const.h>



/*

 * This returns a constant expression while determining if an argument is

 * a constant expression, most importantly without evaluating the argument.

 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>

 */

#define __is_constexpr(x) \

	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



#endif /* _LINUX_CONST_H */

tools/include/linux/compiler.h

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,14 @@ 
# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))

#endif



/*

 * This returns a constant expression while determining if an argument is

 * a constant expression, most importantly without evaluating the argument.

 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>

 */

#define __is_constexpr(x) \

	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



#ifdef __ANDROID__

/*

 * FIXME: Big hammer to get rid of tons of:

tools/include/linux/const.h

+0 −8
Original line number Diff line number Diff line
@@ -3,12 +3,4 @@ 


#include <vdso/const.h>



/*

 * This returns a constant expression while determining if an argument is

 * a constant expression, most importantly without evaluating the argument.

 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>

 */

#define __is_constexpr(x) \

	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



#endif /* _LINUX_CONST_H */