re PR c++/85713 (ICE in dependent_type_p, at cp/pt.c:24582 on valid code)

/cp
2018-05-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/85713
	Revert:
	2018-05-08  Paolo Carlini  <paolo.carlini@oracle.com>

	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  <paolo.carlini@oracle.com>

	PR c++/85713
	Revert:
	2018-05-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/84588
	* g++.dg/cpp1y/pr84588.C: New.

From-SVN: r260086

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bf56581327ca91760ca2f62222ac0634777435c1..98249e9696fa44bad01efbbbba9b8be4c2e7db60 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2018-05-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/85713
+       Revert:
+       2018-05-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       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  <jason@redhat.com>
 
        PR c++/85706 - class deduction under decltype

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 59829f3a7fed0486202c891f0d86389a2672f087..f8ecf030c0d8bd2e88c1bcc39c85740717e0c287 100644 (file)
--- 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 bbdc8b2aa5f0e2a6de9074cf35861c05597f349a..6f1c39526a52d8a1cf5bc4607fab7d28e2b126f7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/85713
+       Revert:
+       2018-05-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/84588
+       * g++.dg/cpp1y/pr84588.C: New.
+
 2018-05-09  Andreas Schwab  <schwab@suse.de>
 
        * 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 9d7f9027b4588add34755455b460d0cc279df1a4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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" }
-      ;
-  }) {}
-};