From patchwork Mon Aug 2 20:20:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [52/65] Use SSA_NAME_DEF_STMT only on SSA_NAMEs. Date: Mon, 02 Aug 2010 10:20:25 -0000 From: Sebastian Pop X-Patchwork-Id: 60650 Message-Id: <1280780438-17543-53-git-send-email-sebpop@gmail.com> To: gcc-patches@gcc.gnu.org Cc: Tobias Grosser , gcc-graphite From: spop 2010-07-22 Sebastian Pop * 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/branches/graphite@162445 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/ChangeLog.graphite | 7 +++++++ gcc/graphite-sese-to-poly.c | 3 ++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/graphite/id-24.c | 22 ++++++++++++++++++++++ 5 files changed, 40 insertions(+), 1 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/id-24.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff88292..bc50e30 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2010-08-02 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_phi_out_of_ssa): Use + SSA_NAME_DEF_STMT only on SSA_NAMEs. + +2010-08-02 Sebastian Pop + * tree-scalar-evolution.c (instantiate_scev_name): Do not instantiate default definitions. diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 155e396..1ae2bf2 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,12 @@ 2010-07-22 Sebastian Pop + * 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 + * 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 81b2dc2..084dd31 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 9177c57..8bdc024 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-08-02 Sebastian Pop + * gcc.dg/graphite/id-24.c: New. + +2010-08-02 Sebastian Pop + * gcc.dg/tree-ssa/pr20742.c: New. 2010-08-02 Sebastian Pop 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 0000000..d466069 --- /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; +} +