OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make canonical_va_list_type more strict 

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

	PR C/71602
	* builtins.c (std_canonical_va_list_type): Strictly return non-null for
	va_list type only.
	* config/i386/i386.c (ix86_canonical_va_list_type): Same.
	* gimplify.c (gimplify_va_arg_expr): Handle &va_list.

	* c-common.c (build_va_arg): Handle more strict
	targetm.canonical_va_list_type.  Replace first argument type error with
	assert.

	* c-c++-common/va-arg-va-list-type.c: New test.

From-SVN: r240072
This commit is contained in:
Tom de Vries 2016-09-10 14:38:56 +00:00 committed by Tom de Vries
parent af4b8a5233
commit 5b28efbbf4
8 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2016-09-10 Tom de Vries <tom@codesourcery.com>
PR C/71602
* builtins.c (std_canonical_va_list_type): Strictly return non-null for
va_list type only.
* config/i386/i386.c (ix86_canonical_va_list_type): Same.
* gimplify.c (gimplify_va_arg_expr): Handle &va_list.
2016-09-09 Peter Bergner <bergner@vnet.ibm.com>
PR rtl-optimization/77289

4
gcc/builtins.c
View File

@ -4087,10 +4087,6 @@ std_canonical_va_list_type (tree type)
{
tree wtype, htype;
if (INDIRECT_REF_P (type))
type = TREE_TYPE (type);
else if (POINTER_TYPE_P (type) && POINTER_TYPE_P (TREE_TYPE (type)))
type = TREE_TYPE (type);
wtype = va_list_type_node;
htype = type;
/* Treat structure va_list types. */

7
gcc/c-family/ChangeLog
View File

@ -1,3 +1,10 @@
2016-09-10 Tom de Vries <tom@codesourcery.com>
PR C/71602
* c-common.c (build_va_arg): Handle more strict
targetm.canonical_va_list_type. Replace first argument type error with
assert.
2016-09-09 Martin Sebor <msebor@redhat.com>
PR c/77520

20
gcc/c-family/c-common.c
View File

@ -5864,20 +5864,11 @@ build_va_arg (location_t loc, tree expr, tree type)
{
/* Case 1: Not an array type. */
/* Take the address, to get '&ap'. */
/* Take the address, to get '&ap'. Note that &ap is not a va_list
type. */
mark_addressable (expr);
expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (expr)), expr);
/* Verify that &ap is still recognized as having va_list type. */
tree canon_expr_type
= targetm.canonical_va_list_type (TREE_TYPE (expr));
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);
}
@ -5944,12 +5935,7 @@ 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));
if (canon_expr_type == NULL_TREE)
{
error_at (loc,
"first argument to %<va_arg%> not of type %<va_list%>");
return error_mark_node;
}
gcc_assert (canon_expr_type != NULL_TREE);
}
else
{

8
gcc/config/i386/i386.c
View File

@ -48562,14 +48562,6 @@ ix86_fn_abi_va_list (tree fndecl)
static tree
ix86_canonical_va_list_type (tree type)
{
/* Resolve references and pointers to va_list type. */
if (TREE_CODE (type) == MEM_REF)
type = TREE_TYPE (type);
else if (POINTER_TYPE_P (type) && POINTER_TYPE_P (TREE_TYPE(type)))
type = TREE_TYPE (type);
else if (POINTER_TYPE_P (type) && TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE)
type = TREE_TYPE (type);
if (TARGET_64BIT)
{
if (lookup_attribute ("ms_abi va_list", TYPE_ATTRIBUTES (type)))

5
gcc/gimplify.c
View File

@ -11990,6 +11990,11 @@ gimplify_va_arg_expr (tree *expr_p, gimple_seq *pre_p,
if (have_va_type == error_mark_node)
return GS_ERROR;
have_va_type = targetm.canonical_va_list_type (have_va_type);
if (have_va_type == NULL_TREE
&& TREE_CODE (valist) == ADDR_EXPR)
/* Handle 'Case 1: Not an array type' from c-common.c/build_va_arg. */
have_va_type
= targetm.canonical_va_list_type (TREE_TYPE (TREE_TYPE (valist)));
gcc_assert (have_va_type != NULL_TREE);
/* Generate a diagnostic for requesting data of a type that cannot

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-09-10 Tom de Vries <tom@codesourcery.com>
PR C/71602
* c-c++-common/va-arg-va-list-type.c: New test.
2016-09-09 Peter Bergner <bergner@vnet.ibm.com>
PR rtl-optimization/77289

9
gcc/testsuite/c-c++-common/va-arg-va-list-type.c Normal file
View File

@ -0,0 +1,9 @@
/* { dg-do compile } */
__builtin_va_list *pap;
void
fn1 (void)
{
__builtin_va_arg (pap, double); /* { dg-error "first argument to 'va_arg' not of type 'va_list'" } */
}