diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-20 20:36:46 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-20 20:36:46 +0000 |
| commit | 96ffae616b7fdaae8382209c08ae563d9b54c9f3 (patch) | |
| tree | de0972420f6b2c5a5876ceaa6452facf0d5e5ce3 | |
| parent | 8e2bb75b85fc5672724ae8a5abc631810d4649bf (diff) | |
PR c++/79519 - ICE with deleted template friend.
* decl.c (grokdeclarator): Complain about misplaced function
definition using =, as well.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@246291 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/deleted13.C | 12 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2797f8c7157..428e07ccb0b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-03-20 Jason Merrill <jason@redhat.com> + PR c++/79519 - ICE with deleted template friend. + * decl.c (grokdeclarator): Complain about misplaced function + definition using =, as well. + PR c++/79640 - infinite recursion with generic lambda. * pt.c (tsubst_copy) [VAR_DECL]: Register the dummy instantiation before substituting its initializer. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 0a9256680a0..516b93c3da9 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11365,9 +11365,9 @@ grokdeclarator (const cp_declarator *declarator, else if (TREE_CODE (type) == FUNCTION_TYPE) { if (current_class_type - && (!friendp || funcdef_flag)) + && (!friendp || funcdef_flag || initialized)) { - error (funcdef_flag + error (funcdef_flag || initialized ? G_("cannot define member function %<%T::%s%> " "within %<%T%>") : G_("cannot declare member function %<%T::%s%> " diff --git a/gcc/testsuite/g++.dg/cpp0x/deleted13.C b/gcc/testsuite/g++.dg/cpp0x/deleted13.C new file mode 100644 index 00000000000..f10551f9666 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/deleted13.C @@ -0,0 +1,12 @@ +// PR c++/79519 +// { dg-do compile { target c++11 } } + +struct A +{ + template<typename> void foo(); +}; + +struct B +{ + template<typename> friend void A::foo() = delete; // { dg-error "" } +}; |