* [PATCH] use C11's _Static_assert() for BUILD_BUG_ON etc when available
@ 2012-07-26 15:09 Jan Beulich
2012-07-26 15:32 ` Keir Fraser
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2012-07-26 15:09 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
This produces a more meaningful compiler diagnostic in case it happens
to trigger.
As a minor piece of cleanup, at once also use BUILD_BUG_ON_ZERO() to
actually define BUILD_BUG_ON() in the legacy case, slightly reducing
redundancy.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -14,14 +14,20 @@ void __warn(char *file, int line);
#define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0)
#define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(struct { int:-!!(condition); }))
+#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); })
/* Force a compilation error if condition is true, but also produce a
result (of value 0 and type size_t), so the expression can be used
e.g. in a structure initializer (or where-ever else comma expressions
aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_ZERO(cond) \
+ sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); })
+#else
+#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); })
+#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+#endif
#ifndef assert_failed
#define assert_failed(p) \
[-- Attachment #2: static-assert.patch --]
[-- Type: text/plain, Size: 1530 bytes --]
use C11's _Static_assert() for BUILD_BUG_ON etc when available
This produces a more meaningful compiler diagnostic in case it happens
to trigger.
As a minor piece of cleanup, at once also use BUILD_BUG_ON_ZERO() to
actually define BUILD_BUG_ON() in the legacy case, slightly reducing
redundancy.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -14,14 +14,20 @@ void __warn(char *file, int line);
#define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0)
#define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(struct { int:-!!(condition); }))
+#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); })
/* Force a compilation error if condition is true, but also produce a
result (of value 0 and type size_t), so the expression can be used
e.g. in a structure initializer (or where-ever else comma expressions
aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_ZERO(cond) \
+ sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); })
+#else
+#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); })
+#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+#endif
#ifndef assert_failed
#define assert_failed(p) \
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] use C11's _Static_assert() for BUILD_BUG_ON etc when available
2012-07-26 15:09 [PATCH] use C11's _Static_assert() for BUILD_BUG_ON etc when available Jan Beulich
@ 2012-07-26 15:32 ` Keir Fraser
0 siblings, 0 replies; 2+ messages in thread
From: Keir Fraser @ 2012-07-26 15:32 UTC (permalink / raw)
To: Jan Beulich, xen-devel
On 26/07/2012 16:09, "Jan Beulich" <JBeulich@suse.com> wrote:
> This produces a more meaningful compiler diagnostic in case it happens
> to trigger.
>
> As a minor piece of cleanup, at once also use BUILD_BUG_ON_ZERO() to
> actually define BUILD_BUG_ON() in the legacy case, slightly reducing
> redundancy.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
> --- a/xen/include/xen/lib.h
> +++ b/xen/include/xen/lib.h
> @@ -14,14 +14,20 @@ void __warn(char *file, int line);
> #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0)
> #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0)
>
> +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
> /* Force a compilation error if condition is true */
> -#define BUILD_BUG_ON(condition) ((void)sizeof(struct { int:-!!(condition);
> }))
> +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); })
>
> /* Force a compilation error if condition is true, but also produce a
> result (of value 0 and type size_t), so the expression can be used
> e.g. in a structure initializer (or where-ever else comma expressions
> aren't permitted). */
> -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> +#define BUILD_BUG_ON_ZERO(cond) \
> + sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); })
> +#else
> +#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); })
> +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
> +#endif
>
> #ifndef assert_failed
> #define assert_failed(p) \
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-26 15:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-26 15:09 [PATCH] use C11's _Static_assert() for BUILD_BUG_ON etc when available Jan Beulich
2012-07-26 15:32 ` Keir Fraser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).