Author: abataev
Date: Thu Nov 30 10:01:54 2017
New Revision: 319450
URL: http://llvm.org/viewvc/llvm-project?rev=319450&view=rev
Log:
[OPENMP] Fix possible assert for target regions with incorrect inner
teams region.
If the inner teams region is not correct, it may cause an assertion when
processing outer target region. Patch fixes this problem.
Modified:
cfe/trunk/lib/Sema/SemaOpenMP.cpp
cfe/trunk/test/OpenMP/teams_distribute_loop_messages.cpp
cfe/trunk/test/OpenMP/teams_distribute_parallel_for_messages.cpp
cfe/trunk/test/OpenMP/teams_distribute_parallel_for_simd_messages.cpp
cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp
cfe/trunk/test/OpenMP/teams_messages.cpp
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Thu Nov 30 10:01:54 2017
@@ -2674,7 +2674,6 @@ static bool checkNestingOfRegions(Sema &
NestingProhibited = ParentRegion != OMPD_target;
OrphanSeen = ParentRegion == OMPD_unknown;
Recommend = ShouldBeInTargetRegion;
- Stack->setParentTeamsRegionLoc(Stack->getConstructLoc());
}
if (!NestingProhibited &&
!isOpenMPTargetExecutionDirective(CurrentRegion) &&
@@ -6569,6 +6568,8 @@ StmtResult Sema::ActOnOpenMPTeamsDirecti
getCurFunction()->setHasBranchProtectedScope();
+ DSAStack->setParentTeamsRegionLoc(StartLoc);
+
return OMPTeamsDirective::Create(Context, StartLoc, EndLoc, Clauses, AStmt);
}
@@ -7071,6 +7072,9 @@ StmtResult Sema::ActOnOpenMPTeamsDistrib
"omp teams distribute loop exprs were not built");
getCurFunction()->setHasBranchProtectedScope();
+
+ DSAStack->setParentTeamsRegionLoc(StartLoc);
+
return OMPTeamsDistributeDirective::Create(
Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
}
@@ -7119,6 +7123,9 @@ StmtResult Sema::ActOnOpenMPTeamsDistrib
return StmtError();
getCurFunction()->setHasBranchProtectedScope();
+
+ DSAStack->setParentTeamsRegionLoc(StartLoc);
+
return OMPTeamsDistributeSimdDirective::Create(
Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
}
@@ -7167,6 +7174,9 @@ StmtResult Sema::ActOnOpenMPTeamsDistrib
return StmtError();
getCurFunction()->setHasBranchProtectedScope();
+
+ DSAStack->setParentTeamsRegionLoc(StartLoc);
+
return OMPTeamsDistributeParallelForSimdDirective::Create(
Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
}
@@ -7213,6 +7223,9 @@ StmtResult Sema::ActOnOpenMPTeamsDistrib
"omp for loop exprs were not built");
getCurFunction()->setHasBranchProtectedScope();
+
+ DSAStack->setParentTeamsRegionLoc(StartLoc);
+
return OMPTeamsDistributeParallelForDirective::Create(
Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B,
DSAStack->isCancelRegion());
Modified: cfe/trunk/test/OpenMP/teams_distribute_loop_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_loop_messages.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/teams_distribute_loop_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/teams_distribute_loop_messages.cpp Thu Nov 30
10:01:54 2017
@@ -689,6 +689,9 @@ void test_loop_eh() {
void g() { throw 0; }
};
}
+ #pragma omp target
+ #pragma omp teams distribute
+ f; // expected-error {{use of undeclared identifier 'f'}}
}
void test_loop_firstprivate_lastprivate() {
Modified: cfe/trunk/test/OpenMP/teams_distribute_parallel_for_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_parallel_for_messages.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/teams_distribute_parallel_for_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/teams_distribute_parallel_for_messages.cpp Thu Nov 30
10:01:54 2017
@@ -9,6 +9,9 @@ static int pvt;
#pragma omp teams distribute parallel for // expected-error {{unexpected
OpenMP directive '#pragma omp teams distribute parallel for'}}
int main(int argc, char **argv) {
+ #pragma omp target
+ #pragma omp teams distribute parallel for
+ f; // expected-error {{use of undeclared identifier 'f'}}
#pragma omp target
#pragma omp teams distribute parallel for { // expected-warning {{extra tokens
at the end of '#pragma omp teams distribute parallel for' are ignored}}
for (int i = 0; i < argc; ++i)
Modified: cfe/trunk/test/OpenMP/teams_distribute_parallel_for_simd_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_parallel_for_simd_messages.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/teams_distribute_parallel_for_simd_messages.cpp
(original)
+++ cfe/trunk/test/OpenMP/teams_distribute_parallel_for_simd_messages.cpp Thu
Nov 30 10:01:54 2017
@@ -9,6 +9,9 @@ static int pvt;
#pragma omp teams distribute parallel for simd // expected-error {{unexpected
OpenMP directive '#pragma omp teams distribute parallel for simd'}}
int main(int argc, char **argv) {
+ #pragma omp target
+ #pragma omp teams distribute parallel for simd
+ f; // expected-error {{use of undeclared identifier 'f'}}
#pragma omp target
#pragma omp teams distribute parallel for simd { // expected-warning {{extra
tokens at the end of '#pragma omp teams distribute parallel for simd' are
ignored}}
for (int i = 0; i < argc; ++i)
Modified: cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp Thu Nov 30
10:01:54 2017
@@ -9,6 +9,9 @@ static int pvt;
#pragma omp teams distribute simd // expected-error {{unexpected OpenMP
directive '#pragma omp teams distribute simd'}}
int main(int argc, char **argv) {
+ #pragma omp target
+ #pragma omp teams distribute simd
+ f; // expected-error {{use of undeclared identifier 'f'}}
#pragma omp target
#pragma omp teams distribute simd { // expected-warning {{extra tokens at the
end of '#pragma omp teams distribute simd' are ignored}}
for (int i = 0; i < argc; ++i)
Modified: cfe/trunk/test/OpenMP/teams_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_messages.cpp?rev=319450&r1=319449&r2=319450&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/teams_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/teams_messages.cpp Thu Nov 30 10:01:54 2017
@@ -7,6 +7,9 @@ void foo() {
int main(int argc, char **argv) {
#pragma omp target
+ #pragma omp teams
+ f; // expected-error {{use of undeclared identifier 'f'}}
+ #pragma omp target
#pragma omp teams { // expected-warning {{extra tokens at the end of
'#pragma omp teams' are ignored}}
foo();
#pragma omp target
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
