OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR c++/78337 - ICE on invalid with generic lambda 

* semantics.c (process_outer_var_ref): Check if containing_function
	is null.  Move inform call under complain test.

From-SVN: r244340
This commit is contained in:
Jason Merrill 2017-01-11 16:43:42 -05:00 committed by Jason Merrill
parent 73e32c4743
commit 91d01bf40a
3 changed files with 42 additions and 4 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 @@
2017-01-11 Jason Merrill <jason@redhat.com>
PR c++/78337 - ICE on invalid with generic lambda
* semantics.c (process_outer_var_ref): Check if containing_function
is null. Move inform call under complain test.
2017-01-11 Nathan Sidwell <nathan@acm.org>
PR c++/77812

13
gcc/cp/semantics.c
View File

@ -3278,6 +3278,8 @@ process_outer_var_ref (tree decl, tsubst_flags_t complain)
2. a non-lambda function, or
3. a non-default capturing lambda function. */
while (context != containing_function
/* containing_function can be null with invalid generic lambdas. */
&& containing_function
&& LAMBDA_FUNCTION_P (containing_function))
{
tree closure = DECL_CONTEXT (containing_function);
@ -3365,10 +3367,13 @@ process_outer_var_ref (tree decl, tsubst_flags_t complain)
else
{
if (complain & tf_error)
error (VAR_P (decl)
? G_("use of local variable with automatic storage from containing function")
: G_("use of parameter from containing function"));
inform (DECL_SOURCE_LOCATION (decl), "%q#D declared here", decl);
{
error (VAR_P (decl)
? G_("use of local variable with automatic storage from "
"containing function")
: G_("use of parameter from containing function"));
inform (DECL_SOURCE_LOCATION (decl), "%q#D declared here", decl);
}
return error_mark_node;
}
return decl;

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

@ -0,0 +1,27 @@
// PR c++/78337
// { dg-do compile { target c++14 } }
struct X {
static constexpr int foo (int b) {
return b;
}
};
template<int>
using Void = void;
template<typename F,typename A>
auto
bar(F f, A a) -> decltype( ( f(a) , 0 ) ) // { dg-error "no match" }
{ return {}; }
int main() {
//constexpr
int f = 3;
(void)f;
auto l = [](auto of_type_X)->
Void<(decltype(of_type_X)::foo(f), 0)> // { dg-error "variable" }
{return;};
bar(l , X{}); // { dg-error "no match" }
}