diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-02-19 08:49:30 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-02-19 08:49:30 +0000 |
| commit | 50dbbe535766405327cdf4cf6712a633a87966e0 (patch) | |
| tree | be284e3b84238050a116cefb55ad4f8b4ac14894 | |
| parent | 9f88a07b85a2922ab1d7ae8ec02b18aa739af32a (diff) | |
| download | gcc-50dbbe535766405327cdf4cf6712a633a87966e0.zip gcc-50dbbe535766405327cdf4cf6712a633a87966e0.tar.gz gcc-50dbbe535766405327cdf4cf6712a633a87966e0.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto50.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/friend12.C | 1 |
5 files changed, 20 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 728c501..7ebd5ab 100644 --- 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 15f7f12..f91f311 100644 --- 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 5064357..c91b261 100644 --- 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 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 84d6e25..d4e0cee 100644 --- 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 } }; |