From 31a47f1a48ca9dd062bf33ea89874ec4583b9a58 Mon Sep 17 00:00:00 2001
From: Andrew Pinski <apinski@cavium.com>
Date: Thu, 6 Sep 2012 08:08:09 +0000
Subject: [PATCH] re PR tree-optimization/54494 (Missing store to volatile)
2012-09-06 Andrew Pinski <apinski@cavium.com>
PR tree-opt/54494
* tree-inline.c (remap_gimple_op_r): Copy TREE_SIDE_EFFECTS also.
2012-09-06 Andrew Pinski <apinski@cavium.com>
PR tree-opt/54494
* gcc.dg/tree-ssa/strlen-1.c: New testcase.
From-SVN: r191014
---
gcc/ChangeLog | 5 +++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c | 17 +++++++++++++++++
gcc/tree-inline.c | 1 +
4 files changed, 28 insertions(+)
create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca501249a3a5..74ad7d2dec6a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-06 Andrew Pinski <apinski@cavium.com>
+
+ PR tree-opt/54494
+ * tree-inline.c (remap_gimple_op_r): Copy TREE_SIDE_EFFECTS also.
+
2012-09-06 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/54455
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8589e9ec4634..56b6e0db9b2a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-06 Andrew Pinski <apinski@cavium.com>
+
+ PR tree-opt/54494
+ * gcc.dg/tree-ssa/strlen-1.c: New testcase.
+
2012-09-06 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/54455
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c b/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
new file mode 100644
index 000000000000..f6ff3e1570fe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+extern const unsigned long base;
+static inline void wreg(unsigned char val, unsigned long addr) __attribute__((always_inline));
+static inline void wreg(unsigned char val, unsigned long addr)
+{
+ *((volatile unsigned char *) (__SIZE_TYPE__) (base + addr)) = val;
+}
+void wreg_twice(void)
+{
+ wreg(0, 42);
+ wreg(0, 42);
+}
+
+/* We should not remove the second null character store to (base+42) address. */
+/* { dg-final { scan-tree-dump-times " ={v} 0;" 2 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 20d33173a6dd..05f271fc8fad 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -848,6 +848,7 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
ptr, TREE_OPERAND (*tp, 1));
TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
+ TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old);
TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
*walk_subtrees = 0;
return NULL;
--
GitLab