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

c-family: Fix ICE in get_atomic_generic_size [PR96545]

Browse source 
As the testcase shows, we would ICE if the type of the first argument of
various atomic builtins was pointer to (non-void) incomplete type, we would
assume that TYPE_SIZE_UNIT must be non-NULL.  This patch diagnoses it
instead.  And also changes the TREE_CODE != INTEGER_CST check to
!tree_fits_uhwi_p, as we use tree_to_uhwi after this and at least in theory
the int could be too large and not fit.

2020-08-11  Jakub Jelinek  <jakub@redhat.com>

	PR c/96545
	* c-common.c (get_atomic_generic_size): Require that first argument's
	type points to a complete type and use tree_fits_uhwi_p instead of
	just INTEGER_CST TREE_CODE check for the TYPE_SIZE_UNIT.

	* c-c++-common/pr96545.c: New test.
This commit is contained in:
Jakub Jelinek 2020-08-11 16:46:49 +02:00
parent 299c98578b
commit 7840b4dc05
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7017,8 +7017,15 @@ get_atomic_generic_size (location_t loc, tree function,
return 0;
}
if (!COMPLETE_TYPE_P (TREE_TYPE (type_0)))
{
error_at (loc, "argument 1 of %qE must be a pointer to a complete type",
function);
return 0;
}
/* Types must be compile time constant sizes. */
if (TREE_CODE ((TYPE_SIZE_UNIT (TREE_TYPE (type_0)))) != INTEGER_CST)
if (!tree_fits_uhwi_p ((TYPE_SIZE_UNIT (TREE_TYPE (type_0)))))
{
error_at (loc,
"argument 1 of %qE must be a pointer to a constant size type",

31
gcc/testsuite/c-c++-common/pr96545.c Normal file
View file

@ -0,0 +1,31 @@
/* PR c/96545 */
/* { dg-do compile } */
extern char x[], y[], z[];
struct S;
extern struct S s, t, u;
int v, w;
void
foo (void)
{
__atomic_exchange (&x, &y, &z, 0); /* { dg-error "must be a pointer to a complete type" } */
}
void
bar (void)
{
__atomic_exchange (&s, &t, &u, 0); /* { dg-error "must be a pointer to a complete type" } */
}
void
baz (void)
{
__atomic_exchange (&v, &t, &w, 0); /* { dg-error "size mismatch in argument 2 of" } */
}
void
qux (void)
{
__atomic_exchange (&v, &w, &t, 0); /* { dg-error "size mismatch in argument 3 of" } */
}