diff options
| author | Sebastian Pop <sebastian.pop@amd.com> | 2010-02-23 12:58:44 +0000 |
|---|---|---|
| committer | Sebastian Pop <spop@gcc.gnu.org> | 2010-02-23 12:58:44 +0000 |
| commit | 143b72a99d266b5a88a3d7beae7fe050e6bdebfc (patch) | |
| tree | b5baf3034df8f093ac15a58798413119f911f759 /gcc | |
| parent | 3bbc8462110858ba3b800e2c4274cec9c1c07e34 (diff) | |
| download | gcc-143b72a99d266b5a88a3d7beae7fe050e6bdebfc.zip gcc-143b72a99d266b5a88a3d7beae7fe050e6bdebfc.tar.gz gcc-143b72a99d266b5a88a3d7beae7fe050e6bdebfc.tar.bz2 | |
Fix PR43026: handle COMPONENT_REFs in expand scalar expressions.
2010-02-11 Sebastian Pop <sebastian.pop@amd.com>
PR middle-end/43026
* sese.c (expand_scalar_variables_expr): Handle COMPONENT_REF.
* g++.dg/graphite/pr43026.C: New.
From-SVN: r156993
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog.graphite | 7 | ||||
| -rw-r--r-- | gcc/sese.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/graphite/pr43026.C | 51 |
3 files changed, 61 insertions, 0 deletions
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 4bb6dc2..cb969c5 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,12 @@ 2010-02-11 Sebastian Pop <sebastian.pop@amd.com> + PR middle-end/43026 + * sese.c (expand_scalar_variables_expr): Handle COMPONENT_REF. + + * g++.dg/graphite/pr43026.C: New. + +2010-02-11 Sebastian Pop <sebastian.pop@amd.com> + PR middle-end/43012 * gcc.dg/graphite/pr43012.c: New. @@ -897,6 +897,9 @@ expand_scalar_variables_expr (tree type, tree op0, enum tree_code code, return build4 (ARRAY_REF, type, base, subscript, op02, op03); } + case COMPONENT_REF: + return op0; + default: /* The above cases should catch everything. */ gcc_unreachable (); diff --git a/gcc/testsuite/g++.dg/graphite/pr43026.C b/gcc/testsuite/g++.dg/graphite/pr43026.C new file mode 100644 index 0000000..0e33f10 --- /dev/null +++ b/gcc/testsuite/g++.dg/graphite/pr43026.C @@ -0,0 +1,51 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fgraphite-identity -m32" } */ + +template<typename Tp > class vector { }; + +template <int rank, int dim> class Tensor; + +template <int dim> class Tensor<1,dim> { +public: + Tensor (const Tensor<1,dim> &); +private: + double values[(dim != 0) ? (dim) : 1]; +}; + +template <int dim> +#ifdef NOINLINE +// declaring this noinline prevents the ICE +__attribute__ ((noinline)) +#endif +Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) +{ + for (unsigned int i = 0; i < dim; ++i) + values[i] = p.values[i]; +} + +template <int rank, int dim> +class Tensor { + Tensor<rank-1,dim> subtensor[dim]; +}; + +template <int dim> class Base { +public: + const unsigned int npoints; + const unsigned int dofs; + const Tensor<2,dim> &s2d (const unsigned int fno, + const unsigned int pno) const; + void getf2d (vector<Tensor<2,dim> >& d2) const; +}; + +template <int dim> +void Base<dim>:: getf2d + (vector<Tensor<2,dim> > &d2) const +{ + unsigned int point, sf; + + for (point = 0; point < npoints; ++point) + for (sf = 0; sf < dofs; ++sf) + Tensor<2,dim> tmp = s2d (sf, point); +} + +template void Base<3>::getf2d (vector<Tensor<2,3> > &) const; |