tree-ssa-loop-im.c (execute_sm): Do not check flag_tm.

        * tree-ssa-loop-im.c (execute_sm): Do not check flag_tm.
        * gimple.h (block_in_transaction): Check for flag_tm.

From-SVN: r188112

gcc/ChangeLog

@@ -210,6 +210,11 @@
 
 2012-05-31  Aldy Hernandez  <aldyh@redhat.com>
 
+	* tree-ssa-loop-im.c (execute_sm): Do not check flag_tm.
+	* gimple.h (block_in_transaction): Check for flag_tm.
+
+2012-05-31  Aldy Hernandez  <aldyh@redhat.com>
+
 	PR tree-optimization/52558
 	* cfg.c (alloc_aux_for_edge): Fix comment.
 	(alloc_aux_for_edge): Remove static.

gcc/gimple.h

@@ -1593,7 +1593,7 @@ gimple_set_has_volatile_ops (gimple stmt, bool volatilep)
 static inline bool
 block_in_transaction (basic_block bb)
 {
-  return bb->flags & BB_IN_TRANSACTION;
+  return flag_tm && bb->flags & BB_IN_TRANSACTION;
 }
 
 /* Return true if STMT is in a transaction.  */

gcc/tree-ssa-loop-im.c

@@ -2153,7 +2153,7 @@ execute_sm (struct loop *loop, VEC (edge, heap) *exits, mem_ref_p ref)
   fmt_data.orig_loop = loop;
   for_each_index (&ref->mem, force_move_till, &fmt_data);
 
-  if ((flag_tm && block_in_transaction (loop_preheader_edge (loop)->src))
+  if (block_in_transaction (loop_preheader_edge (loop)->src)
       || !PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES))
     multi_threaded_model_p = true;