From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1083 invoked by alias); 6 Aug 2014 17:20: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 32704 invoked by uid 89); 6 Aug 2014 17:19:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS 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; Wed, 06 Aug 2014 17:19:54 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s76HJpux012523 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:51 -0400 Received: from c64.redhat.com (vpn-239-139.phx2.redhat.com [10.3.239.139]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s76HJ2p0030913; Wed, 6 Aug 2014 13:19:51 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 084/236] internal-fn.c: Use rtx_insn and rtx_code_label Date: Wed, 06 Aug 2014 17:20:00 -0000 Message-Id: <1407345815-14551-85-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> References: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00513.txt.bz2 gcc/ * internal-fn.c (ubsan_expand_si_overflow_addsub_check): Strengthen locals "done_label", "do_error" from rtx to rtx_code_label *. (ubsan_expand_si_overflow_addsub_check): Strengthen local "last" from rtx to rtx_insn *. Strengthen local "sub_check from rtx to rtx_code_label *. (ubsan_expand_si_overflow_neg_check): Likewise for locals "done_label", "do_error" to rtx_code_label * and local "last" to rtx_insn *. (ubsan_expand_si_overflow_mul_check): Likewise for locals "done_label", "do_error", "large_op0", "small_op0_large_op1", "one_small_one_large", "both_ops_large", "after_hipart_neg", "after_lopart_neg", "do_overflow", "hipart_different" to rtx_code_label * and local "last" to rtx_insn *. --- gcc/internal-fn.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c index 68b2b66..ba97c10 100644 --- a/gcc/internal-fn.c +++ b/gcc/internal-fn.c @@ -167,7 +167,8 @@ ubsan_expand_si_overflow_addsub_check (tree_code code, gimple stmt) { rtx res, op0, op1; tree lhs, fn, arg0, arg1; - rtx done_label, do_error, target = NULL_RTX; + rtx_code_label *done_label, *do_error; + rtx target = NULL_RTX; lhs = gimple_call_lhs (stmt); arg0 = gimple_call_arg (stmt, 0); @@ -187,7 +188,7 @@ ubsan_expand_si_overflow_addsub_check (tree_code code, gimple stmt) if (icode != CODE_FOR_nothing) { struct expand_operand ops[4]; - rtx last = get_last_insn (); + rtx_insn *last = get_last_insn (); res = gen_reg_rtx (mode); create_output_operand (&ops[0], res, mode); @@ -213,7 +214,7 @@ ubsan_expand_si_overflow_addsub_check (tree_code code, gimple stmt) if (icode == CODE_FOR_nothing) { - rtx sub_check = gen_label_rtx (); + rtx_code_label *sub_check = gen_label_rtx (); int pos_neg = 3; /* Compute the operation. On RTL level, the addition is always @@ -315,7 +316,8 @@ ubsan_expand_si_overflow_neg_check (gimple stmt) { rtx res, op1; tree lhs, fn, arg1; - rtx done_label, do_error, target = NULL_RTX; + rtx_code_label *done_label, *do_error; + rtx target = NULL_RTX; lhs = gimple_call_lhs (stmt); arg1 = gimple_call_arg (stmt, 1); @@ -333,7 +335,7 @@ ubsan_expand_si_overflow_neg_check (gimple stmt) if (icode != CODE_FOR_nothing) { struct expand_operand ops[3]; - rtx last = get_last_insn (); + rtx_insn *last = get_last_insn (); res = gen_reg_rtx (mode); create_output_operand (&ops[0], res, mode); @@ -391,7 +393,8 @@ ubsan_expand_si_overflow_mul_check (gimple stmt) { rtx res, op0, op1; tree lhs, fn, arg0, arg1; - rtx done_label, do_error, target = NULL_RTX; + rtx_code_label *done_label, *do_error; + rtx target = NULL_RTX; lhs = gimple_call_lhs (stmt); arg0 = gimple_call_arg (stmt, 0); @@ -411,7 +414,7 @@ ubsan_expand_si_overflow_mul_check (gimple stmt) if (icode != CODE_FOR_nothing) { struct expand_operand ops[4]; - rtx last = get_last_insn (); + rtx_insn *last = get_last_insn (); res = gen_reg_rtx (mode); create_output_operand (&ops[0], res, mode); @@ -469,14 +472,14 @@ ubsan_expand_si_overflow_mul_check (gimple stmt) else if (hmode != BLKmode && 2 * GET_MODE_PRECISION (hmode) == GET_MODE_PRECISION (mode)) { - rtx large_op0 = gen_label_rtx (); - rtx small_op0_large_op1 = gen_label_rtx (); - rtx one_small_one_large = gen_label_rtx (); - rtx both_ops_large = gen_label_rtx (); - rtx after_hipart_neg = gen_label_rtx (); - rtx after_lopart_neg = gen_label_rtx (); - rtx do_overflow = gen_label_rtx (); - rtx hipart_different = gen_label_rtx (); + rtx_code_label *large_op0 = gen_label_rtx (); + rtx_code_label *small_op0_large_op1 = gen_label_rtx (); + rtx_code_label *one_small_one_large = gen_label_rtx (); + rtx_code_label *both_ops_large = gen_label_rtx (); + rtx_code_label *after_hipart_neg = gen_label_rtx (); + rtx_code_label *after_lopart_neg = gen_label_rtx (); + rtx_code_label *do_overflow = gen_label_rtx (); + rtx_code_label *hipart_different = gen_label_rtx (); unsigned int hprec = GET_MODE_PRECISION (hmode); rtx hipart0 = expand_shift (RSHIFT_EXPR, mode, op0, hprec, -- 1.8.5.3