From patchwork Mon Oct 31 19:44:21 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Aldy Hernandez <aldyh@redhat.com>
X-Patchwork-Id: 122929
Return-Path: 
 <gcc-patches-return-306078-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 341D6B6F87
	for <incoming@patchwork.ozlabs.org>;
	Tue,  1 Nov 2011 06:44:39 +1100 (EST)
Received: (qmail 18714 invoked by alias); 31 Oct 2011 19:44:37 -0000
Received: (qmail 18693 invoked by uid 22791); 31 Oct 2011 19:44:35 -0000
X-SWARE-Spam-Status: No, hits=-7.0 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Mon, 31 Oct 2011 19:44:22 +0000
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])	by
	mx1.redhat.com (8.14.4/8.14.4) with ESMTP id
	p9VJiM7e013605	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA
	bits=256 verify=OK); Mon, 31 Oct 2011 15:44:22 -0400
Received: from houston.quesejoda.com (vpn-224-82.phx2.redhat.com
	[10.3.224.82])	by int-mx09.intmail.prod.int.phx2.redhat.com
	(8.14.4/8.14.4) with ESMTP id p9VJiLSD000843;
	Mon, 31 Oct 2011 15:44:21 -0400
Message-ID: <4EAEFA95.8040402@redhat.com>
Date: Mon, 31 Oct 2011 14:44:21 -0500
From: Aldy Hernandez <aldyh@redhat.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:7.0) Gecko/20110927 Thunderbird/7.0
MIME-Version: 1.0
To: Patrick Marlier <patrick.marlier@gmail.com>
CC: GCC Patches <gcc-patches@gcc.gnu.org>, Richard Henderson <rth@redhat.com>,
	Torvald Riegel <triegel@redhat.com>
Subject: Re: [trans-mem] Fix tm_pure not inlinable in tm_safe
References: <4EAEEEF0.3020006@gmail.com> <4EAEF536.1080700@redhat.com>
	<4EAEF81F.1000104@gmail.com>
In-Reply-To: <4EAEF81F.1000104@gmail.com>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

> It does on my side:
>
> === g++ Summary ===
> # of expected passes 122
>
> I have no other change over the source.

Woah!!!! I hereby profess my love for Richard and Patrick.  That didn't 
sound, right, but whatever...  During the weekend they apparently fixed 
the rest of the bug I've been working on all morning.

Yay!!! With this patch we have ironed out all the C++ regressions.

Thanks and sorry for the duplicate work.

Committing to branch.
* ipa-inline.c (can_inline_edge_p): Do not inline TM safe calling
	TM pure functions.

Index: ipa-inline.c
===================================================================
--- ipa-inline.c	(revision 180710)
+++ ipa-inline.c	(working copy)
@@ -291,8 +291,7 @@ can_inline_edge_p (struct cgraph_edge *e
 	   && is_tm_safe (e->caller->decl))
     {
       e->inline_failed = CIF_UNSPECIFIED;
-      gimple_call_set_cannot_inline (e->call_stmt, true);
-      return false;
+      inlinable = false;
     }
   /* Don't inline if the callee can throw non-call exceptions but the
      caller cannot.