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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156993 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 4bb6dc2..cb969c5 100644 (file)
--- 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.
 

diff --git a/gcc/sese.c b/gcc/sese.c
index 6fb4065..ebf9154 100644 (file)
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -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 (file)
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;