From: Patrick Marlier <patrick.marlier@gmail.com>
Date: Sat, 19 Nov 2011 19:29:18 +0000 (+0000)
Subject: re PR middle-end/51211 (ICE: SIGSEGV in execute_tm_mark (trans-mem.c:2242) with ... 
X-Git-Tag: releases/gcc-4.7.0~2097
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=2e85d5e290aadb0cd0c50ddfcd8ba4f58c2301e7;p=gcc.git

re PR middle-end/51211 (ICE: SIGSEGV in execute_tm_mark (trans-mem.c:2242) with -fgnu-tm -O -freorder-blocks -ftracer --param hot-bb-frequency-fraction=1 and __transaction_atomic)

PR middle-end/51211
        * tracer.c (ignore_bb_p): Don't copy GIMPLE_TRANSACTION.

From-SVN: r181512
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 69c633728f03..eb4e2122b935 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-19  Patrick Marlier  <patrick.marlier@gmail.com>
+
+	PR middle-end/51211
+	* tracer.c (ignore_bb_p): Don't copy GIMPLE_TRANSACTION.
+
 2011-11-19  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* expmed.c (store_bit_field_1): Revert bogus formatting change.
diff --git a/gcc/tracer.c b/gcc/tracer.c
index d3523b985b1c..602e7580d994 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -90,10 +90,19 @@ bb_seen_p (basic_block bb)
 static bool
 ignore_bb_p (const_basic_block bb)
 {
+  gimple g;
+
   if (bb->index < NUM_FIXED_BLOCKS)
     return true;
   if (optimize_bb_for_size_p (bb))
     return true;
+
+  /* A transaction is a single entry multiple exit region.  It must be
+     duplicated in its entirety or not at all.  */
+  g = last_stmt (CONST_CAST_BB (bb));
+  if (g && gimple_code (g) == GIMPLE_TRANSACTION)
+    return true;
+
   return false;
 }