OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2017-11-07 21:51:05 +01:00 committed by Jakub Jelinek
parent acd377795f
commit 4dbeb71612
4 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -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

9
gcc/cp/cp-gimplify.c
View File

@ -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);

5
libgomp/ChangeLog
View File

@ -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

34
libgomp/testsuite/libgomp.c++/pr82835.C Normal file
View File

@ -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;
}