c++: lambda in DMI in class template [PR95870]
authorJason Merrill <jason@redhat.com>
Mon, 5 Apr 2021 15:34:48 +0000 (11:34 -0400)
committerJason Merrill <jason@redhat.com>
Mon, 5 Apr 2021 19:37:01 +0000 (15:37 -0400)
commit62d60246e53778db6ee613377dd013ba4b264968
tree05f4366d7d8b6d704f6e27515813b3773e639632
parent7ebdef2076fda56cb4cffb941f6c2576f980f3b3
c++: lambda in DMI in class template [PR95870]

Here enclosing_instantiation_of was failing to find a match because otctx is
struct S<T> and current_function_decl is S<int>::S(), so the latter has more
function contexts, and we end up trying to compare S() to NULL_TREE.

After spending a bit of time working on establishing the correspondence in
this case (class <=> constructor), it occurred to me that we could just use
DECL_SOURCE_LOCATION, which is unique for lambdas, since they cannot be
redeclared.  Since we're so close to release, for now I'm only doing this
for the case that was failing before.

gcc/cp/ChangeLog:

PR c++/95870
* pt.c (enclosing_instantiation_of): Compare DECL_SOURCE_LOCATION if
there is no enclosing non-lambda function.

gcc/testsuite/ChangeLog:

PR c++/95870
* g++.dg/cpp0x/lambda/lambda-nsdmi10.C: New test.
gcc/cp/pt.c
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nsdmi10.C [new file with mode: 0644]