From patchwork Mon Nov 7 14:12:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Torvald Riegel X-Patchwork-Id: 124080 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 591011007D4 for ; Tue, 8 Nov 2011 01:15:13 +1100 (EST) Received: (qmail 27681 invoked by alias); 7 Nov 2011 14:15:10 -0000 Received: (qmail 27668 invoked by uid 22791); 7 Nov 2011 14:15:08 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_TM, TW_TX 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, 07 Nov 2011 14:14:47 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pA7EEkTI005664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Nov 2011 09:14:47 -0500 Received: from [10.36.5.84] (vpn1-5-84.ams2.redhat.com [10.36.5.84]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pA7EEiJx023331; Mon, 7 Nov 2011 09:14:45 -0500 Subject: [trans-mem] Fix instantiation of transaction expressions. From: Torvald Riegel To: GCC Patches Cc: Aldy Hernandez , Richard Henderson Date: Mon, 07 Nov 2011 15:12:14 +0100 Message-ID: <1320675134.18023.349.camel@triegel.csb> Mime-Version: 1.0 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 I stumbled upon this when working on noexcept. When txn expressions were processed in tsubst_expr(), the previous code incorrectly created empty transaction statements because no statements got added to the statement list used by (begin|finish)_transaction_stmt(). Also, "return __transaction_atomic (x+1);" incorrectly returned an error that this wouldn't return a value. With the patch, if RECUR(...) returns a value, then we assume that this is an expression and create a txn expression instead. No regressions for the TM tests, running a bootstrap currently. OK for branch? commit 437bd75328aa06561cb84f5e419431f979776115 Author: Torvald Riegel Date: Mon Nov 7 14:51:50 2011 +0100 Fix instantiation of transaction expressions. * cp/pt.c (tsubst_expr) [TRANSACTION_EXPR]: If body is not a statement, create an expression instead. * testsuite/g++.dg/tm/template-1.C: New. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b1593fe..6e6dcdb 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12960,6 +12960,16 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl, stmt = begin_transaction_stmt (input_location, NULL, flags); tmp = RECUR (TRANSACTION_EXPR_BODY (t)); + if (tmp) + { + /* No statements; handle this like an expression. */ + pop_stmt_list (TRANSACTION_EXPR_BODY (stmt)); + stmt = build1 (TRANSACTION_EXPR, TREE_TYPE (tmp), tmp); + TRANSACTION_EXPR_OUTER (stmt) = TRANSACTION_EXPR_OUTER (t); + TRANSACTION_EXPR_RELAXED (stmt) = TRANSACTION_EXPR_RELAXED (t); + SET_EXPR_LOCATION (stmt, EXPR_LOCATION (t)); + return stmt; + } finish_transaction_stmt (stmt, NULL, flags); } break; diff --git a/gcc/testsuite/g++.dg/tm/template-1.C b/gcc/testsuite/g++.dg/tm/template-1.C new file mode 100644 index 0000000..b93828a --- /dev/null +++ b/gcc/testsuite/g++.dg/tm/template-1.C @@ -0,0 +1,35 @@ +// { dg-do compile } +// { dg-options "-fgnu-tm -O -fdump-tree-tmmark" } + +struct TrueFalse +{ + static bool v() { return true; } +}; + +int global; + +template int foo() +{ + __transaction_atomic { global += 2; } + return __transaction_atomic (global + 1); +} + +template int bar() __transaction_atomic +{ + return global + 3; +} + +template void bar2() __transaction_atomic +{ + global += 4; +} + +int f1() +{ + bar2(); + return foo() + bar(); +} + +/* 4 transactions overall, two of the write to global: */ +/* { dg-final { scan-tree-dump-times "ITM_RU4\\s*\\(&global" 4 "tmmark" } } */ +/* { dg-final { scan-tree-dump-times "ITM_WU4\\s*\\(&global" 2 "tmmark" } } */