From patchwork Tue Jun 21 12:04:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 101276 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 CCAB7B6F5D for ; Tue, 21 Jun 2011 22:04:47 +1000 (EST) Received: (qmail 3619 invoked by alias); 21 Jun 2011 12:04:44 -0000 Received: (qmail 3604 invoked by uid 22791); 21 Jun 2011 12:04:43 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RFC_ABUSE_POST X-Spam-Check-By: sourceware.org Received: from mail-qw0-f47.google.com (HELO mail-qw0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 21 Jun 2011 12:04:30 +0000 Received: by qwh5 with SMTP id 5so1741967qwh.20 for ; Tue, 21 Jun 2011 05:04:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.23.20 with SMTP id p20mr4916762qcb.197.1308657868747; Tue, 21 Jun 2011 05:04:28 -0700 (PDT) Received: by 10.229.231.206 with HTTP; Tue, 21 Jun 2011 05:04:28 -0700 (PDT) In-Reply-To: References: <4DE49EBE.30804@st.com> <4DE5115B.4070409@st.com> <4DE63846.7060405@st.com> <4DEC9699.4010102@st.com> <4DEF28F0.6080300@st.com> <4DFF4BD2.7060806@st.com> <4DFF5185.9040700@st.com> Date: Tue, 21 Jun 2011 14:04:28 +0200 Message-ID: Subject: Re: [PATH] PR/49139 fix always_inline failures diagnostics From: Richard Guenther To: Christian Bruel Cc: Rainer Orth , GCC Patches , Jan Hubicka X-IsSubscribed: yes 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 On Tue, Jun 21, 2011 at 1:11 PM, Richard Guenther wrote: > On Mon, Jun 20, 2011 at 3:56 PM, Christian Bruel wrote: >> On 06/20/2011 03:41 PM, Rainer Orth wrote: >>> >>> Christian Bruel  writes: >>> >>>> 2011-06-16  Christian Bruel >>>> >>>>        PR 49139/43654 >>> >>> Please use the correct PR number format here: >>> >>>        PR middle-end/49139 >>>         PR middle-end/43654 >>> >>> Otherwise the check-in notices don't get into the PRs. >> >> OK thanks, in fact I was referring to the file gcc.dg/pr43564.c (there was a >> typo in the number btw). But good indeed to send the notice into the >> original PR as well. > > The code now looks like > >  if (node->callees) >    { >      /* Redirecting edges might lead to a need for vops to be recomputed.  */ >      todo |= TODO_update_ssa_only_virtuals; >      todo = optimize_inline_calls (current_function_decl); >    } > > I have committed an obvious patch. Ick - that broke bootstrap. FIxing as follows. RIchard. 2011-06-21 Richard Guenther * ipa-inline-transform.c (inline_transform): Fix previous change. Index: gcc/ipa-inline-transform.c =================================================================== --- gcc/ipa-inline-transform.c (revision 175253) +++ gcc/ipa-inline-transform.c (working copy) @@ -364,13 +364,13 @@ inline_transform (struct cgraph_node *no timevar_push (TV_INTEGRATION); if (node->callees) - { - todo = optimize_inline_calls (current_function_decl); - /* Redirecting edges might lead to a need for vops to be recomputed. */ - todo |= TODO_update_ssa_only_virtuals; - } + todo = optimize_inline_calls (current_function_decl); timevar_pop (TV_INTEGRATION); + if (!(todo & TODO_update_ssa_any)) + /* Redirecting edges might lead to a need for vops to be recomputed. */ + todo |= TODO_update_ssa_only_virtuals; + cfun->always_inline_functions_inlined = true; cfun->after_inlining = true; return todo | execute_fixup_cfg ();