aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimple-ssa-store-merging.c
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2016-11-07 12:26:00 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2016-11-07 12:26:00 +0000
commit20770eb80bf59f4fe1d71408b841669c70550e6c (patch)
tree40cda2f82959c26f706bbc6c773b5682bba61a36 /gcc/gimple-ssa-store-merging.c
parent32894793ff96f4c56b90e0f0e1d961e526a6edc7 (diff)
downloadgcc-20770eb80bf59f4fe1d71408b841669c70550e6c.zip
gcc-20770eb80bf59f4fe1d71408b841669c70550e6c.tar.gz
gcc-20770eb80bf59f4fe1d71408b841669c70550e6c.tar.bz2
re PR tree-optimization/78218 (wrong code at -Os and above on x86_64-linux-gnu (in both 32-bit and 64-bit modes))
2016-11-07 Richard Biener <rguenther@suse.de> PR tree-optimization/78218 * gimple-ssa-store-merging.c (pass_store_merging::terminate_all_aliasing_chains): Drop unused argument, fix alias check to also consider uses. (pass_store_merging::execute): Adjust. * gcc.dg/torture/pr78218.c: New testcase. From-SVN: r241900
Diffstat (limited to 'gcc/gimple-ssa-store-merging.c')
-rw-r--r--gcc/gimple-ssa-store-merging.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/gimple-ssa-store-merging.c b/gcc/gimple-ssa-store-merging.c
index 36bc833..57b8556 100644
--- a/gcc/gimple-ssa-store-merging.c
+++ b/gcc/gimple-ssa-store-merging.c
@@ -726,7 +726,7 @@ private:
hash_map<tree_operand_hash, struct imm_store_chain_info *> m_stores;
bool terminate_and_process_all_chains ();
- bool terminate_all_aliasing_chains (tree, imm_store_chain_info **,
+ bool terminate_all_aliasing_chains (imm_store_chain_info **,
bool, gimple *);
bool terminate_and_release_chain (imm_store_chain_info *);
}; // class pass_store_merging
@@ -755,8 +755,7 @@ pass_store_merging::terminate_and_process_all_chains ()
If that is the case we have to terminate any chain anchored at BASE. */
bool
-pass_store_merging::terminate_all_aliasing_chains (tree dest,
- imm_store_chain_info
+pass_store_merging::terminate_all_aliasing_chains (imm_store_chain_info
**chain_info,
bool var_offset_p,
gimple *stmt)
@@ -788,7 +787,10 @@ pass_store_merging::terminate_all_aliasing_chains (tree dest,
unsigned int i;
FOR_EACH_VEC_ELT ((*chain_info)->m_store_info, i, info)
{
- if (stmt_may_clobber_ref_p (info->stmt, dest))
+ if (ref_maybe_used_by_stmt_p (stmt,
+ gimple_assign_lhs (info->stmt))
+ || stmt_may_clobber_ref_p (stmt,
+ gimple_assign_lhs (info->stmt)))
{
if (dump_file && (dump_flags & TDF_DETAILS))
{
@@ -1458,7 +1460,7 @@ pass_store_merging::execute (function *fun)
}
/* Store aliases any existing chain? */
- terminate_all_aliasing_chains (lhs, chain_info, false, stmt);
+ terminate_all_aliasing_chains (chain_info, false, stmt);
/* Start a new chain. */
struct imm_store_chain_info *new_chain
= new imm_store_chain_info (base_addr);
@@ -1477,13 +1479,13 @@ pass_store_merging::execute (function *fun)
}
}
else
- terminate_all_aliasing_chains (lhs, chain_info,
+ terminate_all_aliasing_chains (chain_info,
offset != NULL_TREE, stmt);
continue;
}
- terminate_all_aliasing_chains (NULL_TREE, NULL, false, stmt);
+ terminate_all_aliasing_chains (NULL, false, stmt);
}
terminate_and_process_all_chains ();
}