diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-12-06 22:48:39 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-12-06 22:48:39 +0000 |
| commit | 288b3981c84c0b077350cfc9492752ad4a560bf8 (patch) | |
| tree | 383e77ebc3159ea0e6c80956b6c19fd652bd4791 | |
| parent | d279e49d07bb09fd8ba5f5926ff819cd88aa7f7d (diff) | |
| download | gcc-288b3981c84c0b077350cfc9492752ad4a560bf8.tar.gz | |
PR c++/80259
* decl2.c (grokfield): Diagnose = delete redefinition of a friend.
* g++.dg/cpp0x/pr80259.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@255456 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr80259.C | 13 |
4 files changed, 35 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d8702e3bed9..9bfc72c361d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-12-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/80259 + * decl2.c (grokfield): Diagnose = delete redefinition of a friend. + 2017-12-06 Jason Merrill <jason@redhat.com> * call.c (convert_for_arg_passing): Pass NULL_TREE to diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 13e7b1d180a..2de36fa99bc 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -911,9 +911,18 @@ grokfield (const cp_declarator *declarator, { if (init == ridpointers[(int)RID_DELETE]) { - DECL_DELETED_FN (value) = 1; - DECL_DECLARED_INLINE_P (value) = 1; - DECL_INITIAL (value) = error_mark_node; + if (friendp && decl_defined_p (value)) + { + error ("redefinition of %q#D", value); + inform (DECL_SOURCE_LOCATION (value), + "%q#D previously defined here", value); + } + else + { + DECL_DELETED_FN (value) = 1; + DECL_DECLARED_INLINE_P (value) = 1; + DECL_INITIAL (value) = error_mark_node; + } } else if (init == ridpointers[(int)RID_DEFAULT]) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 176777e9d83..d7196733dd8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/80259 + * g++.dg/cpp0x/pr80259.C: New test. + 2017-12-06 David Malcolm <dmalcolm@redhat.com> PR c/83236 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr80259.C b/gcc/testsuite/g++.dg/cpp0x/pr80259.C new file mode 100644 index 00000000000..9d2a109bcf3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr80259.C @@ -0,0 +1,13 @@ +// PR c++/80259 +// { dg-do compile { target c++11 } } + +void foo () {} // { dg-message "previously defined here" } +void bar (); + +struct A +{ + friend void foo () = delete; // { dg-error "redefinition of" } + friend void bar () = delete; // { dg-message "previously defined here" } +}; + +void bar () {} // { dg-error "redefinition of" } |