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

re PR c++/81154 (OpenMP with shared variable in a template class crash) 

PR c++/81154
	* semantics.c (handle_omp_array_sections_1, finish_omp_clauses):
	Complain about t not being a variable if t is OVERLOAD even
	when processing_template_decl.

	* g++.dg/gomp/pr81154.C: New test.

From-SVN: r249483
This commit is contained in:
Jakub Jelinek 2017-06-22 00:22:05 +02:00 committed by Jakub Jelinek
parent 8887fa1078
commit 54a390bed7
4 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2017-06-21 Jakub Jelinek <jakub@redhat.com>
PR c++/81154
* semantics.c (handle_omp_array_sections_1, finish_omp_clauses):
Complain about t not being a variable if t is OVERLOAD even
when processing_template_decl.
Backported from mainline
2017-06-13 Jakub Jelinek <jakub@redhat.com>

14
gcc/cp/semantics.c
View File

@ -4565,7 +4565,7 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types,
}
if (!VAR_P (t) && TREE_CODE (t) != PARM_DECL)
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
return NULL_TREE;
if (DECL_P (t))
error_at (OMP_CLAUSE_LOCATION (c),
@ -6079,7 +6079,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
if (!VAR_P (t) && TREE_CODE (t) != PARM_DECL
&& (!field_ok || TREE_CODE (t) != FIELD_DECL))
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (DECL_P (t))
error ("%qD is not a variable in clause %qs", t,
@ -6151,7 +6151,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
&& ((ort & C_ORT_OMP_DECLARE_SIMD) != C_ORT_OMP
|| TREE_CODE (t) != FIELD_DECL))
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (DECL_P (t))
error ("%qD is not a variable in clause %<firstprivate%>", t);
@ -6194,7 +6194,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
&& ((ort & C_ORT_OMP_DECLARE_SIMD) != C_ORT_OMP
|| TREE_CODE (t) != FIELD_DECL))
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (DECL_P (t))
error ("%qD is not a variable in clause %<lastprivate%>", t);
@ -6557,7 +6557,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
}
if (!VAR_P (t) && TREE_CODE (t) != PARM_DECL)
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (DECL_P (t))
error ("%qD is not a variable in %<aligned%> clause", t);
@ -6639,7 +6639,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
remove = true;
else if (!VAR_P (t) && TREE_CODE (t) != PARM_DECL)
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (DECL_P (t))
error ("%qD is not a variable in %<depend%> clause", t);
@ -6770,7 +6770,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
}
if (!VAR_P (t) && TREE_CODE (t) != PARM_DECL)
{
if (processing_template_decl)
if (processing_template_decl && TREE_CODE (t) != OVERLOAD)
break;
if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_MAP
&& (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_POINTER

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2017-06-21 Jakub Jelinek <jakub@redhat.com>
PR c++/81154
* g++.dg/gomp/pr81154.C: New test.
Backported from mainline
2017-06-20 Jakub Jelinek <jakub@redhat.com>

57
gcc/testsuite/g++.dg/gomp/pr81154.C Normal file
View File

@ -0,0 +1,57 @@
// PR c++/81154
// { dg-do compile }
template <typename T>
struct C
{
int foo (T n) const
{
#pragma omp parallel shared (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel private (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel firstprivate (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel for lastprivate (foo) // { dg-error "is not a variable in clause" }
for (T i = 0; i < n; i++)
;
#pragma omp parallel for linear (foo) // { dg-error "is not a variable in clause" }
for (T i = 0; i < n; i++)
;
#pragma omp parallel reduction (+:foo) // { dg-error "is not a variable in clause" }
;
return 0;
}
int foo (int x, int y) { return x; }
};
struct D
{
typedef int T;
int foo (T n) const
{
#pragma omp parallel shared (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel private (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel firstprivate (foo) // { dg-error "is not a variable in clause" }
;
#pragma omp parallel for lastprivate (foo) // { dg-error "is not a variable in clause" }
for (T i = 0; i < n; i++)
;
#pragma omp parallel for linear (foo) // { dg-error "is not a variable in clause" }
for (T i = 0; i < n; i++)
;
#pragma omp parallel reduction (+:foo) // { dg-error "is not a variable in clause" }
;
return 0;
}
int foo (int x, int y) { return x; }
};
int
main ()
{
C<int> ().foo (1);
D ().foo (1);
}