From: reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 6 May 2006 00:32:27 +0000 (+0000)
Subject: 	PR c++/27423
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=4e99a3960fcbf30309d399f5c0ab1f22e6c3119c;p=pf3gnuchains%2Fgcc-fork.git

	PR c++/27423
	* typeck.c (convert_for_initialization): Skip erroneous types.

	* g++.dg/other/void2.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113571 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c24ed2aaeec..31e40dedf6a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-06  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/27423
+	* typeck.c (convert_for_initialization): Skip erroneous types.
+
 	PR c++/27422
 	* typeck.c (convert_arguments): Return early on args with
 	invalid types.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 7d3bd3a3f82..3eeb8375f1e 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -6219,7 +6219,8 @@ convert_for_initialization (tree exp, tree type, tree rhs, int flags,
       && codel != REFERENCE_TYPE)
     rhs = TREE_OPERAND (rhs, 0);
 
-  if (rhs == error_mark_node
+  if (type == error_mark_node
+      || rhs == error_mark_node
       || (TREE_CODE (rhs) == TREE_LIST && TREE_VALUE (rhs) == error_mark_node))
     return error_mark_node;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 500e64aa950..a51b52d0882 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-06  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/27423
+	* g++.dg/other/void2.C: New test.
+
 	PR c++/27422
 	* g++.dg/conversion/void1.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/other/void2.C b/gcc/testsuite/g++.dg/other/void2.C
new file mode 100644
index 00000000000..153e0f18122
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/void2.C
@@ -0,0 +1,5 @@
+// PR c++/27423
+// { dg-do compile }
+
+void foo(void = 0);    // { dg-error "incomplete type|invalid use" }
+void bar() { foo(); }