From: Andrew Pinski Date: Sun, 16 May 2021 17:40:16 +0000 (-0700) Subject: Don't simplify (A & C) != 0 ? D : 0 for pointer types. X-Git-Tag: upstream/12.2.0~7697 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99b76adb94d9363d0ca31a7d34ce850e2ca9ffc5;p=platform%2Fupstream%2Fgcc.git Don't simplify (A & C) != 0 ? D : 0 for pointer types. While rewriting part of PHI-OPT to use match-and-simplify, I ran into a bug where this pattern in match.pd would hit and would produce invalid gimple; a shift of a pointer type. This just disables this simplification for pointer types similarly to what is already done in PHI-OPT for the generic A ? D : 0 case. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. Thanks, Andrew Pinski 2021-5-23 Andrew Pinski gcc/ * match.pd ((A & C) != 0 ? D : 0): Limit to non pointer types. gcc/testsuite/ * gcc.dg/gimplefe-45.c: New test. --- diff --git a/gcc/match.pd b/gcc/match.pd index e01bb7a..1fc6b7b 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -4840,7 +4840,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (cond (ne (bit_and @0 integer_pow2p@1) integer_zerop) INTEGER_CST@2 integer_zerop) - (if (integer_pow2p (@2)) + (if (!POINTER_TYPE_P (type) && integer_pow2p (@2)) (with { int shift = (wi::exact_log2 (wi::to_wide (@2)) - wi::exact_log2 (wi::to_wide (@1))); diff --git a/gcc/testsuite/gcc.dg/gimplefe-45.c b/gcc/testsuite/gcc.dg/gimplefe-45.c new file mode 100644 index 0000000..b1d3cbb --- /dev/null +++ b/gcc/testsuite/gcc.dg/gimplefe-45.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fgimple" } */ + +/* This used to ICE when simplifying (A & C) != 0 ? D : 0 + for pointer types. */ + +int *__GIMPLE () +p (int n) +{ + int *_2; + int *_t; + int *_t1; + _t = (int*)8; + _t1 = 0; + n = n & 2; + _2 = n != 0 ? _t : _t1; + return _2; +} +