re PR other/51125 (FAIL: g++.dg/tm/pr45940-3.C)

	PR other/51125
	* trans-mem.c (expand_block_tm): Ignore clobbers.

From-SVN: r181619

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28d5deb2a85c65c228df64409cdf914831706c0f..d77a380bfaa659e9e2e13cfbe5f2b43d3fc32830 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Michael Matz  <matz@suse.de>
+
+       PR other/51125
+       * trans-mem.c (expand_block_tm): Ignore clobbers.
+
 2011-11-22  Iain Sandoe  <iains@gcc.gnu.org>
 
        *  config/darwin.h (ENDFILE_SPEC): New.

diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 347183b15689b8e3b49e7cb4224cd320dff91639..751572c4fb41beaa2fa4d3049063430dce783807 100644 (file)
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -2333,7 +2333,8 @@ expand_block_tm (struct tm_region *region, basic_block bb)
        {
        case GIMPLE_ASSIGN:
          /* Only memory reads/writes need to be instrumented.  */
-         if (gimple_assign_single_p (stmt))
+         if (gimple_assign_single_p (stmt)
+             && !gimple_clobber_p (stmt))
            {
              expand_assign_tm (region, &gsi);
              continue;