From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id E28E53854801; Thu, 29 Sep 2022 17:52:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E28E53854801 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664473940; bh=dkmfrWKsUk45SctJnaf02lOgV8fFSu3rb6zmPUZmsJY=; h=From:To:Subject:Date:From; b=pRjJXAfCYW1BNcGmwAfCIh5VcqsAceoOXWGfamlqyqoy4544z3/23sHoNX+79rugO CPLqQ4/tmbaYHypbFT4yS1FIdvk8ybTGEI3OyYKnzm0ajn3RUwCDpatMr/skT3v/FA 8D/FUyho+jwKlSCi8jPb5QS8C3wNivMmIZ5zodB0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2963] c++: reduce temporaries in ?: X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: af9034827e8f06f10767064e9fc7443b94e08184 X-Git-Newrev: 32b2eb59fb904926eff77811e08766a8ae6804a7 Message-Id: <20220929175220.E28E53854801@sourceware.org> Date: Thu, 29 Sep 2022 17:52:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:32b2eb59fb904926eff77811e08766a8ae6804a7 commit r13-2963-g32b2eb59fb904926eff77811e08766a8ae6804a7 Author: Jason Merrill Date: Mon Sep 19 19:08:10 2022 +0200 c++: reduce temporaries in ?: When the sides of ?: are class prvalues, we wrap the COND_EXPR in a TARGET_EXPR so that both sides will initialize the same temporary. But in this case we were stripping the outer TARGET_EXPR and conditionally creating different temporaries, unnecessarily using extra stack. The recently added TARGET_EXPR_NO_ELIDE flag avoids this. gcc/cp/ChangeLog: * call.cc (build_conditional_expr): Set TARGET_EXPR_NO_ELIDE on the outer TARGET_EXPR. gcc/testsuite/ChangeLog: * g++.dg/tree-ssa/cond-temp1.C: New test. Diff: --- gcc/cp/call.cc | 8 +++++++- gcc/testsuite/g++.dg/tree-ssa/cond-temp1.C | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index 3506b0fcfbb..9fad3cb950b 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -6009,7 +6009,13 @@ build_conditional_expr (const op_location_t &loc, but now we sometimes wrap them in NOP_EXPRs so the test would fail. */ if (CLASS_TYPE_P (TREE_TYPE (result))) - result = get_target_expr (result, complain); + { + result = get_target_expr (result, complain); + /* Tell gimplify_modify_expr_rhs not to strip this in + assignment context: we want both arms to initialize + the same temporary. */ + TARGET_EXPR_NO_ELIDE (result) = true; + } /* If this expression is an rvalue, but might be mistaken for an lvalue, we must add a NON_LVALUE_EXPR. */ result = rvalue (result); diff --git a/gcc/testsuite/g++.dg/tree-ssa/cond-temp1.C b/gcc/testsuite/g++.dg/tree-ssa/cond-temp1.C new file mode 100644 index 00000000000..b15635853f2 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/cond-temp1.C @@ -0,0 +1,16 @@ +// Test that the ?: only creates one temporary. +// { dg-additional-options "-fdump-tree-gimple" } +// { dg-final { scan-tree-dump-times "struct A" 2 "gimple" } } + +struct A +{ + int i; + A(int); +}; + +bool b; +int main() +{ + A a = 1; + a = b ? A(2) : A(3); +}