summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/gimple-fold.c3
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/20100907.c9
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 200f11f2efe..85ea9d492aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-07 Jan Hubicka <jh@suse.cz>
+
+ * gimple.c (maybe_fold_reference): Verify that operand is
+ gimple_min_invariant.
+
2010-09-07 Richard Guenther <rguenther@suse.de>
PR middle-end/45569
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 2b40ee6909e..d6e35807d05 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -477,7 +477,8 @@ maybe_fold_reference (tree expr, bool is_lhs)
tree result;
if (!is_lhs
- && (result = fold_const_aggregate_ref (expr)))
+ && (result = fold_const_aggregate_ref (expr))
+ && is_gimple_min_invariant (result))
return result;
/* ??? We might want to open-code the relevant remaining cases
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 37717423f62..5c04a042904 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-07 Jan Hubicka <jh@suse.cz>
+
+ * gcc.c-torture/compile/20100907.c: New testcase.
+
2010-09-07 Richard Guenther <rguenther@suse.de>
PR middle-end/45569
diff --git a/gcc/testsuite/gcc.c-torture/compile/20100907.c b/gcc/testsuite/gcc.c-torture/compile/20100907.c
new file mode 100644
index 00000000000..2e6cfb9ff9f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20100907.c
@@ -0,0 +1,9 @@
+struct a {int a,b;};
+const static struct a a[1]={{1,2}};
+struct a b,c;
+t()
+{
+ int idx = 0;
+ b=a[idx];
+ c=a[idx];
+}