diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-11-07 21:51:05 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-11-07 21:51:05 +0100 |
| commit | 4dbeb716123290202774ec5127462946bdfacbd1 (patch) | |
| tree | 58f678236f303012b63383c3d2287adcd26473e0 | |
| parent | acd377795f259233d3b9c5cd81a9156c1c3081f9 (diff) | |
| download | gcc-4dbeb716123290202774ec5127462946bdfacbd1.zip gcc-4dbeb716123290202774ec5127462946bdfacbd1.tar.gz gcc-4dbeb716123290202774ec5127462946bdfacbd1.tar.bz2 | |
re PR c++/82835 (ICE on valid code with -fopenmp)
PR c++/82835
* cp-gimplify.c (cxx_omp_clause_apply_fn): For methods pass i - 1 to
convert_default_arg instead of i.
* testsuite/libgomp.c++/pr82835.C: New test.
From-SVN: r254511
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 9 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/pr82835.C | 34 |
4 files changed, 50 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4478880..52cd542 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-11-07 Jakub Jelinek <jakub@redhat.com> + + PR c++/82835 + * cp-gimplify.c (cxx_omp_clause_apply_fn): For methods pass i - 1 to + convert_default_arg instead of i. + 2017-11-06 Jason Merrill <jason@redhat.com> P0704R1 - fixing const-qualified pointers to members diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 014c1ee..7c7c040 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1717,6 +1717,7 @@ cxx_omp_clause_apply_fn (tree fn, tree arg1, tree arg2) if (arg2) defparm = TREE_CHAIN (defparm); + bool is_method = TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE; if (TREE_CODE (TREE_TYPE (arg1)) == ARRAY_TYPE) { tree inner_type = TREE_TYPE (arg1); @@ -1765,8 +1766,8 @@ cxx_omp_clause_apply_fn (tree fn, tree arg1, tree arg2) for (parm = defparm; parm && parm != void_list_node; parm = TREE_CHAIN (parm), i++) argarray[i] = convert_default_arg (TREE_VALUE (parm), - TREE_PURPOSE (parm), fn, i, - tf_warning_or_error); + TREE_PURPOSE (parm), fn, + i - is_method, tf_warning_or_error); t = build_call_a (fn, i, argarray); t = fold_convert (void_type_node, t); t = fold_build_cleanup_point_expr (TREE_TYPE (t), t); @@ -1798,8 +1799,8 @@ cxx_omp_clause_apply_fn (tree fn, tree arg1, tree arg2) for (parm = defparm; parm && parm != void_list_node; parm = TREE_CHAIN (parm), i++) argarray[i] = convert_default_arg (TREE_VALUE (parm), - TREE_PURPOSE (parm), - fn, i, tf_warning_or_error); + TREE_PURPOSE (parm), fn, + i - is_method, tf_warning_or_error); t = build_call_a (fn, i, argarray); t = fold_convert (void_type_node, t); return fold_build_cleanup_point_expr (TREE_TYPE (t), t); diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 7c0e808..19966bd 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2017-11-07 Jakub Jelinek <jakub@redhat.com> + + PR c++/82835 + * testsuite/libgomp.c++/pr82835.C: New test. + 2017-11-06 Martin Liska <mliska@suse.cz> * testsuite/libgomp.c++/loop-2.C: Return a value diff --git a/libgomp/testsuite/libgomp.c++/pr82835.C b/libgomp/testsuite/libgomp.c++/pr82835.C new file mode 100644 index 0000000..df64ecf --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/pr82835.C @@ -0,0 +1,34 @@ +// PR c++/82835 +// { dg-do run } + +int a, b; + +template <class> +struct C { + C (int x = a) : c (5) { if (x != 137) __builtin_abort (); } + int c; +}; + +struct D { + void foo (); + int d; +}; + +void +D::foo () +{ + C<int> c; +#pragma omp for private (c) + for (b = 0; b < d; b++) + c.c++; +} + +int +main () +{ + a = 137; + D d; + d.d = 16; + d.foo (); + return 0; +} |