From 1a9f989a29b9c6c3d279ef1df00badc9a85d5d97 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 9 May 2018 16:17:36 +0000 Subject: [PATCH] re PR c++/85713 (ICE in dependent_type_p, at cp/pt.c:24582 on valid code) /cp 2018-05-09 Paolo Carlini PR c++/85713 Revert: 2018-05-08 Paolo Carlini PR c++/84588 * parser.c (cp_parser_parameter_declaration_list): When the entire parameter-declaration-list is erroneous maybe call abort_fully_implicit_template. /testsuite 2018-05-09 Paolo Carlini PR c++/85713 Revert: 2018-05-08 Paolo Carlini PR c++/84588 * g++.dg/cpp1y/pr84588.C: New. From-SVN: r260086 --- gcc/cp/ChangeLog | 11 +++++++++++ gcc/cp/parser.c | 2 -- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/g++.dg/cpp1y/pr84588.C | 10 ---------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bf56581327c..98249e9696f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2018-05-09 Paolo Carlini + + PR c++/85713 + Revert: + 2018-05-08 Paolo Carlini + + PR c++/84588 + * parser.c (cp_parser_parameter_declaration_list): When the + entire parameter-declaration-list is erroneous maybe call + abort_fully_implicit_template. + 2018-05-08 Jason Merrill PR c++/85706 - class deduction under decltype diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 59829f3a7fe..f8ecf030c0d 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -21344,8 +21344,6 @@ cp_parser_parameter_declaration_list (cp_parser* parser, bool *is_error) { *is_error = true; parameters = error_mark_node; - if (parser->fully_implicit_function_template_p) - abort_fully_implicit_template (parser); break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bbdc8b2aa5f..6f1c39526a5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2018-05-09 Paolo Carlini + + PR c++/85713 + Revert: + 2018-05-08 Paolo Carlini + + PR c++/84588 + * g++.dg/cpp1y/pr84588.C: New. + 2018-05-09 Andreas Schwab * gcc.target/aarch64/sve/vcond_6.c: Add missing brace. diff --git a/gcc/testsuite/g++.dg/cpp1y/pr84588.C b/gcc/testsuite/g++.dg/cpp1y/pr84588.C index 9d7f9027b45..e69de29bb2d 100644 --- a/gcc/testsuite/g++.dg/cpp1y/pr84588.C +++ b/gcc/testsuite/g++.dg/cpp1y/pr84588.C @@ -1,10 +0,0 @@ -// { dg-do compile { target c++14 } } -// { dg-options "-w" } - -struct a { - void b() {} - void c(auto = [] { - if (a a(int auto){}) // { dg-error "two or more data types" } - ; - }) {} -}; -- 2.30.2