From patchwork Tue Nov 20 21:05:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Santos X-Patchwork-Id: 1775711 Return-Path: X-Original-To: patchwork-linux-sparse@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E8A6D3FCAE for ; Tue, 20 Nov 2012 21:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753645Ab2KTVGD (ORCPT ); Tue, 20 Nov 2012 16:06:03 -0500 Received: from nm24-vm0.access.bullet.mail.mud.yahoo.com ([66.94.236.143]:40539 "EHLO nm24-vm0.access.bullet.mail.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752997Ab2KTVFZ (ORCPT ); Tue, 20 Nov 2012 16:05:25 -0500 Received: from [66.94.237.196] by nm24.access.bullet.mail.mud.yahoo.com with NNFMP; 20 Nov 2012 21:05:23 -0000 Received: from [98.139.221.55] by tm7.access.bullet.mail.mud.yahoo.com with NNFMP; 20 Nov 2012 21:05:23 -0000 Received: from [127.0.0.1] by smtp108.sbc.mail.bf1.yahoo.com with NNFMP; 20 Nov 2012 21:05:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=att.net; s=s1024; t=1353445523; bh=Vod1vYZAGO3F6YOeuCM/vKDHNnxcZaxGdVUKIiZIdFo=; h=X-Yahoo-Newman-Id:Received:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=nExmgGzyIgvSb1S+3RXAqjCIeXmUoxfGRQwctZHexcM45EH8l2KAAIjYj4tb4ivbBdpAokNelpD9GiYE0HLOsrILvHXRxoxw9ql9RuelPw4TpbMd8i3dgBNhu+Nt4d5nKYs5YNKcQo80aJmTbUtsddGHIaFA5UdTl0Dnq14rlaI= X-Yahoo-Newman-Id: 725945.4524.bm@smtp108.sbc.mail.bf1.yahoo.com Received: from localhost.localdomain (danielfsantos@99.70.244.137 with login) by smtp108.sbc.mail.bf1.yahoo.com with SMTP; 20 Nov 2012 13:05:23 -0800 PST X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: YGdNuisVM1m6lpHqXyXLDfibIAi4mU6IX7GL.KjptKKBhi4 dzVvLug.cSjJsh4qWOXmUOaFoDlqYx5RDlxB0foqHobHv6JHoSVU5biciuNt JjHR6ox9aFV5Q58JbN_XzQgd129qgh6NgmGz2r.ysHh9GqnnUs6LoCoov9m9 y1ebP3xrXF9k6Q.qLyoq8HYj8cqKkJdYeJ0ot_grf69qqvklpMLDrCLZhtde YoYKPzukPnHWozypVr9Ivw3Ia6QWnbDWJ8Qhweqic2eXmIoBE_j9ZdMOX36T gKrwGrBgLFzaxv0WSQAJdMPb0LiRHiIjl1IcURgBXpIZfl0EjzMpE_9Zv8jM 4.kpKn6hqu2hT0hhxJvyWIijBjPQN1UA7qQxxILw2rWH0lcF7aDR7YFt0vSP OHxYzd7.PGEL_WmeZ1OzjcPjk6EA6IBipAQ_NLU2jvVXmeDWAgJcb X-Yahoo-SMTP: xXkkXk6swBBAi.5wfkIWFW3ugxbrqyhyk_b4Z25Sfu.XGQ-- From: danielfsantos@att.net To: LKML , Andi Kleen , Andrea Arcangeli , Andrew Morton , Borislav Petkov , Christopher Li , David Daney , David Rientjes , Joe Perches , Josh Triplett , linux-sparse@vger.kernel.org, Michel Lespinasse , Paul Gortmaker , Peter Zijlstra , Steven Rostedt Cc: Daniel Santos Subject: [PATCH v6 8/9] compiler.h, bug.h: Prevent double error messages with BUILD_BUG{, _ON} Date: Tue, 20 Nov 2012 15:05:06 -0600 Message-Id: <1353445507-7233-8-git-send-email-daniel.santos@pobox.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1353444132-6809-1-git-send-email-daniel.santos@pobox.com> References: <1353444132-6809-1-git-send-email-daniel.santos@pobox.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org Prior to the introduction of __attribute__((error("msg"))) in gcc 4.3, creating compile-time errors required a little trickery. BUILD_BUG{,_ON} uses this attribute when available to generate compile-time errors, but also uses the negative-sized array trick for older compilers, resulting in two error messages in some cases. The reason it's "some" cases is that as of gcc 4.4, the negative-sized array will not create an error in some situations, like inline functions. This patch replaces the negative-sized array code with the new __compiletime_error_fallback() macro which expands to the same thing unless the the error attribute is available, in which case it expands to do{}while(0), resulting in exactly one compile-time error on all versions of gcc. Note that we are not changing the negative-sized array code for the unoptimized version of BUILD_BUG_ON, since it has the potential to catch problems that would be disabled in later versions of gcc were __compiletime_error_fallback used. The reason is that that an unoptimized build can't always remove calls to an error-attributed function call (like we are using) that should effectively become dead code if it were optimized. However, using a negative-sized array with a similar value will not result in an false-positive (error). The only caveat being that it will also fail to catch valid conditions, which we should be expecting in an unoptimized build anyway. Signed-off-by: Daniel Santos Acked-by: Borislav Petkov --- include/linux/bug.h | 2 +- include/linux/compiler.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/linux/bug.h b/include/linux/bug.h index eb6d715..125e744 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -66,7 +66,7 @@ struct pt_regs; __compiletime_error("BUILD_BUG_ON failed"); \ if (__cond) \ __build_bug_on_failed(); \ - ((void)sizeof(char[1 - 2 * __cond])); \ + __compiletime_error_fallback(__cond); \ } while(0) #endif diff --git a/include/linux/compiler.h b/include/linux/compiler.h index cbf6d9d..8e5b9d5 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -298,7 +298,12 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); #endif #ifndef __compiletime_error # define __compiletime_error(message) +# define __compiletime_error_fallback(condition) \ + do { ((void)sizeof(char[1 - 2*!!(condition)])); } while (0) +#else +# define __compiletime_error_fallback(condition) do { } while (0) #endif + /* * Prevent the compiler from merging or refetching accesses. The compiler * is also forbidden from reordering successive instances of ACCESS_ONCE(),