Author: Alexey Bataev Date: 2021-06-04T07:32:14-07:00 New Revision: 827b5c21545aaa820403e9b5cced8c0181349ee2
URL: https://github.com/llvm/llvm-project/commit/827b5c21545aaa820403e9b5cced8c0181349ee2 DIFF: https://github.com/llvm/llvm-project/commit/827b5c21545aaa820403e9b5cced8c0181349ee2.diff LOG: [OPENMP]Fix PR49790: Constexpr values not handled in `omp declare mapper` clause. Patch allows using of constexpr vars evaluatable to constant calue to be used in declare mapper construct. Differential Revision: https://reviews.llvm.org/D103642 Added: Modified: clang/lib/Sema/SemaOpenMP.cpp clang/test/OpenMP/declare_mapper_ast_print.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index 2fcc3fb4317e7..514b3b9ed05fe 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -19681,8 +19681,13 @@ Sema::ActOnOpenMPDeclareMapperDirectiveVarDecl(Scope *S, QualType MapperType, bool Sema::isOpenMPDeclareMapperVarDeclAllowed(const VarDecl *VD) const { assert(LangOpts.OpenMP && "Expected OpenMP mode."); const Expr *Ref = DSAStack->getDeclareMapperVarRef(); - if (const auto *DRE = cast_or_null<DeclRefExpr>(Ref)) - return VD->getCanonicalDecl() == DRE->getDecl()->getCanonicalDecl(); + if (const auto *DRE = cast_or_null<DeclRefExpr>(Ref)) { + if (VD->getCanonicalDecl() == DRE->getDecl()->getCanonicalDecl()) + return true; + if (VD->isUsableInConstantExpressions(Context)) + return true; + return false; + } return true; } diff --git a/clang/test/OpenMP/declare_mapper_ast_print.cpp b/clang/test/OpenMP/declare_mapper_ast_print.cpp index 6462fa38d872d..b9445ca35a0ca 100644 --- a/clang/test/OpenMP/declare_mapper_ast_print.cpp +++ b/clang/test/OpenMP/declare_mapper_ast_print.cpp @@ -56,8 +56,9 @@ class dat { // CHECK: #pragma omp declare mapper (id : dat<double>::datin v) map(tofrom: v.in){{$}} // CHECK: }; -#pragma omp declare mapper(default : N1::vec kk) map(kk.len) map(kk.data[0:2]) -// CHECK: #pragma omp declare mapper (default : N1::vec kk) map(tofrom: kk.len) map(tofrom: kk.data[0:2]){{$}} +constexpr int N = 2; +#pragma omp declare mapper(default : N1::vec kk) map(kk.len) map(kk.data[0:N]) +// CHECK: #pragma omp declare mapper (default : N1::vec kk) map(tofrom: kk.len) map(tofrom: kk.data[0:N]){{$}} #pragma omp declare mapper(dat<double> d) map(to: d.d) // CHECK: #pragma omp declare mapper (default : dat<double> d) map(to: d.d){{$}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
