diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h --- a/flang/lib/Semantics/check-omp-structure.h +++ b/flang/lib/Semantics/check-omp-structure.h @@ -162,8 +162,10 @@ void Enter(const parser::OmpReductionClause &); void Enter(const parser::OmpScheduleClause &); -private: + // OpenMP 4.5 : 2.15.3.2 and 2.15.3.3 + void CheckObjectListStructure(const parser::OmpObjectList &objList); +private: bool HasInvalidWorksharingNesting( const parser::CharBlock &, const OmpDirectiveSet &); @@ -174,5 +176,6 @@ llvm::StringRef getClauseName(llvm::omp::Clause clause) override; llvm::StringRef getDirectiveName(llvm::omp::Directive directive) override; }; + } // namespace Fortran::semantics #endif // FORTRAN_SEMANTICS_CHECK_OMP_STRUCTURE_H_ diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp --- a/flang/lib/Semantics/check-omp-structure.cpp +++ b/flang/lib/Semantics/check-omp-structure.cpp @@ -407,16 +407,51 @@ CheckAllowed(llvm::omp::Clause::OMPC_priority); RequiresPositiveParameter(llvm::omp::Clause::OMPC_priority, x.v); } -void OmpStructureChecker::Enter(const parser::OmpClause::Private &) { +void OmpStructureChecker::Enter(const parser::OmpClause::Private &x) { CheckAllowed(llvm::omp::Clause::OMPC_private); + + // OpenMP 4.5 : 2.15.3.3 + CheckObjectListStructure(x.v); } void OmpStructureChecker::Enter(const parser::OmpClause::Safelen &x) { CheckAllowed(llvm::omp::Clause::OMPC_safelen); RequiresConstantPositiveParameter(llvm::omp::Clause::OMPC_safelen, x.v); } -void OmpStructureChecker::Enter(const parser::OmpClause::Shared &) { +void OmpStructureChecker::Enter(const parser::OmpClause::Shared &x) { CheckAllowed(llvm::omp::Clause::OMPC_shared); + + // OpenMP 4.5 : 2.15.3.2 + CheckObjectListStructure(x.v); +} + +// OpenMP 4.5 : 2.15.3.2 and 2.5.3.3 +void OmpStructureChecker::CheckObjectListStructure( + const parser::OmpObjectList &objList) { + + for (const auto &ompObject : objList.v) { + std::visit( + common::visitors{ + [&](const parser::Designator &designator) { + if (std::get_if(&designator.u)) { + + if (parser::Unwrap(ompObject)) { + + context_.Say(GetContext().clauseSource, + "A variable that is part of another variable (as an " + "array or structure element)" + " cannot appear in a private or shared clause."_err_en_US); + } + } + }, + [&](const parser::Name &name) { + + }, + + }, + ompObject.u); + } } + void OmpStructureChecker::Enter(const parser::OmpClause::Simdlen &x) { CheckAllowed(llvm::omp::Clause::OMPC_simdlen); RequiresConstantPositiveParameter(llvm::omp::Clause::OMPC_simdlen, x.v); diff --git a/flang/test/Semantics/omp-parallel-private.f90 b/flang/test/Semantics/omp-parallel-private.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Semantics/omp-parallel-private.f90 @@ -0,0 +1,27 @@ +!RUN: %S/test_errors.sh %s %t %f18 -fopenmp +! OpenMP Version 4.5 +! 2.15.3.3 parallel private Clause +program omp_parallel_private + integer :: i, j, a(10), b(10), c(10) + integer :: k = 10 + type my_type + integer :: array(10) + end type my_type + + type(my_type) :: my_var + + + do i = 1, 10 + a(i) = i + b(i) = i * i + end do + +!ERROR: A variable that is part of another variable (as an array or structure element) cannot appear in a private or shared clause. + !$omp parallel private(my_var%array) + do i = 1, 10 + c(i) = a(i) + b(i) + k + my_var%array(i) = k + end do + !$omp end parallel + +end program omp_parallel_private diff --git a/flang/test/Semantics/omp-parallel-shared.f90 b/flang/test/Semantics/omp-parallel-shared.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Semantics/omp-parallel-shared.f90 @@ -0,0 +1,24 @@ +!RUN: %S/test_errors.sh %s %t %f18 -fopenmp +! OpenMP Version 4.5 +! 2.15.3.2 parallel shared Clause +program omp_parallel_shared + integer :: i, j, a(10), b(10), c(10) + integer :: k = 10 + type my_type + integer :: array(10) + end type my_type + + type(my_type) :: my_var + do i = 1, 10 + a(i) = i + b(i) = i * i + end do +!ERROR: A variable that is part of another variable (as an array or structure element) cannot appear in a private or shared clause. + !$omp parallel shared(my_var%array) + do i = 1, 10 + c(i) = a(i) + b(i) + k + my_var%array(i) = k + end do + !$omp end parallel + +end program omp_parallel_shared