From patchwork Wed Oct 24 16:33:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Santos X-Patchwork-Id: 1639641 Return-Path: X-Original-To: patchwork-linux-sparse@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AD1B4DFB7E for ; Wed, 24 Oct 2012 16:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935297Ab2JXQkZ (ORCPT ); Wed, 24 Oct 2012 12:40:25 -0400 Received: from nm25-vm0.access.bullet.mail.sp2.yahoo.com ([98.139.44.184]:36764 "EHLO nm25-vm0.access.bullet.mail.sp2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935273Ab2JXQkU (ORCPT ); Wed, 24 Oct 2012 12:40:20 -0400 Received: from [98.139.44.99] by nm25.access.bullet.mail.sp2.yahoo.com with NNFMP; 24 Oct 2012 16:34:18 -0000 Received: from [67.195.14.108] by tm4.access.bullet.mail.sp2.yahoo.com with NNFMP; 24 Oct 2012 16:34:18 -0000 Received: from [127.0.0.1] by smtp105.sbc.mail.gq1.yahoo.com with NNFMP; 24 Oct 2012 16:34:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=att.net; s=s1024; t=1351096458; bh=yCbJERgLNwtP7m/gMZrP7bDLYoUIXPalTxZ3nxPm71Y=; h=X-Yahoo-Newman-Id:Received:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=EwIh6owc3TJAutKG78WWcJfPeqhxnqocDVpOzCALp1/PDemm7IDFrplk8tGrkuFl5ZzlvklUScefnDIkaCuEeaaWfXiNVrpHIXFf+8PNjwmMLWyecFb01Y1zTTBkwk5mf7A08H9DmudxyF9MUyew8mkqcnMJSTEl2ck3kmsI2ac= X-Yahoo-Newman-Id: 844284.79197.bm@smtp105.sbc.mail.gq1.yahoo.com Received: from localhost.localdomain (danielfsantos@99.70.244.137 with login) by smtp105.sbc.mail.gq1.yahoo.com with SMTP; 24 Oct 2012 09:34:18 -0700 PDT X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: HoKQw_0VM1kxOeOrWggTlGV5lYZti3V6lK1mDuqpLXmg36i 1nwNX7kjocGgmF6tLOeMKB6oBX0TNstX9wqZv24ethRQxMh16v8lbuXZcS10 _eIeTuyi3SW6ANxxapBUuOtMhQT2pKUOdEpszAVqiFXU2aLA56evKPHEXYeZ jbRlfqXUnzict_Mc3QGNULkw_qbzWK_CoA5grbGpuXqiDSMLwypm5yTB02mC .D7ILe3h4v1WDBBGhxw.ghHETpZYEVGlDEFkIgMd6lraNyYff8yFR4UYt1aN GTyPTtYJmJlgLNjsQgdvZsvarN0B5zkeKfF8JaERJpzrnlE8DGRdth82ZgKj wssQM9QuRMuttRZOwG8s_awx70AOmM2IBdc8kuY_djJMlHdCp.Rd2cVF17B8 02G.qDEuOyi4ofb1JdSrKtpAbFyEW84eX8f71O346eiH5uU6CzUtX X-Yahoo-SMTP: xXkkXk6swBBAi.5wfkIWFW3ugxbrqyhyk_b4Z25Sfu.XGQ-- From: danielfsantos@att.net To: LKML , Andi Kleen , Andrea Arcangeli , Andrew Morton , Christopher Li , Daniel Santos , David Daney , David Howells , Joe Perches , Josh Triplett , Konstantin Khlebnikov , linux-sparse@vger.kernel.org, Michel Lespinasse , Paul Gortmaker , Pavel Pisa , Peter Zijlstra , Steven Rostedt , Borislav Petkov , David Rientjes Subject: [PATCH v3 07/10] compiler.h, bug.h: Prevent double error messages with BUILD_BUG{, _ON} Date: Wed, 24 Oct 2012 11:33:58 -0500 Message-Id: <1351096441-12388-7-git-send-email-daniel.santos@pobox.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1351096132-12244-1-git-send-email-daniel.santos@pobox.com> References: <1351096132-12244-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. Signed-off-by: Daniel Santos --- include/linux/bug.h | 4 ++-- include/linux/compiler.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/bug.h b/include/linux/bug.h index 3d4b564..f8eae31 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -56,13 +56,13 @@ struct pt_regs; * link-time error, which is harder to track down. */ #ifndef __OPTIMIZE__ -#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) +#define BUILD_BUG_ON(condition) __compiletime_error_fallback(condition) #else #define BUILD_BUG_ON(condition) \ do { \ extern void __build_bug_on_failed(void) \ __compiletime_error("BUILD_BUG_ON failed"); \ - ((void)sizeof(char[1 - 2*!!(condition)])); \ + __compiletime_error_fallback(condition); \ if (condition) \ __build_bug_on_failed(); \ } while(0) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index cbf6d9d..84926f2 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -298,6 +298,13 @@ 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) +#endif +#ifndef __compiletime_error_fallback +# define __compiletime_error_fallback(condition) do { } while (0) #endif /* * Prevent the compiler from merging or refetching accesses. The compiler