procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Replace error_at with assert in build_va_arg"

Browse source 
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
This commit is contained in:
Tom de Vries 2016-09-04 09:07:52 +00:00 • committed by Tom de Vries
parent bcfbf31b40
commit 21234eb5e8
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/c-family/ChangeLog
View file

@ -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

14
gcc/c-family/c-common.c
View file

@ -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
{