From: Richard Biener <rguenther@suse.de>
To: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] Fix PR77826
Date: Wed, 05 Oct 2016 11:38:00 -0000 [thread overview]
Message-ID: <alpine.LSU.2.11.1610051337370.26629@t29.fhfr.qr> (raw)
In-Reply-To: <alpine.LSU.2.11.1610041232450.26629@t29.fhfr.qr>
On Tue, 4 Oct 2016, Richard Biener wrote:
>
> The following will fix PR77826, the issue that in match.pd matching
> up two things uses operand_equal_p which is too lax about the type
> of the toplevel entity (at least for integer constants).
>
> Bootstrap / regtest pending on x86_64-unknown-linux-gnu.
The following is what I have applied.
Richard.
2016-10-05 Richard Biener <rguenther@suse.de>
PR middle-end/77826
* genmatch.c (dt_operand::gen_match_op): Amend operand_equal_p
with types_match for GIMPLE code gen to handle type mismatched
constants properly.
(dt_operand::gen): Adjust.
* match.pd ((X /[ex] A) * A -> X): Properly handle converted
and constant A.
* gcc.dg/torture/pr77826.c: New testcase.
Index: gcc/testsuite/gcc.dg/torture/pr77826.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr77826.c (revision 0)
+++ gcc/testsuite/gcc.dg/torture/pr77826.c (working copy)
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+
+void
+fi(unsigned long int *v0, unsigned int ow, int q2)
+{
+ if (ow + q2 != 0)
+ if (q2 == 1)
+ {
+ *v0 |= q2;
+ q2 ^= *v0;
+ }
+}
Index: gcc/genmatch.c
===================================================================
--- gcc/genmatch.c (revision 240744)
+++ gcc/genmatch.c (working copy)
@@ -1562,7 +1562,7 @@ struct dt_operand : public dt_node
void gen (FILE *, int, bool);
unsigned gen_predicate (FILE *, int, const char *, bool);
- unsigned gen_match_op (FILE *, int, const char *);
+ unsigned gen_match_op (FILE *, int, const char *, bool);
unsigned gen_gimple_expr (FILE *, int);
unsigned gen_generic_expr (FILE *, int, const char *);
@@ -2589,12 +2589,18 @@ dt_operand::gen_predicate (FILE *f, int
a capture-match. */
unsigned
-dt_operand::gen_match_op (FILE *f, int indent, const char *opname)
+dt_operand::gen_match_op (FILE *f, int indent, const char *opname, bool gimple)
{
char match_opname[20];
match_dop->get_name (match_opname);
- fprintf_indent (f, indent, "if (%s == %s || operand_equal_p (%s, %s, 0))\n",
- opname, match_opname, opname, match_opname);
+ if (gimple)
+ fprintf_indent (f, indent, "if (%s == %s || (operand_equal_p (%s, %s, 0) "
+ "&& types_match (%s, %s)))\n",
+ opname, match_opname, opname, match_opname,
+ opname, match_opname);
+ else
+ fprintf_indent (f, indent, "if (%s == %s || operand_equal_p (%s, %s, 0))\n",
+ opname, match_opname, opname, match_opname);
fprintf_indent (f, indent + 2, "{\n");
return 1;
}
@@ -2991,7 +2997,7 @@ dt_operand::gen (FILE *f, int indent, bo
else if (type == DT_TRUE)
;
else if (type == DT_MATCH)
- n_braces = gen_match_op (f, indent, opname);
+ n_braces = gen_match_op (f, indent, opname, gimple);
else
gcc_unreachable ();
Index: gcc/match.pd
===================================================================
--- gcc/match.pd (revision 240770)
+++ gcc/match.pd (working copy)
@@ -1773,9 +1803,13 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
/* (X /[ex] A) * A -> X. */
(simplify
- (mult (convert? (exact_div @0 @1)) @1)
- /* Look through a sign-changing conversion. */
- (convert @0))
+ (mult (convert1? (exact_div @0 @1)) (convert2? @2))
+ /* We cannot use matching captures here, since in the case of
+ constants we don't see the second conversion. Look through
+ a sign-changing or widening conversions. */
+ (if (operand_equal_p (@1, @2, 0)
+ && element_precision (@0) <= element_precision (type))
+ (convert @0)))
/* Canonicalization of binary operations. */
next prev parent reply other threads:[~2016-10-05 11:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-04 10:34 Richard Biener
2016-10-05 11:38 ` Richard Biener [this message]
2016-10-06 18:44 ` Marc Glisse
2016-10-07 7:36 ` Richard Biener
2016-10-10 8:47 ` Marc Glisse
2016-10-11 9:09 ` Richard Biener
2016-10-11 20:35 ` Marc Glisse
2016-10-12 11:34 ` Richard Biener
2016-10-12 12:49 ` Marc Glisse
2016-10-12 13:25 ` Richard Biener
2016-10-13 8:29 ` Richard Biener
2016-10-15 21:50 ` Marc Glisse
2016-10-17 7:59 ` Richard Biener
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LSU.2.11.1610051337370.26629@t29.fhfr.qr \
--to=rguenther@suse.de \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).