|
 |
4dd737 |
2014-02-27 Jeff Law <law@redhat.com>
|
|
|
4dd737 |
|
|
|
4dd737 |
PR rtl-optimization/52714
|
|
|
4dd737 |
* combine.c (try_combine): When splitting an unrecognized PARALLEL
|
|
|
4dd737 |
into two independent simple sets, if I3 is a jump, ensure the
|
|
|
4dd737 |
pattern we place into I3 is a (set (pc) ...)
|
|
|
4dd737 |
|
|
|
4dd737 |
* gcc.c-torture/compile/pr52714.c: New test.
|
|
|
4dd737 |
|
|
|
4dd737 |
2016-06-15 Jakub Jelinek <jakub@redhat.com>
|
|
|
4dd737 |
|
|
|
4dd737 |
* gcc.c-torture/compile/20160615-1.c: New test.
|
|
|
4dd737 |
|
|
|
4dd737 |
--- gcc/combine.c (revision 208203)
|
|
|
4dd737 |
+++ gcc/combine.c (revision 208204)
|
|
|
4dd737 |
@@ -3706,6 +3706,9 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
|
|
|
4dd737 |
#ifdef HAVE_cc0
|
|
|
4dd737 |
&& !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 0))
|
|
|
4dd737 |
#endif
|
|
|
4dd737 |
+ /* If I3 is a jump, ensure that set0 is a jump so that
|
|
|
4dd737 |
+ we do not create invalid RTL. */
|
|
|
4dd737 |
+ && (!JUMP_P (i3) || SET_DEST (XVECEXP (newpat, 0, 0)) == pc_rtx)
|
|
|
4dd737 |
)
|
|
|
4dd737 |
{
|
|
|
4dd737 |
newi2pat = XVECEXP (newpat, 0, 1);
|
|
|
4dd737 |
@@ -3716,6 +3719,9 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
|
|
|
4dd737 |
#ifdef HAVE_cc0
|
|
|
4dd737 |
&& !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 1))
|
|
|
4dd737 |
#endif
|
|
|
4dd737 |
+ /* If I3 is a jump, ensure that set1 is a jump so that
|
|
|
4dd737 |
+ we do not create invalid RTL. */
|
|
|
4dd737 |
+ && (!JUMP_P (i3) || SET_DEST (XVECEXP (newpat, 0, 1)) == pc_rtx)
|
|
|
4dd737 |
)
|
|
|
4dd737 |
{
|
|
|
4dd737 |
newi2pat = XVECEXP (newpat, 0, 0);
|
|
|
4dd737 |
--- gcc/testsuite/gcc.c-torture/compile/pr52714.c (revision 0)
|
|
|
4dd737 |
+++ gcc/testsuite/gcc.c-torture/compile/pr52714.c (revision 208204)
|
|
|
4dd737 |
@@ -0,0 +1,25 @@
|
|
|
4dd737 |
+
|
|
|
4dd737 |
+int __re_compile_fastmap(unsigned char *p)
|
|
|
4dd737 |
+{
|
|
|
4dd737 |
+ unsigned char **stack;
|
|
|
4dd737 |
+ unsigned size;
|
|
|
4dd737 |
+ unsigned avail;
|
|
|
4dd737 |
+
|
|
|
4dd737 |
+ stack = __builtin_alloca(5 * sizeof(unsigned char*));
|
|
|
4dd737 |
+ if (stack == 0)
|
|
|
4dd737 |
+ return -2;
|
|
|
4dd737 |
+ size = 5;
|
|
|
4dd737 |
+ avail = 0;
|
|
|
4dd737 |
+
|
|
|
4dd737 |
+ for (;;) {
|
|
|
4dd737 |
+ switch (*p++) {
|
|
|
4dd737 |
+ case 0:
|
|
|
4dd737 |
+ if (avail == size)
|
|
|
4dd737 |
+ return -2;
|
|
|
4dd737 |
+ stack[avail++] = p;
|
|
|
4dd737 |
+ }
|
|
|
4dd737 |
+ }
|
|
|
4dd737 |
+
|
|
|
4dd737 |
+ return 0;
|
|
|
4dd737 |
+}
|
|
|
4dd737 |
+
|
|
|
4dd737 |
--- gcc/testsuite/gcc.c-torture/compile/20160615-1.c.jj 2016-06-15 11:17:54.690689056 +0200
|
|
|
4dd737 |
+++ gcc/testsuite/gcc.c-torture/compile/20160615-1.c 2016-06-15 11:17:48.811765657 +0200
|
|
|
4dd737 |
@@ -0,0 +1,10 @@
|
|
|
4dd737 |
+int a;
|
|
|
4dd737 |
+void bar (int, unsigned, unsigned);
|
|
|
4dd737 |
+
|
|
|
4dd737 |
+void
|
|
|
4dd737 |
+foo (unsigned x)
|
|
|
4dd737 |
+{
|
|
|
4dd737 |
+ unsigned b = a ? x : 0;
|
|
|
4dd737 |
+ if (x || b)
|
|
|
4dd737 |
+ bar (0, x, b);
|
|
|
4dd737 |
+}
|