MATCH: Fix zero_one_valued_p not to match signed 1 bit integers

So for the attached testcase, we assumed that zero_one_valued_p would
be the value [0,1] but currently zero_one_valued_p matches also
signed 1 bit integers.
This changes that not to match that and fixes the 2 new testcases at
all optimization levels.

OK for GCC 13? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

	PR tree-optimization/110165
	PR tree-optimization/110166

gcc/ChangeLog:

	* match.pd (zero_one_valued_p): Don't accept
	signed 1-bit integers.

gcc/testsuite/ChangeLog:

	* gcc.c-torture/execute/pr110165-1.c: New test.
	* gcc.c-torture/execute/pr110166-1.c: New test.

(cherry picked from commit 72e652f3425079259faa4edefe1dc571f72f91e0)
This commit is contained in:
Andrew Pinski
2023-06-08 14:25:51 -07:00
parent b6118b8155
commit 682bbd3647
3 changed files with 69 additions and 2 deletions
+8 -2
View File
@@ -1922,9 +1922,15 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
(match zero_one_valued_p
@0
(if (INTEGRAL_TYPE_P (type) && tree_nonzero_bits (@0) == 1)))
(if (INTEGRAL_TYPE_P (type)
&& (TYPE_UNSIGNED (type)
|| TYPE_PRECISION (type) > 1)
&& tree_nonzero_bits (@0) == 1)))
(match zero_one_valued_p
truth_valued_p@0)
truth_valued_p@0
(if (INTEGRAL_TYPE_P (type)
&& (TYPE_UNSIGNED (type)
|| TYPE_PRECISION (type) > 1))))
/* Transform { 0 or 1 } * { 0 or 1 } into { 0 or 1 } & { 0 or 1 }. */
(simplify
@@ -0,0 +1,28 @@
struct s
{
int t : 1;
};
int f(struct s t, int a, int b) __attribute__((noinline));
int f(struct s t, int a, int b)
{
int bd = t.t;
if (bd) a|=b;
return a;
}
int main(void)
{
struct s t;
for(int i = -1;i <= 1; i++)
{
int a = 0x10;
int b = 0x0f;
int c = a | b;
struct s t = {i};
int r = f(t, a, b);
int exp = (i != 0) ? a | b : a;
if (exp != r)
__builtin_abort();
}
}
@@ -0,0 +1,33 @@
struct s
{
int t : 1;
int t1 : 1;
};
int f(struct s t) __attribute__((noinline));
int f(struct s t)
{
int c = t.t;
int d = t.t1;
if (c > d)
t.t = d;
else
t.t = c;
return t.t;
}
int main(void)
{
struct s t;
for(int i = -1;i <= 0; i++)
{
for(int j = -1;j <= 0; j++)
{
struct s t = {i, j};
int r = f(t);
int exp = i < j ? i : j;
if (exp != r)
__builtin_abort();
}
}
}