| Message ID | YoX6azxVUqafr8vX@tucnak |
|---|---|
| State | New |
| Headers | show |
| Series | pointer-query: Fix ICE with non-pointer param [PR105635] | expand |
On Thu, 19 May 2022, Jakub Jelinek wrote: > Hi! > > The gimple_parm_array_size function comment talks about pointe parameters > but doesn't actually verify it, it checks whether an attribute is present > on the function and then just uses TREE_TYPE (TREE_TYPE (var)) which > assumes a pointer type (or in theory could work for ARRAY_TYPE but > c-family languages which only have that attribute will never have ARRAY_TYPE > parameters; and for VECTOR_TYPE/COMPLEX_TYPE it would mean something quite > different). > > So, this patch punts early if var doesn't have pointer/reference type. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. Richard. > 2022-05-19 Jakub Jelinek <jakub@redhat.com> > > PR c/105635 > * poiinter-query.cc (gimple_parm_array_size): Return NULL if var > doesn't have pointer or reference type. > > * gcc.dg/pr105635.c: New test. > > --- gcc/pointer-query.cc.jj 2022-05-13 09:34:23.996147311 +0200 > +++ gcc/pointer-query.cc 2022-05-18 12:12:21.398849571 +0200 > @@ -555,7 +555,7 @@ gimple_parm_array_size (tree ptr, wide_i > from the current function declaratation (e.g., attribute access or > related). */ > tree var = SSA_NAME_VAR (ptr); > - if (TREE_CODE (var) != PARM_DECL) > + if (TREE_CODE (var) != PARM_DECL || !POINTER_TYPE_P (TREE_TYPE (var))) > return NULL_TREE; > > const unsigned prec = TYPE_PRECISION (sizetype); > --- gcc/testsuite/gcc.dg/pr105635.c.jj 2022-05-18 12:23:56.868371600 +0200 > +++ gcc/testsuite/gcc.dg/pr105635.c 2022-05-18 12:23:41.728577929 +0200 > @@ -0,0 +1,11 @@ > +/* PR c/105635 */ > +/* { dg-do compile } */ > +/* { dg-options "-Wall" } */ > + > +void foo (int, int[*]); /* { dg-message "previous declaration of 'foo' with type" } */ > + > +foo (int x, int y) /* { dg-warning "return type defaults to 'int'" } */ > +{ /* { dg-warning "conflicting types for 'foo'" "" { target *-*-* } .-1 } */ > + /* { dg-message "declared here" "" { target *-*-* } .-2 } */ > + return (x >= 0) != (y < 0); /* { dg-warning "'return' with a value, in function returning void" } */ > +} > > Jakub > >
--- gcc/pointer-query.cc.jj 2022-05-13 09:34:23.996147311 +0200 +++ gcc/pointer-query.cc 2022-05-18 12:12:21.398849571 +0200 @@ -555,7 +555,7 @@ gimple_parm_array_size (tree ptr, wide_i from the current function declaratation (e.g., attribute access or related). */ tree var = SSA_NAME_VAR (ptr); - if (TREE_CODE (var) != PARM_DECL) + if (TREE_CODE (var) != PARM_DECL || !POINTER_TYPE_P (TREE_TYPE (var))) return NULL_TREE; const unsigned prec = TYPE_PRECISION (sizetype); --- gcc/testsuite/gcc.dg/pr105635.c.jj 2022-05-18 12:23:56.868371600 +0200 +++ gcc/testsuite/gcc.dg/pr105635.c 2022-05-18 12:23:41.728577929 +0200 @@ -0,0 +1,11 @@ +/* PR c/105635 */ +/* { dg-do compile } */ +/* { dg-options "-Wall" } */ + +void foo (int, int[*]); /* { dg-message "previous declaration of 'foo' with type" } */ + +foo (int x, int y) /* { dg-warning "return type defaults to 'int'" } */ +{ /* { dg-warning "conflicting types for 'foo'" "" { target *-*-* } .-1 } */ + /* { dg-message "declared here" "" { target *-*-* } .-2 } */ + return (x >= 0) != (y < 0); /* { dg-warning "'return' with a value, in function returning void" } */ +}