aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/builtins.c5
-rw-r--r--gcc/testsuite/gcc.dg/noncompile/20040629-1.c7
3 files changed, 17 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be03295..a8fe360 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-29 Richard Henderson <rth@redhat.com>
+
+ PR middle-end/16216
+ * builtins.c (gimplify_va_arg_expr): Check for valist being
+ an error_mark_node.
+
2004-06-29 Jakub Jelinek <jakub@redhat.com>
PR target/16195
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 92a4dc3..74c1f98 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4466,9 +4466,12 @@ gimplify_va_arg_expr (tree *expr_p, tree *pre_p, tree *post_p)
tree t;
/* Verify that valist is of the proper type. */
-
want_va_type = va_list_type_node;
have_va_type = TREE_TYPE (valist);
+
+ if (have_va_type == error_mark_node)
+ return GS_ERROR;
+
if (TREE_CODE (want_va_type) == ARRAY_TYPE)
{
/* If va_list is an array type, the argument may have decayed
diff --git a/gcc/testsuite/gcc.dg/noncompile/20040629-1.c b/gcc/testsuite/gcc.dg/noncompile/20040629-1.c
new file mode 100644
index 0000000..3575b83
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/noncompile/20040629-1.c
@@ -0,0 +1,7 @@
+/* PR 16216 */
+
+void func()
+{
+ const char *pek; int i;
+ pek=__builtin_va_arg(ap,const char*); /* { dg-error "" } */
+}