aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorVolker Reichelt <reichelt@igpm.rwth-aachen.de>2006-05-06 00:19:40 +0000
committerVolker Reichelt <reichelt@gcc.gnu.org>2006-05-06 00:19:40 +0000
commit6af455d7120a3a8235b8e75f60596d31b3af9817 (patch)
tree86f674b145535c0bd3c74d2d9e8587f74d58ae48 /gcc/cp
parentcd4677cc49f9088e9ba200add399b0886a7f762d (diff)
downloadgcc-6af455d7120a3a8235b8e75f60596d31b3af9817.zip
gcc-6af455d7120a3a8235b8e75f60596d31b3af9817.tar.gz
gcc-6af455d7120a3a8235b8e75f60596d31b3af9817.tar.bz2
re PR c++/27422 (ICE with invalid function argument)
PR c++/27422 * typeck.c (convert_arguments): Return early on args with invalid types. * g++.dg/conversion/void1.C: New test. From-SVN: r113568
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/typeck.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f423f4f..c24ed2a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+
+ PR c++/27422
+ * typeck.c (convert_arguments): Return early on args with
+ invalid types.
+
2006-05-03 Aldy Hernandez <aldyh@redhat.com>
PR/21391
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 78e3a2b..7d3bd3a 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -2704,7 +2704,7 @@ convert_arguments (tree typelist, tree values, tree fndecl, int flags)
tree type = typetail ? TREE_VALUE (typetail) : 0;
tree val = TREE_VALUE (valtail);
- if (val == error_mark_node)
+ if (val == error_mark_node || type == error_mark_node)
return error_mark_node;
if (type == void_type_node)