From: Tom de Vries <tom@codesourcery.com>
Date: Sun, 4 Sep 2016 09:07:52 +0000 (+0000)
Subject: Revert "Replace error_at with assert in build_va_arg"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=21234eb5e8de8044809c0f2902bdaf217107073f;p=gcc.git

Revert "Replace error_at with assert in build_va_arg"

2016-09-04  Tom de Vries  <tom@codesourcery.com>

	revert:
	2016-08-29  Tom de Vries  <tom@codesourcery.com>

	* c-common.c (build_va_arg): Replace first argument type error
	with assert.

From-SVN: r239975
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 9dc1fdb5544..7a641403cda 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,11 @@
+2016-09-04  Tom de Vries  <tom@codesourcery.com>
+
+	revert:
+	2016-08-29  Tom de Vries  <tom@codesourcery.com>
+
+	* c-common.c (build_va_arg): Replace first argument type error
+	with assert.
+
 2016-09-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/65467
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 399ba975184..1a834a3735b 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5834,7 +5834,12 @@ build_va_arg (location_t loc, tree expr, tree type)
       /* Verify that &ap is still recognized as having va_list type.  */
       tree canon_expr_type
 	= targetm.canonical_va_list_type (TREE_TYPE (expr));
-      gcc_assert (canon_expr_type != NULL_TREE);
+      if (canon_expr_type == NULL_TREE)
+	{
+	  error_at (loc,
+		    "first argument to %<va_arg%> not of type %<va_list%>");
+	  return error_mark_node;
+	}
 
       return build_va_arg_1 (loc, type, expr);
     }
@@ -5902,7 +5907,12 @@ build_va_arg (location_t loc, tree expr, tree type)
       /* Verify that &ap is still recognized as having va_list type.  */
       tree canon_expr_type
 	= targetm.canonical_va_list_type (TREE_TYPE (expr));
-      gcc_assert (canon_expr_type != NULL_TREE);
+      if (canon_expr_type == NULL_TREE)
+	{
+	  error_at (loc,
+		    "first argument to %<va_arg%> not of type %<va_list%>");
+	  return error_mark_node;
+	}
     }
   else
     {