mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 10:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Unshare expressions from constexpr cache.

Browse Source 
Another place we need to unshare cached expressions.

	PR c++/92852 - ICE with generic lambda and reference var.
	* constexpr.c (maybe_constant_value): Likewise.
This commit is contained in:
Jason Merrill 2020-01-23 15:45:36 -05:00
parent 6ad405c430
commit 28a5d5c365
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2020-01-24 Jason Merrill <jason@redhat.com>
PR c++/92852 - ICE with generic lambda and reference var.
* constexpr.c (maybe_constant_value): Likewise.
2020-01-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/92804

2
gcc/cp/constexpr.c
View File

@ -6598,7 +6598,7 @@ maybe_constant_value (tree t, tree decl, bool manifestly_const_eval)
if (cv_cache == NULL)
cv_cache = hash_map<tree, tree>::create_ggc (101);
if (tree *cached = cv_cache->get (t))
return *cached;
return unshare_expr_without_location (*cached);
r = cxx_eval_outermost_constant_expr (t, true, true, false, false, decl);
gcc_checking_assert (r == t

12
gcc/testsuite/g++.dg/cpp1y/lambda-generic-ref1.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/92852
// { dg-do compile { target c++14 } }
struct S { int operator<<(const int &); } glob;
void foo()
{
S& message_stream = glob;
auto format = [&message_stream](auto && x)
{ message_stream << x ; };
format(3);
format(4u);
}

8
gcc/testsuite/g++.dg/cpp1z/decomp48.C
View File

@ -18,7 +18,7 @@ f2 ()
{
S v {1, 2};
auto& [s, t] = v; // { dg-warning "structured bindings only available with" "" { target c++14_down } }
return s; // { dg-warning "reference to local variable 'v' returned" "" { target *-*-* } .-1 }
return s; // { dg-warning "reference to local variable 'v' returned" }
}
int &
@ -33,7 +33,7 @@ f4 ()
{
int a[3] = {1, 2, 3};
auto& [s, t, u] = a; // { dg-warning "structured bindings only available with" "" { target c++14_down } }
return s; // { dg-warning "reference to local variable 'a' returned" "" { target *-*-* } .-1 }
return s; // { dg-warning "reference to local variable 'a' returned" }
}
int &
@ -78,7 +78,7 @@ f10 ()
{
S v {1, 2};
auto& [s, t] = v; // { dg-warning "structured bindings only available with" "" { target c++14_down } }
return &s; // { dg-warning "address of local variable 'v' returned" "" { target *-*-* } .-1 }
return &s; // { dg-warning "address of local variable 'v' returned" }
}
int *
@ -93,7 +93,7 @@ f12 ()
{
int a[3] = {1, 2, 3};
auto& [s, t, u] = a; // { dg-warning "structured bindings only available with" "" { target c++14_down } }
return &s; // { dg-warning "address of local variable 'a' returned" "" { target *-*-* } .-1 }
return &s; // { dg-warning "address of local variable 'a' returned" }
}
int *