From 009b7fc1870354e2c70d21c88fa671113a8e5f13 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 27 Apr 2015 22:01:28 -0600 Subject: [PATCH] re PR tree-optimization/65217 (__builtin_unreachable in if statement causes bad assembly generation) PR tree-optimization/65217 * tree-ssa-dom.c (record_equality): Given two SSA_NAMEs, if just one of them has a single use, make sure it is the LHS of the implied copy. PR tree-optimization/65217 * gcc.target/i386/pr65217.c: Remove XFAIL. From-SVN: r222499 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/pr65217.c | 4 ++-- gcc/tree-ssa-dom.c | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fff0015a15fc..1a82f17a97fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-04-27 Jeff Law + + PR tree-optimization/65217 + * tree-ssa-dom.c (record_equality): Given two SSA_NAMEs, if just one + of them has a single use, make sure it is the LHS of the implied + copy. + 2015-04-28 Alan Modra PR target/65810 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 67bdd69ddf0e..0fc23843520b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-04-27 Jeff Law + + PR tree-optimization/65217 + * gcc.target/i386/pr65217.c: Remove XFAIL. + 2015-04-27 Andre Vehreschild PR fortran/60322 diff --git a/gcc/testsuite/gcc.target/i386/pr65217.c b/gcc/testsuite/gcc.target/i386/pr65217.c index 3f495b21f29a..d5c9be5b9ef2 100644 --- a/gcc/testsuite/gcc.target/i386/pr65217.c +++ b/gcc/testsuite/gcc.target/i386/pr65217.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O" } */ -/* { dg-final { scan-assembler-not "negl" { xfail *-*-* } } } */ -/* { dg-final { scan-assembler-not "andl" { xfail *-*-* } } } */ +/* { dg-final { scan-assembler-not "negl" } } */ +/* { dg-final { scan-assembler-not "andl" } } */ int test(int n) diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c index a67b4e447ac4..c7d427be22ec 100644 --- a/gcc/tree-ssa-dom.c +++ b/gcc/tree-ssa-dom.c @@ -1762,6 +1762,20 @@ record_equality (tree x, tree y) if (tree_swap_operands_p (x, y, false)) std::swap (x, y); + /* Most of the time tree_swap_operands_p does what we want. But there's + cases where we we know one operand is better for copy propagation than + the other. Given no other code cares about ordering of equality + comparison operators for that purpose, we just handle the special cases + here. */ + if (TREE_CODE (x) == SSA_NAME && TREE_CODE (y) == SSA_NAME) + { + /* If one operand is a single use operand, then make it + X. This will preserve its single use properly and if this + conditional is eliminated, the computation of X can be + eliminated as well. */ + if (has_single_use (y) && ! has_single_use (x)) + std::swap (x, y); + } if (TREE_CODE (x) == SSA_NAME) prev_x = SSA_NAME_VALUE (x); if (TREE_CODE (y) == SSA_NAME) -- 2.47.2