diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-10-03 13:24:39 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-10-03 13:24:39 +0200 |
| commit | 33ff5dda9fe0dd67216ec38a6b1143d9adc3948a (patch) | |
| tree | 6bfb4c141e8732d6cc4922f7dc62b3fde1c8511a /gcc/tree-ssa-reassoc.c | |
| parent | bb81a576f259256b38d46dd41d3bd5f5a36cfd6f (diff) | |
| download | gcc-33ff5dda9fe0dd67216ec38a6b1143d9adc3948a.zip gcc-33ff5dda9fe0dd67216ec38a6b1143d9adc3948a.tar.gz gcc-33ff5dda9fe0dd67216ec38a6b1143d9adc3948a.tar.bz2 | |
re PR tree-optimization/82381 (internal compiler error: qsort checking failed)
PR tree-optimization/82381
* tree-ssa-reassoc.c (sort_by_operand_rank): Don't check
stmt_to_insert nor wheather SSA_NAMEs are default defs.
Return 1 or -1 if one of bba and bbb is NULL. If bb_rank is equal,
fallthrough into reassoc_stmt_dominates_stmt_p.
* gcc.c-torture/compile/pr82381.c: New test.
From-SVN: r253379
Diffstat (limited to 'gcc/tree-ssa-reassoc.c')
| -rw-r--r-- | gcc/tree-ssa-reassoc.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index b2d0f57..eff76d1 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -514,36 +514,37 @@ sort_by_operand_rank (const void *pa, const void *pb) && TREE_CODE (oea->op) == SSA_NAME && TREE_CODE (oeb->op) == SSA_NAME) { - /* As SSA_NAME_VERSION is assigned pretty randomly, because we reuse - versions of removed SSA_NAMEs, so if possible, prefer to sort - based on basic block and gimple_uid of the SSA_NAME_DEF_STMT. - See PR60418. */ - if (!SSA_NAME_IS_DEFAULT_DEF (oea->op) - && !SSA_NAME_IS_DEFAULT_DEF (oeb->op) - && !oea->stmt_to_insert - && !oeb->stmt_to_insert - && SSA_NAME_VERSION (oeb->op) != SSA_NAME_VERSION (oea->op)) + if (SSA_NAME_VERSION (oeb->op) != SSA_NAME_VERSION (oea->op)) { + /* As SSA_NAME_VERSION is assigned pretty randomly, because we reuse + versions of removed SSA_NAMEs, so if possible, prefer to sort + based on basic block and gimple_uid of the SSA_NAME_DEF_STMT. + See PR60418. */ gimple *stmta = SSA_NAME_DEF_STMT (oea->op); gimple *stmtb = SSA_NAME_DEF_STMT (oeb->op); basic_block bba = gimple_bb (stmta); basic_block bbb = gimple_bb (stmtb); if (bbb != bba) { + /* One of the SSA_NAMEs can be defined in oeN->stmt_to_insert + but the other might not. */ + if (!bba) + return 1; + if (!bbb) + return -1; + /* If neither is, compare bb_rank. */ if (bb_rank[bbb->index] != bb_rank[bba->index]) return bb_rank[bbb->index] - bb_rank[bba->index]; } - else - { - bool da = reassoc_stmt_dominates_stmt_p (stmta, stmtb); - bool db = reassoc_stmt_dominates_stmt_p (stmtb, stmta); - if (da != db) - return da ? 1 : -1; - } - } - if (SSA_NAME_VERSION (oeb->op) != SSA_NAME_VERSION (oea->op)) - return SSA_NAME_VERSION (oeb->op) > SSA_NAME_VERSION (oea->op) ? 1 : -1; + bool da = reassoc_stmt_dominates_stmt_p (stmta, stmtb); + bool db = reassoc_stmt_dominates_stmt_p (stmtb, stmta); + if (da != db) + return da ? 1 : -1; + + return (SSA_NAME_VERSION (oeb->op) > SSA_NAME_VERSION (oea->op) + ? 1 : -1); + } else return oeb->id > oea->id ? 1 : -1; } |