From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYdOR-0006gA-Cq for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:43:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYdOQ-0000Dx-1w for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:43:03 -0500 Received: from mail.kernel.org ([198.145.29.136]:37734) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cYdOP-0000DB-S6 for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:43:01 -0500 Date: Tue, 31 Jan 2017 20:42:57 +0200 From: "Michael S. Tsirkin" Message-ID: <1485888144-16531-6-git-send-email-mst@redhat.com> References: <1485888144-16531-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485888144-16531-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v4 05/23] compiler: rework BUG_ON using a struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eric Blake , Markus Armbruster , Paolo Bonzini There are theoretical concerns that some compilers might not trigger build failures on attempts to define an array of size (x ? -1 : 1) where x is a variable and make it a variable sized array instead. Let rewrite using a struct with a negative bit field size instead as there are no dynamic bit field sizes. This is similar to what Linux does. Signed-off-by: Michael S. Tsirkin Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- include/qemu/compiler.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 77b9ce3..057639a 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -85,10 +85,14 @@ #define typeof_field(type, field) typeof(((type *)0)->field) #define type_check(t1,t2) ((t1*)0 - (t2*)0) +#define QEMU_BUILD_BUG_ON_STRUCT(x) \ + struct { \ + int:(x) ? -1 : 1; \ + } + #ifdef __COUNTER__ -#define QEMU_BUILD_BUG_ON(x) \ - typedef char glue(qemu_build_bug_on__, __COUNTER__)[(x) ? -1 : 1] \ - __attribute__((unused)) +#define QEMU_BUILD_BUG_ON(x) typedef QEMU_BUILD_BUG_ON_STRUCT(x) \ + glue(qemu_build_bug_on__, __COUNTER__) __attribute__((unused)) #else #define QEMU_BUILD_BUG_ON(x) #endif -- MST