re PR c++/84348 (ICE with invalid friend declaration)

/cp
2018-02-19  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/84348
	* decl.c (grokdeclarator): Early return error_mark_node upon
	ill-formed friend declaration.

/testsuite
2018-02-19  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/84348
	* g++.dg/cpp0x/auto50.C: New.
	* g++.dg/parse/friend12.C: Adjust.

From-SVN: r257802

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 728c501ad556eab4594b56b074106fca2c5335a0..7ebd5ab0384806acbb539763145e1d565f058cb6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/84348
+       * decl.c (grokdeclarator): Early return error_mark_node upon
+       ill-formed friend declaration.
+
 2018-02-16  Marek Polacek  <polacek@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 15f7f1224627df4a51e118e63cdc38d591ddcea2..f91f311a117d81a9719c907854a3f2612edabf75 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12141,7 +12141,7 @@ grokdeclarator (const cp_declarator *declarator,
              {
                error ("%qE is neither function nor member function; "
                       "cannot be declared friend", unqualified_id);
-               friendp = 0;
+               return error_mark_node;
              }
            decl = NULL_TREE;
          }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 50643570f3df57e6394de2cd0efd0d0b08e21dd8..c91b26149f4b675c26874ce20b8a8aaa852ebb10 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/84348
+       * g++.dg/cpp0x/auto50.C: New.
+       * g++.dg/parse/friend12.C: Adjust.
+
 2018-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libgfortran/84389

diff --git a/gcc/testsuite/g++.dg/cpp0x/auto50.C b/gcc/testsuite/g++.dg/cpp0x/auto50.C
new file mode 100644 (file)
index 0000000..814892d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/auto50.C
@@ -0,0 +1,7 @@
+// PR c++/84348
+// { dg-do compile { target c++11 } }
+
+template<typename> struct A
+{
+  friend auto foo;  // { dg-error "cannot be declared friend" }
+};

diff --git a/gcc/testsuite/g++.dg/parse/friend12.C b/gcc/testsuite/g++.dg/parse/friend12.C
index 84d6e25e766c5273c74d3451df2061723c3a8cbc..d4e0ceea9ac2613a83c71fa7c19478e34da9bbde 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/friend12.C
+++ b/gcc/testsuite/g++.dg/parse/friend12.C
@@ -3,5 +3,4 @@
 struct A
 {
   friend int i = 0;  // { dg-error "cannot be declared friend" }
-// { dg-error "non-static data member" "" { target { ! c++11 } } .-1 }
 };