From patchwork Thu Nov 18 10:25:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Monakov X-Patchwork-Id: 72072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A8BD4B71A9 for ; Thu, 18 Nov 2010 21:25:37 +1100 (EST) Received: (qmail 17973 invoked by alias); 18 Nov 2010 10:25:32 -0000 Received: (qmail 17953 invoked by uid 22791); 18 Nov 2010 10:25:30 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, FSL_RU_URL, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.ispras.ru (HELO smtp.ispras.ru) (83.149.198.201) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 18 Nov 2010 10:25:23 +0000 Received: from ispserv.ispras.ru (ispserv.ispras.ru [83.149.198.72]) by smtp.ispras.ru (Postfix) with ESMTP id 025CE5D40D0 for ; Thu, 18 Nov 2010 13:21:12 +0300 (MSK) Received: from monoid.intra.ispras.ru (winnie.ispras.ru [83.149.198.236]) by ispserv.ispras.ru (Postfix) with ESMTP id 42EFB3FC48 for ; Thu, 18 Nov 2010 13:25:20 +0300 (MSK) Date: Thu, 18 Nov 2010 13:25:20 +0300 (MSK) From: Alexander Monakov To: gcc-patches@gcc.gnu.org Subject: [committed] sel-sched: unbreak init_expr when building with CXX Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, When the type of expr_def.target_available changed from bool to signed char, the type of the corresponding parameter in init_expr was not updated. This breaks selective scheduler with --enable-build-with-cxx. I have also made a minor correction to usage of char type in fill_vec_av_set. Committed as obvious. 2010-11-18 Alexander Monakov PR middle-end/46518 * sel-sched-ir.c (init_expr): Use the correct type for target_available. * sel-sched.c (fill_vec_av_set): Use explicitly signed char type. diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index e169276..71c02c4 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -1595,7 +1595,7 @@ static void init_expr (expr_t expr, vinsn_t vi, int spec, int use, int priority, int sched_times, int orig_bb_index, ds_t spec_done_ds, ds_t spec_to_check_ds, int orig_sched_cycle, - VEC(expr_history_def, heap) *history, bool target_available, + VEC(expr_history_def, heap) *history, signed char target_available, bool was_substituted, bool was_renamed, bool needs_spec_check_p, bool cant_move) { diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 8550fcc..cb3c379 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -3735,7 +3735,7 @@ fill_vec_av_set (av_set_t av, blist_t bnds, fence_t fence, { expr_t expr = VEC_index (expr_t, vec_av_set, n); insn_t insn = EXPR_INSN_RTX (expr); - char target_available; + signed char target_available; bool is_orig_reg_p = true; int need_cycles, new_prio;