From f838820125c2de6028a810f98dbeae02720519fa Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 23 Jun 2014 17:05:33 +0000 Subject: [PATCH] /cp 2014-06-23 Paolo Carlini DR 577 PR c++/33101 * decl.c (grokparms): Accept a single parameter of type 'void'. /testsuite 2014-06-23 Paolo Carlini DR 577 PR c++/33101 * g++.dg/other/void1.C: Adjust. * g++.dg/other/void3.C: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211906 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 9 +++------ gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/other/void1.C | 6 +++--- gcc/testsuite/g++.dg/other/void3.C | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a8bc633..1540c97 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-06-23 Paolo Carlini + + DR 577 + PR c++/33101 + * decl.c (grokparms): Accept a single parameter of type 'void'. + 2014-06-20 Jason Merrill PR c++/59296 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a76980f..b4d8b94 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11138,16 +11138,13 @@ grokparms (tree parmlist, tree *parms) type = TREE_TYPE (decl); if (VOID_TYPE_P (type)) { - if (type == void_type_node + if (same_type_p (type, void_type_node) && !init && !DECL_NAME (decl) && !result && TREE_CHAIN (parm) == void_list_node) - /* this is a parmlist of `(void)', which is ok. */ + /* DR 577: A parameter list consisting of a single + unnamed parameter of non-dependent type 'void'. */ break; - else if (typedef_variant_p (type)) - error_at (DECL_SOURCE_LOCATION (decl), - "invalid use of typedef-name %qT in " - "parameter declaration", type); else if (cv_qualified_p (type)) error_at (DECL_SOURCE_LOCATION (decl), "invalid use of cv-qualified type %qT in " diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b6d09b3..e8eab59 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-06-23 Paolo Carlini + + DR 577 + PR c++/33101 + * g++.dg/other/void1.C: Adjust. + * g++.dg/other/void3.C: Likewise. + 2014-06-23 Marek Polacek PR c/61553 diff --git a/gcc/testsuite/g++.dg/other/void1.C b/gcc/testsuite/g++.dg/other/void1.C index 691e6f7..3f6b1db 100644 --- a/gcc/testsuite/g++.dg/other/void1.C +++ b/gcc/testsuite/g++.dg/other/void1.C @@ -4,13 +4,13 @@ typedef void VOID; int foo(void); -int bar(VOID); // { dg-error "type|invalid use" } +int bar(VOID); template int foo(void); -template int bar(VOID); // { dg-error "type|invalid use" } +template int bar(VOID); struct A { int foo(void); - int bar(VOID); // { dg-error "type|invalid use" } + int bar(VOID); }; diff --git a/gcc/testsuite/g++.dg/other/void3.C b/gcc/testsuite/g++.dg/other/void3.C index 3494d2a..48a6609 100644 --- a/gcc/testsuite/g++.dg/other/void3.C +++ b/gcc/testsuite/g++.dg/other/void3.C @@ -1,4 +1,4 @@ // PR c++/33101 typedef void v; -typedef v (*pf)(v); // { dg-error "invalid use of typedef-name" } +typedef v (*pf)(v); -- 2.7.4