summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/gcc.dg/tm/memopt-3.c2
-rw-r--r--gcc/testsuite/gcc.dg/tm/memopt-4.c4
-rw-r--r--gcc/testsuite/gcc.dg/tm/memopt-5.c2
-rw-r--r--gcc/testsuite/gcc.dg/tm/memopt-7.c4
-rw-r--r--gcc/trans-mem.c2
7 files changed, 20 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b0765b8676c..69118f8c173 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-17 Aldy Hernandez <aldyh@redhat.com>
+
+ PR other/51165
+ * trans-mem.c (requires_barrier): Call may_be_aliased.
+
2012-01-17 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/51877
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e640e945613..f00f2d558b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-17 Aldy Hernandez <aldyh@redhat.com>
+
+ PR other/51165
+ * gcc.dg/tm/memopt-3.c: Remove xfail.
+ * gcc.dg/tm/memopt-4.c: Remove xfail.
+ * gcc.dg/tm/memopt-5.c: Remove xfail.
+ * gcc.dg/tm/memopt-7.c: Remove xfail.
+
2012-01-17 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/51877
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-3.c b/gcc/testsuite/gcc.dg/tm/memopt-3.c
index 62a3e0e9f2a..77337161c2c 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-3.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-3.c
@@ -16,5 +16,5 @@ int f()
return lala.x[0];
}
-/* { dg-final { scan-tree-dump-times "logging: lala.x\\\[i_1\\\]" 1 "tmmark" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "logging: lala.x\\\[i_1\\\]" 1 "tmmark" } } */
/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-4.c b/gcc/testsuite/gcc.dg/tm/memopt-4.c
index 92849718441..58f8fd042d6 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-4.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-4.c
@@ -19,6 +19,6 @@ int f()
return lala.x[i];
}
-/* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala.x\\\[55\\\]" 1 "tmedge" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "lala.x\\\[55\\\] = tm_save" 1 "tmedge" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala.x\\\[55\\\]" 1 "tmedge" } } */
+/* { dg-final { scan-tree-dump-times "lala.x\\\[55\\\] = tm_save" 1 "tmedge" } } */
/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-5.c b/gcc/testsuite/gcc.dg/tm/memopt-5.c
index 7b377a58035..53f7f12083c 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-5.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-5.c
@@ -19,5 +19,5 @@ int f()
return lala.x[i];
}
-/* { dg-final { scan-tree-dump-times "ITM_LU\[0-9\] \\\(&lala.x\\\[55\\\]" 1 "tmedge" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "ITM_LU\[0-9\] \\\(&lala.x\\\[55\\\]" 1 "tmedge" } } */
/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-7.c b/gcc/testsuite/gcc.dg/tm/memopt-7.c
index f8af2a95e66..d3a478bde1c 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-7.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-7.c
@@ -17,6 +17,6 @@ int f()
return lala.x[asdf];
}
-/* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala" 1 "tmedge" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "lala = tm_save" 1 "tmedge" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala" 1 "tmedge" } } */
+/* { dg-final { scan-tree-dump-times "lala = tm_save" 1 "tmedge" } } */
/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index db1c2ec36bc..8b7e51045a9 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -1498,7 +1498,7 @@ requires_barrier (basic_block entry_block, tree x, gimple stmt)
lower_sequence_tm altogether. */
needs_to_live_in_memory (x)
/* X escapes. */
- || ptr_deref_may_alias_global_p (x))
+ || is_global_var (x))
return true;
else
{