From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19997 invoked by alias); 10 Dec 2015 15:25:02 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 19772 invoked by uid 89); 10 Dec 2015 15:25:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 10 Dec 2015 15:24:56 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id D23BB1A65DC for ; Thu, 10 Dec 2015 15:24:54 +0000 (UTC) Received: from c64.redhat.com (vpn-236-116.phx2.redhat.com [10.3.236.116]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBAFOsOC018078; Thu, 10 Dec 2015 10:24:54 -0500 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [committed 1/5] Fix -Wmisleading-indentation warning in function.c Date: Thu, 10 Dec 2015 15:25:00 -0000 Message-Id: <1449762259-37055-1-git-send-email-dmalcolm@redhat.com> In-Reply-To: <5632597B.2020205@redhat.com> References: <5632597B.2020205@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2015-12/txt/msg01147.txt.bz2 Fix this warning: ../../../src/gcc/function.c: In function ‘void locate_and_pad_parm(machine_mode, tree, int, int, int, tree, args_size*, locate_and_pad_arg_data*)’: ../../../src/gcc/function.c:4123:2: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] { ^ ../../../src/gcc/function.c:4119:7: note: ...this ‘if’ clause, but it is not if (initial_offset_ptr->var) ^ [This warning would have been suppressed by the blank-lines heuristic from: https://gcc.gnu.org/ml/gcc-patches/2015-12/msg01011.html ] Preapproved by Jeff in: https://gcc.gnu.org/ml/gcc-patches/2015-10/msg03246.html Bootstrapped®rtested on x86_64-pc-linux-gnu. Committed to trunk as r231518. gcc/ChangeLog: * function.c (locate_and_pad_parm): Fix indentation. --- gcc/function.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/function.c b/gcc/function.c index b513ead..035a49e 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4181,14 +4181,14 @@ locate_and_pad_parm (machine_mode passed_mode, tree type, int in_regs, locate->slot_offset.var = size_binop (MINUS_EXPR, ssize_int (0), initial_offset_ptr->var); - { - tree s2 = sizetree; - if (where_pad != none - && (!tree_fits_uhwi_p (sizetree) - || (tree_to_uhwi (sizetree) * BITS_PER_UNIT) % round_boundary)) - s2 = round_up (s2, round_boundary / BITS_PER_UNIT); - SUB_PARM_SIZE (locate->slot_offset, s2); - } + { + tree s2 = sizetree; + if (where_pad != none + && (!tree_fits_uhwi_p (sizetree) + || (tree_to_uhwi (sizetree) * BITS_PER_UNIT) % round_boundary)) + s2 = round_up (s2, round_boundary / BITS_PER_UNIT); + SUB_PARM_SIZE (locate->slot_offset, s2); + } locate->slot_offset.constant += part_size_in_regs; -- 1.8.5.3