aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2016-01-26 09:29:02 -0800
committerRichard Henderson <rth@gcc.gnu.org>2016-01-26 09:29:02 -0800
commitffc445f48618c0bdd51146e9a59cdc5c293f24ec (patch)
treee6bd983d58381ccf42b88e0d9a4c3958c5abece9 /gcc
parentdcbc08799695068b5beee1e5b89daacac23cfc0d (diff)
downloadgcc-ffc445f48618c0bdd51146e9a59cdc5c293f24ec.zip
gcc-ffc445f48618c0bdd51146e9a59cdc5c293f24ec.tar.gz
gcc-ffc445f48618c0bdd51146e9a59cdc5c293f24ec.tar.bz2
re PR middle-end/60908 (compiler bug related to trans-mem.c)
PR middle-end/60908 * trans-mem.c (tm_region_init): Mark entry block as visited. testsuite/ * gcc.dg/tm/pr60908.c: New test. From-SVN: r232839
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/tm/pr60908.c15
-rw-r--r--gcc/trans-mem.c7
4 files changed, 28 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f030101..fef8cfe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-26 Richard Henderson <rth@redhat.com>
+
+ PR middle-end/60908
+ * trans-mem.c (tm_region_init): Mark entry block as visited.
+
2016-01-26 David Malcolm <dmalcolm@redhat.com>
PR other/69006
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 18aa8af..3e40014 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-26 Richard Henderson <rth@redhat.com>
+
+ * gcc.dg/tm/pr60908.c: New test.
+
2016-01-26 David Malcolm <dmalcolm@redhat.com>
PR other/69006
diff --git a/gcc/testsuite/gcc.dg/tm/pr60908.c b/gcc/testsuite/gcc.dg/tm/pr60908.c
new file mode 100644
index 0000000..773438d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tm/pr60908.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-fgnu-tm" } */
+
+int t, v;
+
+int
+foo (void)
+{
+ while (1)
+ {
+ __transaction_atomic { v++; }
+ if (t)
+ return 0;
+ }
+}
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index b204760..500071f 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -2039,16 +2039,17 @@ tm_region_init (struct tm_region *region)
struct tm_region *old_region;
auto_vec<tm_region *> bb_regions;
- all_tm_regions = region;
- bb = single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun));
-
/* We could store this information in bb->aux, but we may get called
through get_all_tm_blocks() from another pass that may be already
using bb->aux. */
bb_regions.safe_grow_cleared (last_basic_block_for_fn (cfun));
+ all_tm_regions = region;
+ bb = single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun));
queue.safe_push (bb);
+ bitmap_set_bit (visited_blocks, bb->index);
bb_regions[bb->index] = region;
+
do
{
bb = queue.pop ();