From: Richard Henderson <rth@redhat.com>
Date: Tue, 29 Jun 2004 23:10:53 +0000 (-0700)
Subject: re PR middle-end/16216 (ICE in gimplify_va_arg_expr after error)
X-Git-Tag: releases/gcc-4.0.0~7210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97bb4af77a4b0cd8b706ab24ad5ae61e2f0f90f5;p=thirdparty%2Fgcc.git

re PR middle-end/16216 (ICE in gimplify_va_arg_expr after error)

        PR middle-end/16216
        * builtins.c (gimplify_va_arg_expr): Check for valist being
        an error_mark_node.

From-SVN: r83881
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be03295f9c6b..a8fe36088013 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 92a4dc3b2f7e..74c1f98c69f7 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 000000000000..3575b839e014
--- /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 "" } */
+}