c++: Fix ICE with weird copy assignment operator [PR114572]
While ctors/dtors don't return anything (undeclared void or this pointer on arm) and copy assignment operators normally return a reference to *this, it isn't invalid to return uselessly some class object which might need destructing, but the OpenMP clause handling code wasn't expecting that. The following patch fixes that. 2024-04-05 Jakub Jelinek <jakub@redhat.com> PR c++/114572 * cp-gimplify.cc (cxx_omp_clause_apply_fn): Call build_cplus_new on build_call_a result if it has class type. * testsuite/libgomp.c++/pr114572.C: New test.
This commit is contained in:
parent
12b04452b4
commit
592536eb3c
2 changed files with 28 additions and 0 deletions
|
@ -2480,6 +2480,8 @@ cxx_omp_clause_apply_fn (tree fn, tree arg1, tree arg2)
|
|||
TREE_PURPOSE (parm), fn,
|
||||
i - is_method, tf_warning_or_error);
|
||||
t = build_call_a (fn, i, argarray);
|
||||
if (MAYBE_CLASS_TYPE_P (TREE_TYPE (t)))
|
||||
t = build_cplus_new (TREE_TYPE (t), t, tf_warning_or_error);
|
||||
t = fold_convert (void_type_node, t);
|
||||
t = fold_build_cleanup_point_expr (TREE_TYPE (t), t);
|
||||
append_to_statement_list (t, &ret);
|
||||
|
@ -2513,6 +2515,8 @@ cxx_omp_clause_apply_fn (tree fn, tree arg1, tree arg2)
|
|||
TREE_PURPOSE (parm), fn,
|
||||
i - is_method, tf_warning_or_error);
|
||||
t = build_call_a (fn, i, argarray);
|
||||
if (MAYBE_CLASS_TYPE_P (TREE_TYPE (t)))
|
||||
t = build_cplus_new (TREE_TYPE (t), t, tf_warning_or_error);
|
||||
t = fold_convert (void_type_node, t);
|
||||
return fold_build_cleanup_point_expr (TREE_TYPE (t), t);
|
||||
}
|
||||
|
|
24
libgomp/testsuite/libgomp.c++/pr114572.C
Normal file
24
libgomp/testsuite/libgomp.c++/pr114572.C
Normal file
|
@ -0,0 +1,24 @@
|
|||
// PR c++/114572
|
||||
// { dg-do run }
|
||||
// { dg-options "-fopenmp -O0" }
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
struct S
|
||||
{
|
||||
S () : s (0) {}
|
||||
~S () {}
|
||||
S operator= (const S &x) { s = x.s; return *this; }
|
||||
int s;
|
||||
};
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
S s;
|
||||
#pragma omp parallel for lastprivate(s)
|
||||
for (int i = 0; i < 10; ++i)
|
||||
s.s = i;
|
||||
if (s.s != 9)
|
||||
abort ();
|
||||
}
|
Loading…
Add table
Reference in a new issue