[OPENMP]Fix PR39422: variables are not firstprivatized in task context.

According to the OpenMP standard, In a task generating construct, if no
default clause is present, a variable for which the data-sharing
attribute is not determined by the rules above is firstprivatized.
Compiler tries to implement this, but if the variable is not directly
used in the task context, this variable may not be firstprivatized.
Patch fixes this problem.

llvm-svn: 345277
This commit is contained in:
Alexey Bataev 2018-10-25 15:35:27 +00:00
parent 8f11ddc397
commit 8fc7b5f922
3 changed files with 27 additions and 3 deletions

View File

@ -2251,8 +2251,31 @@ public:
}
void VisitStmt(Stmt *S) {
for (Stmt *C : S->children()) {
if (C && !isa<OMPExecutableDirective>(C))
Visit(C);
if (C) {
if (auto *OED = dyn_cast<OMPExecutableDirective>(C)) {
// Check implicitly captured vriables in the task-based directives to
// check if they must be firstprivatized.
if (!OED->hasAssociatedStmt())
continue;
const Stmt *AS = OED->getAssociatedStmt();
if (!AS)
continue;
for (const CapturedStmt::Capture &Cap :
cast<CapturedStmt>(AS)->captures()) {
if (Cap.capturesVariable()) {
DeclRefExpr *DRE = buildDeclRefExpr(
SemaRef, Cap.getCapturedVar(),
Cap.getCapturedVar()->getType().getNonLValueExprType(
SemaRef.Context),
Cap.getLocation(),
/*RefersToCapture=*/true);
Visit(DRE);
}
}
} else {
Visit(C);
}
}
}
}

View File

@ -34,7 +34,7 @@ int main(int argc, char **argv) {
{
#pragma omp parallel sections default(shared)
{
++argc;
++argc; // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}}
}
}
return 0;

View File

@ -107,6 +107,7 @@ int main() {
// CHECK: call i32 @__kmpc_omp_task([[IDENT_T]]* @{{.+}}, i32 [[GTID]], i8* [[ORIG_TASK_PTR]])
#pragma omp task untied
{
#pragma omp critical
a = 1;
}
// CHECK: [[ORIG_TASK_PTR:%.+]] = call i8* @__kmpc_omp_task_alloc([[IDENT_T]]* @{{.+}}, i32 [[GTID]], i32 0, i64 40, i64 1,