procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/81420 - not extending temporary lifetime.

Browse source 
* call.c (extend_ref_init_temps_1): Handle ARRAY_REF.
	* class.c (build_base_path): Avoid redundant move of an rvalue.

From-SVN: r260563
This commit is contained in:
Jason Merrill 2018-05-22 23:52:56 -04:00 • committed by Jason Merrill
parent 0d2e69cb3c
commit 3423a64d46
4 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
2018-05-22 Jason Merrill <jason@redhat.com>
PR c++/81420 - not extending temporary lifetime.
* call.c (extend_ref_init_temps_1): Handle ARRAY_REF.
* class.c (build_base_path): Avoid redundant move of an rvalue.
PR c++/85866 - error with .* in default template arg.
* pt.c (tsubst_copy_and_build): Handle partial instantiation.

4
gcc/cp/call.c
View file

@ -11061,7 +11061,9 @@ extend_ref_init_temps_1 (tree decl, tree init, vec<tree, va_gc> **cleanups)
if (TREE_CODE (sub) != ADDR_EXPR)
return init;
/* Deal with binding to a subobject. */
for (p = &TREE_OPERAND (sub, 0); TREE_CODE (*p) == COMPONENT_REF; )
for (p = &TREE_OPERAND (sub, 0);
(TREE_CODE (*p) == COMPONENT_REF
|| TREE_CODE (*p) == ARRAY_REF); )
p = &TREE_OPERAND (*p, 0);
if (TREE_CODE (*p) == TARGET_EXPR)
{

2
gcc/cp/class.c
View file

@ -426,7 +426,7 @@ build_base_path (enum tree_code code,
{
expr = cp_build_fold_indirect_ref (expr);
expr = build_simple_base_path (expr, binfo);
if (rvalue)
if (rvalue && lvalue_p (expr))
expr = move (expr);
if (want_pointer)
expr = build_address (expr);

19
gcc/testsuite/g++.dg/cpp0x/temp-extend1.C Normal file
View file

@ -0,0 +1,19 @@
// PR c++/81420
// { dg-do run { target c++11 } }
int d;
struct A
{
int i[2];
~A() { ++d; };
};
struct B: A {};
int main()
{
const int &r = B().i[0];
if (d != 0)
__builtin_abort();
}