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

c++: Fix ICE with lambda in member operator (PR93279)

Browse source 
Here the problem was that we were remembering the lookup in template scope,
and then trying to reuse that lookup in the instantiation without
substituting into it at all.  The simplest solution is to not try to
remember a lookup that finds a class-scope declaration, as in that case
doing the normal lookup again at instantiation time will always find the
right declarations.

	PR c++/93279 - ICE with lambda in member operator.
	* name-lookup.c (maybe_save_operator_binding): Don't remember
	class-scope bindings.
This commit is contained in:
Jason Merrill 2020-01-24 18:20:56 -05:00
parent c671727004
commit 8b91e84813
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2020-01-24 Jason Merrill <jason@redhat.com>
PR c++/93279 - ICE with lambda in member operator.
* name-lookup.c (maybe_save_operator_binding): Don't remember
class-scope bindings.
2020-01-24 Jason Merrill <jason@redhat.com>
PR c++/93377 - ICE with member alias in constraint.

6
gcc/cp/name-lookup.c
View file

@ -7616,6 +7616,12 @@ maybe_save_operator_binding (tree e)
if (!fns && (fns = op_unqualified_lookup (fnname)))
{
tree fn = get_first_fn (fns);
if (DECL_CLASS_SCOPE_P (fn))
/* We don't need to remember class-scope functions, normal unqualified
lookup will find them again. */
return;
bindings = tree_cons (fnname, fns, bindings);
if (attr)
TREE_VALUE (attr) = bindings;

15
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template16.C Normal file
View file

@ -0,0 +1,15 @@
// PR c++/93279
// { dg-do compile { target c++11 } }
template <typename T> struct B { using f = int; };
template <typename T, int N> struct E {
template <typename U, typename B<E>::f = 0>
void operator*(U l) { [l](T m) { m * l; }; }
};
int
main ()
{
E<E<float, 4>, 1> n;
n * 4.f;
}