diff options
Diffstat (limited to 'gcc/tree-ssa-uncprop.c')
| -rw-r--r-- | gcc/tree-ssa-uncprop.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c index 49bf65d84a8..b5e1edffeb4 100644 --- a/gcc/tree-ssa-uncprop.c +++ b/gcc/tree-ssa-uncprop.c @@ -463,14 +463,16 @@ uncprop_into_successor_phis (basic_block bb) { gimple phi = gsi_stmt (gsi); tree arg = PHI_ARG_DEF (phi, e->dest_idx); + tree res = PHI_RESULT (phi); struct equiv_hash_elt equiv_hash_elt; void **slot; - /* If the argument is not an invariant, or refers to the same + /* If the argument is not an invariant, and refers to the same underlying variable as the PHI result, then there's no point in un-propagating the argument. */ if (!is_gimple_min_invariant (arg) - && SSA_NAME_VAR (arg) != SSA_NAME_VAR (PHI_RESULT (phi))) + && (SSA_NAME_VAR (arg) == SSA_NAME_VAR (res) + && TREE_TYPE (arg) == TREE_TYPE (res))) continue; /* Lookup this argument's value in the hash table. */ @@ -492,7 +494,8 @@ uncprop_into_successor_phis (basic_block bb) { tree equiv = VEC_index (tree, elt->equivalences, j); - if (SSA_NAME_VAR (equiv) == SSA_NAME_VAR (PHI_RESULT (phi))) + if (SSA_NAME_VAR (equiv) == SSA_NAME_VAR (res) + && TREE_TYPE (equiv) == TREE_TYPE (res)) { SET_PHI_ARG_DEF (phi, e->dest_idx, equiv); break; |