Commit 7d370766 authored by Michael Kruse's avatar Michael Kruse
Browse files

clang-format

parent 22caf9f7

clang/lib/Basic/OpenMPKinds.cpp

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

}





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

+0 −2
Original line number Diff line number Diff line
@@ -2438,7 +2438,6 @@ bool Parser::ParseOpenMPSimpleVarList( 
  return !IsCorrect;

}





OMPClause *Parser::ParseOpenMPSizesClause() {

  SourceLocation ClauseNameLoc = ConsumeToken();

  SmallVector<Expr *, 4> ValExprs;
@@ -2480,7 +2479,6 @@ OMPClause *Parser::ParseOpenMPSizesClause() { 
      ValExprs, ClauseNameLoc, T.getOpenLocation(), T.getCloseLocation());

}





OMPClause *Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {

  SourceLocation Loc = Tok.getLocation();

  ConsumeAnyToken();

clang/lib/Sema/SemaOpenMP.cpp

+28 −18
Original line number Diff line number Diff line
@@ -6941,8 +6941,10 @@ bool OpenMPIterationSpaceChecker::checkAndSetInc(Expr *S) { 














static ExprResult















tryBuildCapture(Sema &SemaRef, Expr *Capture,













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













  if (!Capturing || SemaRef.CurContext->isDependentContext() || Capture->containsErrors())













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













                bool Capturing = true) {













  if (!Capturing || SemaRef.CurContext->isDependentContext() ||













      Capture->containsErrors())















    return Capture;















  if (Capture->isEvaluatable(SemaRef.Context, Expr::SE_AllowSideEffects))















    return SemaRef.PerformImplicitConversion(









@@ -6963,7 +6965,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, bool Capturing) {













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













                  bool Capturing) {















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















  if (!NewStep.isUsable())















    return nullptr;










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













    if (!LBMaxVal.isUsable())















      return nullptr;



























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













    Expr *LBMax = tryBuildCapture(SemaRef, LBMaxVal.get(), Captures, Capturing).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)









@@ -7184,7 +7189,8 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(













    if (!MinLessMaxRes.isUsable())















      return nullptr;















    Expr *MinLessMax =













        tryBuildCapture(SemaRef, MinLessMaxRes.get(), Captures, Capturing).get();













        tryBuildCapture(SemaRef, MinLessMaxRes.get(), Captures, Capturing)













            .get();















    if (!MinLessMax)















      return nullptr;















    if (TestIsLessOp.getValue()) {










@@ -7254,8 +7260,10 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(













    if (!UBMaxVal.isUsable())















      return nullptr;



























    Expr *UBMin = tryBuildCapture(SemaRef, UBMinVal.get(), Captures, Capturing).get();













    Expr *UBMax = tryBuildCapture(SemaRef, UBMaxVal.get(), Captures, Capturing).get();













    Expr *UBMin =













        tryBuildCapture(SemaRef, UBMinVal.get(), Captures, Capturing).get();













    Expr *UBMax =













        tryBuildCapture(SemaRef, UBMaxVal.get(), Captures, Capturing).get();















    if (!UBMin || !UBMax)















      return nullptr;















    // UB(MinVal) > UB(MaxVal)









@@ -7264,7 +7272,8 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(













    if (!MinGreaterMaxRes.isUsable())















      return nullptr;















    Expr *MinGreaterMax =













        tryBuildCapture(SemaRef, MinGreaterMaxRes.get(), Captures, Capturing).get();













        tryBuildCapture(SemaRef, MinGreaterMaxRes.get(), Captures, Capturing)













            .get();















    if (!MinGreaterMax)















      return nullptr;















    if (TestIsLessOp.getValue()) {










@@ -7292,9 +7301,9 @@ Expr *OpenMPIterationSpaceChecker::buildNumIterations(













  if (!Upper || !Lower)















    return nullptr;



























  ExprResult Diff =













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













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













  ExprResult Diff = calculateNumIters(













      SemaRef, S, DefaultLoc, Lower, Upper, Step, VarType, TestIsStrictOp,













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















  if (!Diff.isUsable())















    return nullptr;
























@@ -7372,9 +7381,9 @@ std::pair<Expr *, Expr *> OpenMPIterationSpaceChecker::buildMinMaxValues(













  // Build minimum/maximum value based on number of iterations.















  QualType VarType = LCDecl->getType().getNonReferenceType();



























  ExprResult Diff =













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













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













  ExprResult Diff = calculateNumIters(













      SemaRef, S, DefaultLoc, Lower, Upper, Step, VarType, TestIsStrictOp,













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















  if (!Diff.isUsable())















    return std::make_pair(nullptr, nullptr);
























@@ -7564,8 +7573,9 @@ Expr *OpenMPIterationSpaceChecker::buildOrderedLoopData(













  if (!Upper || !Lower)















    return nullptr;



























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













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













  ExprResult Diff =













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













                        /*TestIsStrictOp=*/false,















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















  if (!Diff.isUsable())















    return nullptr;

































clang/lib/AST/ASTTypeTraits.cpp



+1
−1




























File changed.
Contains only whitespace changes.