From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 2E2D93858412; Wed, 17 Nov 2021 12:46:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E2D93858412 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5336] ranger: Fix up fold_using_range::range_of_address [PR103255] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 7061300025188d57e715c1593b8dae598c87b3c5 X-Git-Newrev: c39cb6bf835ca12e590eaa6f90222e51be207c50 Message-Id: <20211117124645.2E2D93858412@sourceware.org> Date: Wed, 17 Nov 2021 12:46:45 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2021 12:46:45 -0000 https://gcc.gnu.org/g:c39cb6bf835ca12e590eaa6f90222e51be207c50 commit r12-5336-gc39cb6bf835ca12e590eaa6f90222e51be207c50 Author: Jakub Jelinek Date: Wed Nov 17 13:45:53 2021 +0100 ranger: Fix up fold_using_range::range_of_address [PR103255] If on &base->member the offset isn't constant or isn't zero and -fdelete-null-pointer-checks and not -fwrapv-pointer and base has a range that doesn't include NULL, we return the range of the base. Usually it isn't a big deal, because for most pointers we just use varying, range_zero and range_nonzero ranges and nothing beyond that, but if a pointer is initialized from a constant, we actually track the exact range and in that case this causes miscompilation. As discussed on IRC, I think doing something like: offset_int off2; if (off_cst && off.is_constant (&off2)) { tree cst = wide_int_to_tree (sizetype, off2 / BITS_PER_UNIT); // adjust range r with POINTER_PLUS_EXPR cst if (!range_includes_zero_p (&r)) return true; } // Fallback r = range_nonzero (TREE_TYPE (gimple_assign_rhs1 (stmt))); return true; could work, given that most of the pointer ranges are just the simple ones perhaps it is too much for little benefit. 2021-11-17 Jakub Jelinek PR tree-optimization/103255 * gimple-range-fold.cc (fold_using_range::range_of_address): Return range_nonzero rather than unadjusted base's range. Formatting fixes. * gcc.c-torture/execute/pr103255.c: New test. Diff: --- gcc/gimple-range-fold.cc | 16 ++++++---- gcc/testsuite/gcc.c-torture/execute/pr103255.c | 41 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index 608d98b43d5..ec9690b05e4 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -720,14 +720,20 @@ fold_using_range::range_of_address (irange &r, gimple *stmt, fur_source &src) } /* If &X->a is equal to X, the range of X is the result. */ if (off_cst && known_eq (off, 0)) - return true; + return true; else if (flag_delete_null_pointer_checks && !TYPE_OVERFLOW_WRAPS (TREE_TYPE (expr))) { - /* For -fdelete-null-pointer-checks -fno-wrapv-pointer we don't - allow going from non-NULL pointer to NULL. */ - if(!range_includes_zero_p (&r)) - return true; + /* For -fdelete-null-pointer-checks -fno-wrapv-pointer we don't + allow going from non-NULL pointer to NULL. */ + if (!range_includes_zero_p (&r)) + { + /* We could here instead adjust r by off >> LOG2_BITS_PER_UNIT + using POINTER_PLUS_EXPR if off_cst and just fall back to + this. */ + r = range_nonzero (TREE_TYPE (gimple_assign_rhs1 (stmt))); + return true; + } } /* If MEM_REF has a "positive" offset, consider it non-NULL always, for -fdelete-null-pointer-checks also "negative" diff --git a/gcc/testsuite/gcc.c-torture/execute/pr103255.c b/gcc/testsuite/gcc.c-torture/execute/pr103255.c new file mode 100644 index 00000000000..d74b054252f --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr103255.c @@ -0,0 +1,41 @@ +/* PR tree-optimization/103255 */ + +struct H +{ + unsigned a; + unsigned b; + unsigned c; +}; + +#if __SIZEOF_POINTER__ >= 4 +#define ADDR 0x400000 +#else +#define ADDR 0x4000 +#endif +#define OFF 0x20 + +int +main () +{ + struct H *h = 0; + unsigned long o; + volatile int t = 1; + + for (o = OFF; o <= OFF; o += 0x1000) + { + struct H *u; + u = (struct H *) (ADDR + o); + if (t) + { + h = u; + break; + } + } + + if (h == 0) + return 0; + unsigned *tt = &h->b; + if ((__SIZE_TYPE__) tt != (ADDR + OFF + __builtin_offsetof (struct H, b))) + __builtin_abort (); + return 0; +}