summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-ssa-pre.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 316f55b7421..77e8954074b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-06 Richard Henderson <rth@redhat.com>
+
+ * tree-ssa-pre.c (compute_avail): Do not consider is_tm_ending_fndecl
+ calls as available.
+
2012-11-06 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (ix86_init_machine_status): Do not
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 191de51b75d..b3edc670bf8 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -3805,6 +3805,13 @@ compute_avail (void)
if (gimple_call_internal_p (stmt))
continue;
+ // We cannot value number the builtins that end transactions.
+ // ??? The alternative being unsharing BBs in the tm_init pass.
+ if (flag_tm
+ && (gimple_call_flags (stmt) & ECF_TM_BUILTIN)
+ && is_tm_ending_fndecl (gimple_call_fndecl (stmt)))
+ continue;
+
copy_reference_ops_from_call (stmt, &ops);
vn_reference_lookup_pieces (gimple_vuse (stmt), 0,
gimple_expr_type (stmt),