diff options
author | Martin Sebor <msebor@redhat.com> | 2021-11-17 11:51:33 -0700 |
---|---|---|
committer | Martin Sebor <msebor@redhat.com> | 2021-11-17 11:52:29 -0700 |
commit | 2c2148d8c144d7388abcb7c34b782be647fe81c9 (patch) | |
tree | ecea694a9449cb48b399d7a3d92eb62e406a223b /gcc | |
parent | d3a9082d7acc3ef443de6f14a16e7063d92844b1 (diff) | |
download | gcc-2c2148d8c144d7388abcb7c34b782be647fe81c9.zip gcc-2c2148d8c144d7388abcb7c34b782be647fe81c9.tar.gz gcc-2c2148d8c144d7388abcb7c34b782be647fe81c9.tar.bz2 |
Handle folded nonconstant array bounds [PR101702]
PR c/101702 - ICE: in handle_argspec_attribute, at c-family/c-attribs.c:3623
gcc/c/ChangeLog:
PR c/101702
* c-decl.c (get_parm_array_spec): Strip casts earlier and fold array
bounds before deciding if they're constant.
gcc/testsuite/ChangeLog:
PR c/101702
* gcc.dg/Warray-parameter-11.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/c/c-decl.c | 10 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/Warray-parameter-11.c | 24 |
2 files changed, 30 insertions, 4 deletions
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 186fa16..63d806a 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -5866,6 +5866,12 @@ get_parm_array_spec (const struct c_parm *parm, tree attrs) if (pd->u.array.static_p) spec += 's'; + if (!INTEGRAL_TYPE_P (TREE_TYPE (nelts))) + /* Avoid invalid NELTS. */ + return attrs; + + STRIP_NOPS (nelts); + nelts = c_fully_fold (nelts, false, nullptr); if (TREE_CODE (nelts) == INTEGER_CST) { /* Skip all constant bounds except the most significant one. @@ -5883,13 +5889,9 @@ get_parm_array_spec (const struct c_parm *parm, tree attrs) spec += buf; break; } - else if (!INTEGRAL_TYPE_P (TREE_TYPE (nelts))) - /* Avoid invalid NELTS. */ - return attrs; /* Each variable VLA bound is represented by a dollar sign. */ spec += "$"; - STRIP_NOPS (nelts); vbchain = tree_cons (NULL_TREE, nelts, vbchain); } diff --git a/gcc/testsuite/gcc.dg/Warray-parameter-11.c b/gcc/testsuite/gcc.dg/Warray-parameter-11.c new file mode 100644 index 0000000..8ca1b55 --- /dev/null +++ b/gcc/testsuite/gcc.dg/Warray-parameter-11.c @@ -0,0 +1,24 @@ +/* PR c/101702 - ICE on invalid function redeclaration + { dg-do compile } + { dg-options "-Wall" } */ + +typedef __INTPTR_TYPE__ intptr_t; + +#define copysign(x, y) __builtin_copysign (x, y) + +void f0 (double[!copysign (~2, 3)]); + +void f1 (double[!copysign (~2, 3)]); +void f1 (double[1]); // { dg-warning "-Warray-parameter" } + +void f2 (int[(int)+1.0]); +void f2 (int[(int)+1.1]); + +/* Also verify that equivalent expressions don't needlessly cause false + positives or negatives. */ +struct S { int a[1]; }; +extern struct S *sp; + +void f3 (int[(intptr_t)((char*)sp->a - (char*)sp)]); +void f3 (int[(intptr_t)((char*)&sp->a[0] - (char*)sp)]); +void f3 (int[(intptr_t)((char*)&sp->a[1] - (char*)sp)]); // { dg-warning "-Warray-parameter" } |