From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 23 Jun 2014 17:05:33 +0000 (+0000)
Subject: DR 577 PR c++/33101
X-Git-Tag: releases/gcc-5.1.0~6717
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7402b3acc232144a730c5618d46b643eeae0f3e;p=thirdparty%2Fgcc.git

DR 577 PR c++/33101

/cp
2014-06-23  Paolo Carlini  <paolo.carlini@oracle.com>

	DR 577
	PR c++/33101
	* decl.c (grokparms): Accept a single parameter of type 'void'.

/testsuite
2014-06-23  Paolo Carlini  <paolo.carlini@oracle.com>

	DR 577
	PR c++/33101
	* g++.dg/other/void1.C: Adjust.
	* g++.dg/other/void3.C: Likewise.

From-SVN: r211906
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a8bc6336628e..1540c9742cdf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-23  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	DR 577
+	PR c++/33101
+	* decl.c (grokparms): Accept a single parameter of type 'void'.
+
 2014-06-20  Jason Merrill  <jason@redhat.com>
 
 	PR c++/59296
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a76980f928a9..b4d8b94feb1c 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 b6d09b366e4e..e8eab59ea82d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-23  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	DR 577
+	PR c++/33101
+	* g++.dg/other/void1.C: Adjust.
+	* g++.dg/other/void3.C: Likewise.
+
 2014-06-23  Marek Polacek  <polacek@redhat.com>
 
 	PR c/61553
diff --git a/gcc/testsuite/g++.dg/other/void1.C b/gcc/testsuite/g++.dg/other/void1.C
index 691e6f7824e9..3f6b1dbfe8ed 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> int foo(void);
-template<int> int bar(VOID);  // { dg-error "type|invalid use" }
+template<int> 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 3494d2aefdb3..48a6609915d9 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);