Commit 22caf9f7 authored by Michael Kruse's avatar Michael Kruse
Browse files

fix check-clang

parent c6117c91

clang/include/clang/AST/OpenMPClause.h

+2 −2
Original line number Diff line number Diff line
@@ -7554,7 +7554,7 @@ class OMPSizesClause final 


  /// Build an empty clause.

  explicit OMPSizesClause(int NumSizes)

      : OMPClause(OMPC_sizes, SourceLocation(), SourceLocation()),

      : OMPClause(llvm::omp::OMPC_sizes, SourceLocation(), SourceLocation()),

        NumSizes(NumSizes) {}



public:
@@ -7623,7 +7623,7 @@ public: 
  }



  static bool classof(const OMPClause *T) {

    return T->getClauseKind() == OMPC_sizes;

    return T->getClauseKind() == llvm::omp::OMPC_sizes;

  }

};

clang/include/clang/Basic/OpenMPKinds.def

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#  define OPENMP_TILE_CLAUSE(Name)

#endif



OPENMP_CLAUSE(sizes, OMPSizesClause)

// Static attributes for 'schedule' clause.

OPENMP_SCHEDULE_KIND(static)

OPENMP_SCHEDULE_KIND(dynamic)

clang/lib/Basic/OpenMPKinds.cpp

+1 −10
Original line number Diff line number Diff line
@@ -433,16 +433,7 @@ const char *clang::getOpenMPSimpleClauseTypeName(OpenMPClauseKind Kind, 
  llvm_unreachable("Invalid OpenMP simple clause kind");

}



  case OMPD_tile:

    switch (CKind) {

#define OPENMP_TILE_CLAUSE(Name)                                               \

  case OMPC_##Name:                                                            \

    return true;

#include "clang/Basic/OpenMPKinds.def"

    default:

      break;

    }

    break;



bool clang::isOpenMPLoopDirective(OpenMPDirectiveKind DKind) {

  return DKind == OMPD_simd || DKind == OMPD_for || DKind == OMPD_for_simd ||

         DKind == OMPD_parallel_for || DKind == OMPD_parallel_for_simd ||

clang/lib/Parse/ParseOpenMP.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2321,7 +2321,7 @@ Parser::ParseOpenMPDeclarativeOrExecutableDirective(ParsedStmtContext StmtCtx) { 
      HasAssociatedStatement = false;

    }



    if (DKind == OMPD_tile && !FirstClauses[OMPC_sizes].getInt()) {

    if (DKind == OMPD_tile && !FirstClauses[unsigned(OMPC_sizes)].getInt()) {

      Diag(Loc, diag::err_omp_required_clause)

          << getOpenMPDirectiveName(OMPD_tile) << "sizes";

      ErrorFound = true;

clang/lib/Sema/SemaOpenMP.cpp

+8 −7
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "llvm/ADT/IndexedMap.h"

#include "llvm/ADT/PointerEmbeddedInt.h"

#include "llvm/ADT/STLExtras.h"

#include "llvm/ADT/StringExtras.h"

#include "llvm/Frontend/OpenMP/OMPConstants.h"

#include <set>










@@ -6962,8 +6963,8 @@ static Expr *













calculateNumIters(Sema &SemaRef, Scope *S, SourceLocation DefaultLoc,















                  Expr *Lower, Expr *Upper, Expr *Step, QualType LCTy,















                  bool TestIsStrictOp, bool RoundToStep,













                  llvm::MapVector<const Expr *, DeclRefExpr *> &Captures) {













  ExprResult NewStep = tryBuildCapture(SemaRef, Step, Captures);













                  llvm::MapVector<const Expr *, DeclRefExpr *> &Captures, bool Capturing) {













  ExprResult NewStep = tryBuildCapture(SemaRef, Step, Captures, Capturing);















  if (!NewStep.isUsable())















    return nullptr;















  llvm::APSInt LRes, URes, SRes;










@@ -7173,8 +7174,8 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(













    if (!LBMaxVal.isUsable())















      return nullptr;



























    Expr *LBMin = tryBuildCapture(SemaRef, LBMinVal.get(), Captures, Capturin).get();













    Expr *LBMax = tryBuildCapture(SemaRef, LBMaxVal.get(), Captures, Capturin).get();













    Expr *LBMin = tryBuildCapture(SemaRef, LBMinVal.get(), Captures, Capturing).get();













    Expr *LBMax = tryBuildCapture(SemaRef, LBMaxVal.get(), Captures, Capturing).get();















    if (!LBMin || !LBMax)















      return nullptr;















    // LB(MinVal) < LB(MaxVal)










@@ -7293,7 +7294,7 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(



























  ExprResult Diff =















      calculateNumIters(SemaRef, S, DefaultLoc, Lower, Upper, Step, VarType,













                        TestIsStrictOp, /*RoundToStep=*/true, Captures);













                        TestIsStrictOp, /*RoundToStep=*/true, Captures, Capturing);















  if (!Diff.isUsable())















    return nullptr;
























@@ -7373,7 +7374,7 @@ std::pair<Expr *, Expr *> OpenMPIterationSpaceChecker::buildMinMaxValues(



























  ExprResult Diff =















      calculateNumIters(SemaRef, S, DefaultLoc, Lower, Upper, Step, VarType,













                        TestIsStrictOp, /*RoundToStep=*/false, Captures);













                        TestIsStrictOp, /*RoundToStep=*/false, Captures, Capturing);















  if (!Diff.isUsable())















    return std::make_pair(nullptr, nullptr);
























@@ -7565,7 +7566,7 @@ Expr *OpenMPIterationSpaceChecker::buildOrderedLoopData(



























  ExprResult Diff = calculateNumIters(SemaRef, S, DefaultLoc, Lower, Upper,















                                      Step, VarType, /*TestIsStrictOp=*/false,













                                      /*RoundToStep=*/false, Captures);













                                      /*RoundToStep=*/false, Captures, Capturing);















  if (!Diff.isUsable())















    return nullptr;