gimple.c (maybe_fold_reference): Verify that operand is gimple_min_invariant.

	* gimple.c (maybe_fold_reference): Verify that operand is
	gimple_min_invariant.
	* gcc.c-torture/compile/20100907.c: New testcase.

From-SVN: r163948

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 200f11f2efea5349daa279ba13c4624b623c524f..85ea9d492aa1a07b845e418d5884389f58766918 100644 (file)
--- 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 2b40ee6909e914380fe0661bfd4645644a815a47..d6e35807d05622431c5eda197541fa2d02b9be66 100644 (file)
--- 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 37717423f62018027ab938faabe9026000b3d77e..5c04a042904438a87c11f095e84b488675599bda 100644 (file)
--- 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 (file)
index 0000000..2e6cfb9
--- /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];
+}