diff options
| author | Ian Lance Taylor <iant@google.com> | 2008-05-07 09:45:17 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-05-07 09:45:17 +0200 |
| commit | 2ee510b4220fe07af99aae860afa178898b12cf7 (patch) | |
| tree | 64710767b3276cd480a6e30e9f003c1c16e08ead | |
| parent | f61edbf65f93da4d4c1d7c3f201b39dc85d982c2 (diff) | |
| download | gcc-2ee510b4220fe07af99aae860afa178898b12cf7.zip gcc-2ee510b4220fe07af99aae860afa178898b12cf7.tar.gz gcc-2ee510b4220fe07af99aae860afa178898b12cf7.tar.bz2 | |
re PR middle-end/36013 (Wrong code involving restricted pointers to non-restricted pointers)
PR middle-end/36013
* gimplify.c (find_single_pointer_decl_1): Don't look through
indirections.
(find_single_pointer_decl): Adjust comments.
* gcc.c-torture/execute/20080506-2.c: New test.
From-SVN: r135029
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gimplify.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/20080506-2.c | 21 |
4 files changed, 43 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 20ee05c..ebc3aad 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-05-07 Ian Lance Taylor <iant@google.com> + + PR middle-end/36013 + * gimplify.c (find_single_pointer_decl_1): Don't look through + indirections. + (find_single_pointer_decl): Adjust comments. + 2008-05-07 Jakub Jelinek <jakub@redhat.com> PR middle-end/36137 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 2e8ffef..e36d5db 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -391,6 +391,13 @@ find_single_pointer_decl_1 (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED, { tree *pdecl = (tree *) data; + /* We are only looking for pointers at the same level as the + original tree; we must not look through any indirections. + Returning anything other than NULL_TREE will cause the caller to + not find a base. */ + if (REFERENCE_CLASS_P (*tp)) + return *tp; + if (DECL_P (*tp) && POINTER_TYPE_P (TREE_TYPE (*tp))) { if (*pdecl) @@ -406,8 +413,9 @@ find_single_pointer_decl_1 (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED, return NULL_TREE; } -/* Find the single DECL of pointer type in the tree T and return it. - If there are zero or more than one such DECLs, return NULL. */ +/* Find the single DECL of pointer type in the tree T, used directly + rather than via an indirection, and return it. If there are zero + or more than one such DECLs, return NULL. */ static tree find_single_pointer_decl (tree t) @@ -418,7 +426,8 @@ find_single_pointer_decl (tree t) { /* find_single_pointer_decl_1 returns a nonzero value, causing walk_tree to return a nonzero value, to indicate that it - found more than one pointer DECL. */ + found more than one pointer DECL or that it found an + indirection. */ return NULL_TREE; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a36aa5a..b872afd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2008-05-07 Jakub Jelinek <jakub@redhat.com> + PR middle-end/36013 + * gcc.c-torture/execute/20080506-2.c: New test. + PR middle-end/36137 * gcc.c-torture/execute/20080506-1.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/execute/20080506-2.c b/gcc/testsuite/gcc.c-torture/execute/20080506-2.c new file mode 100644 index 0000000..d2fac71 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20080506-2.c @@ -0,0 +1,21 @@ +/* PR middle-end/36013 */ + +extern void abort (void); + +void __attribute__((noinline)) +foo (int **__restrict p, int **__restrict q) +{ + *p[0] = 1; + *q[0] = 2; + if (*p[0] != 2) + abort (); +} + +int +main (void) +{ + int a; + int *p1 = &a, *p2 = &a; + foo (&p1, &p2); + return 0; +} |