clementval created this revision. clementval added reviewers: vdmitrie, jdoerfert, jdenny. Herald added subscribers: cfe-commits, sstefan1, guansong, yaxunl. Herald added a project: clang.
Previously OMPD_unknown was last item in the Directive enumeration and its position was used in various comparison and assertion. With the new Directive enumeration, this should be change with llvm::omp::Directive_enumSize. This patch fix two place where it was not done in D81736 <https://reviews.llvm.org/D81736>. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D82518 Files: clang/lib/Basic/OpenMPKinds.cpp clang/lib/Parse/ParseOpenMP.cpp Index: clang/lib/Parse/ParseOpenMP.cpp =================================================================== --- clang/lib/Parse/ParseOpenMP.cpp +++ clang/lib/Parse/ParseOpenMP.cpp @@ -194,8 +194,9 @@ DKind = F[I][2]; } } - return DKind < OMPD_unknown ? static_cast<OpenMPDirectiveKind>(DKind) - : OMPD_unknown; + return DKind < llvm::omp::Directive_enumSize + ? static_cast<OpenMPDirectiveKind>(DKind) + : OMPD_unknown; } static DeclarationName parseOpenMPReductionId(Parser &P) { Index: clang/lib/Basic/OpenMPKinds.cpp =================================================================== --- clang/lib/Basic/OpenMPKinds.cpp +++ clang/lib/Basic/OpenMPKinds.cpp @@ -580,7 +580,7 @@ void clang::getOpenMPCaptureRegions( SmallVectorImpl<OpenMPDirectiveKind> &CaptureRegions, OpenMPDirectiveKind DKind) { - assert(DKind <= OMPD_unknown); + assert(DKind <= llvm::omp::Directive_enumSize); switch (DKind) { case OMPD_parallel: case OMPD_parallel_for:
Index: clang/lib/Parse/ParseOpenMP.cpp =================================================================== --- clang/lib/Parse/ParseOpenMP.cpp +++ clang/lib/Parse/ParseOpenMP.cpp @@ -194,8 +194,9 @@ DKind = F[I][2]; } } - return DKind < OMPD_unknown ? static_cast<OpenMPDirectiveKind>(DKind) - : OMPD_unknown; + return DKind < llvm::omp::Directive_enumSize + ? static_cast<OpenMPDirectiveKind>(DKind) + : OMPD_unknown; } static DeclarationName parseOpenMPReductionId(Parser &P) { Index: clang/lib/Basic/OpenMPKinds.cpp =================================================================== --- clang/lib/Basic/OpenMPKinds.cpp +++ clang/lib/Basic/OpenMPKinds.cpp @@ -580,7 +580,7 @@ void clang::getOpenMPCaptureRegions( SmallVectorImpl<OpenMPDirectiveKind> &CaptureRegions, OpenMPDirectiveKind DKind) { - assert(DKind <= OMPD_unknown); + assert(DKind <= llvm::omp::Directive_enumSize); switch (DKind) { case OMPD_parallel: case OMPD_parallel_for:
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits