summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-11 20:29:35 +0000
committerspop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-11 20:29:35 +0000
commita865acd77108b14c971bd39ec85d0c19ad271b37 (patch)
tree5b6b63147316b0e814d45467cdc003d5d8744d23
parent52f57b4eef7c91379c5262af3f946284997b52e8 (diff)
downloadgcc-a865acd77108b14c971bd39ec85d0c19ad271b37.tar.gz
Use SSA_NAME_DEF_STMT only on SSA_NAMEs.
2010-07-22 Sebastian Pop <sebastian.pop@amd.com> * graphite-sese-to-poly.c (rewrite_phi_out_of_ssa): Use SSA_NAME_DEF_STMT only on SSA_NAMEs. * gcc.dg/graphite/id-24.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163156 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ChangeLog.graphite7
-rw-r--r--gcc/graphite-sese-to-poly.c3
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/graphite/id-24.c22
5 files changed, 40 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b46d2631fb..15b5acf22b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2010-08-02 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (rewrite_phi_out_of_ssa): Use
+ SSA_NAME_DEF_STMT only on SSA_NAMEs.
+
+2010-08-02 Sebastian Pop <sebastian.pop@amd.com>
+
* tree-scalar-evolution.c (instantiate_scev_name): Do not
instantiate default definitions.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 155e3961656..1ae2bf2163b 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,12 @@
2010-07-22 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (rewrite_phi_out_of_ssa): Use
+ SSA_NAME_DEF_STMT only on SSA_NAMEs.
+
+ * gcc.dg/graphite/id-24.c: New.
+
+2010-07-22 Sebastian Pop <sebastian.pop@amd.com>
+
* tree-scalar-evolution.c (instantiate_scev_name): Do not
instantiate default definitions.
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 81b2dc250aa..084dd31cf52 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2256,7 +2256,8 @@ rewrite_phi_out_of_ssa (gimple_stmt_iterator *psi)
/* Avoid the insertion of code in the loop latch to please the
pattern matching of the vectorizer. */
- if (e->src == bb->loop_father->latch)
+ if (TREE_CODE (arg) == SSA_NAME
+ && e->src == bb->loop_father->latch)
insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
else
insert_out_of_ssa_copy_on_edge (e, zero_dim_array, arg);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 553e567ae89..fe463045de7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2010-08-02 Sebastian Pop <sebastian.pop@amd.com>
+ * gcc.dg/graphite/id-24.c: New.
+
+2010-08-02 Sebastian Pop <sebastian.pop@amd.com>
+
* gcc.dg/tree-ssa/pr20742.c: New.
2010-08-02 Sebastian Pop <sebastian.pop@amd.com>
diff --git a/gcc/testsuite/gcc.dg/graphite/id-24.c b/gcc/testsuite/gcc.dg/graphite/id-24.c
new file mode 100644
index 00000000000..d4660694ca3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/id-24.c
@@ -0,0 +1,22 @@
+/* gcc.dg/tree-ssa/loadpre23.c used to ICE with Graphite. */
+
+struct {
+ int a;
+ int large[100];
+} x;
+
+int foo(int argc)
+{
+ int b;
+ int c;
+ int i;
+ int d, e;
+
+ for (i = 0; i < argc; i++)
+ {
+ e = x.a;
+ x.a = 9;
+ }
+ return d + e;
+}
+