aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2011-04-18 23:55:07 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2011-04-18 23:55:07 +0200
commit37a8ccfcdcfe73378717101f82767760ae35f5a5 (patch)
tree08707682b4a0ad3746166fcad4fc319964e578d0 /gcc
parent7254cb57152a417a648f2217d5f8695e636d7cde (diff)
downloadgcc-37a8ccfcdcfe73378717101f82767760ae35f5a5.zip
gcc-37a8ccfcdcfe73378717101f82767760ae35f5a5.tar.gz
gcc-37a8ccfcdcfe73378717101f82767760ae35f5a5.tar.bz2
re PR c++/48632 (Internal compiler error when using OpenMP with template)
PR c++/48632 * parser.c (cp_parser_omp_for_loop): Don't use cp_parser_omp_for_incr for type dependent pointers. * g++.dg/gomp/pr48632.C: New test. From-SVN: r172674
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/gomp/pr48632.C22
4 files changed, 35 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 672485e..e7d75e8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-18 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/48632
+ * parser.c (cp_parser_omp_for_loop): Don't use cp_parser_omp_for_incr
+ for type dependent pointers.
+
2011-04-18 Jim Meyering <meyering@redhat.com>
* pt.c (type_unification_real): Fix typo in comment: s/in in/in/.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2c7ace6..7d3121c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24496,7 +24496,8 @@ cp_parser_omp_for_loop (cp_parser *parser, tree clauses, tree *par_clauses)
/* If decl is an iterator, preserve the operator on decl
until finish_omp_for. */
if (decl
- && (type_dependent_expression_p (decl)
+ && ((type_dependent_expression_p (decl)
+ && !POINTER_TYPE_P (TREE_TYPE (decl)))
|| CLASS_TYPE_P (TREE_TYPE (decl))))
incr = cp_parser_omp_for_incr (parser, decl);
else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5295ec5..7f1ff58 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-18 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/48632
+ * g++.dg/gomp/pr48632.C: New test.
+
2011-04-18 Uros Bizjak <ubizjak@gmail.com>
* gcc.target/i386/sse2-maskmovdqu.c: New test.
diff --git a/gcc/testsuite/g++.dg/gomp/pr48632.C b/gcc/testsuite/g++.dg/gomp/pr48632.C
new file mode 100644
index 0000000..afa8b18
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr48632.C
@@ -0,0 +1,22 @@
+// PR c++/48632
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+template<typename T>
+void
+foo (T *x, T *y, unsigned z)
+{
+#pragma omp parallel for
+ for (T *p = x; p < y; p += z)
+ ;
+#pragma omp parallel for
+ for (T *p = y; p > x; p -= z)
+ ;
+}
+
+int
+main ()
+{
+ char buf[10];
+ foo (&buf[0], &buf[9], 1);
+}