Skip to content

Commit bcc33a2

Browse files
committed
!fixup fix formatting
1 parent a777a0e commit bcc33a2

File tree

3 files changed

+25
-29
lines changed

3 files changed

+25
-29
lines changed

llvm/include/llvm/Analysis/ScalarEvolution.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,8 @@ class ScalarEvolution {
12511251
/// as arguments and asserts enforce that internally.
12521252
/*implicit*/ ExitLimit(SCEVUse E);
12531253

1254-
ExitLimit(SCEVUse, SCEVUse ConstantMaxNotTaken,
1255-
SCEVUse SymbolicMaxNotTaken, bool MaxOrZero,
1254+
ExitLimit(SCEVUse, SCEVUse ConstantMaxNotTaken, SCEVUse SymbolicMaxNotTaken,
1255+
bool MaxOrZero,
12561256
ArrayRef<ArrayRef<const SCEVPredicate *>> PredLists = {});
12571257

12581258
ExitLimit(SCEVUse E, SCEVUse ConstantMaxNotTaken,
@@ -1406,8 +1406,7 @@ class ScalarEvolution {
14061406
/// Tries to convert the \p S expression to an AddRec expression,
14071407
/// adding additional predicates to \p Preds as required.
14081408
const SCEVAddRecExpr *convertSCEVToAddRecWithPredicates(
1409-
SCEVUse S, const Loop *L,
1410-
SmallVectorImpl<const SCEVPredicate *> &Preds);
1409+
SCEVUse S, const Loop *L, SmallVectorImpl<const SCEVPredicate *> &Preds);
14111410

14121411
/// Compute \p LHS - \p RHS and returns the result as an APInt if it is a
14131412
/// constant, and std::nullopt if it isn't.

llvm/lib/Analysis/ScalarEvolution.cpp

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,8 +1349,8 @@ static SCEVUse getUnsignedOverflowLimitForStep(SCEVUse Step,
13491349
namespace {
13501350

13511351
struct ExtendOpTraitsBase {
1352-
typedef SCEVUse (ScalarEvolution:: *GetExtendExprTy)(SCEVUse, Type *,
1353-
unsigned);
1352+
typedef SCEVUse (ScalarEvolution::*GetExtendExprTy)(SCEVUse, Type *,
1353+
unsigned);
13541354
};
13551355

13561356
// Used to make code generic over signed and unsigned overflow.
@@ -2383,8 +2383,8 @@ static bool CollectAddOperandsWithScales(SmallDenseMap<SCEVUse, APInt, 16> &M,
23832383
bool ScalarEvolution::willNotOverflow(Instruction::BinaryOps BinOp, bool Signed,
23842384
SCEVUse LHS, SCEVUse RHS,
23852385
const Instruction *CtxI) {
2386-
SCEVUse (ScalarEvolution:: *Operation)(SCEVUse, SCEVUse, SCEV::NoWrapFlags,
2387-
unsigned);
2386+
SCEVUse (ScalarEvolution::*Operation)(SCEVUse, SCEVUse, SCEV::NoWrapFlags,
2387+
unsigned);
23882388
switch (BinOp) {
23892389
default:
23902390
llvm_unreachable("Unsupported binary op");
@@ -2399,7 +2399,7 @@ bool ScalarEvolution::willNotOverflow(Instruction::BinaryOps BinOp, bool Signed,
23992399
break;
24002400
}
24012401

2402-
SCEVUse (ScalarEvolution:: *Extension)(SCEVUse, Type *, unsigned) =
2402+
SCEVUse (ScalarEvolution::*Extension)(SCEVUse, Type *, unsigned) =
24032403
Signed ? &ScalarEvolution::getSignExtendExpr
24042404
: &ScalarEvolution::getZeroExtendExpr;
24052405

@@ -2824,7 +2824,7 @@ SCEVUse ScalarEvolution::getAddExpr(SmallVectorImpl<SCEVUse> &Ops,
28242824
// operands multiplied by constant values.
28252825
if (Idx < Ops.size() && isa<SCEVMulExpr>(Ops[Idx])) {
28262826
uint64_t BitWidth = getTypeSizeInBits(Ty);
2827-
SmallDenseMap<SCEVUse , APInt, 16> M;
2827+
SmallDenseMap<SCEVUse, APInt, 16> M;
28282828
SmallVector<SCEVUse, 8> NewOps;
28292829
APInt AccumulatedConstant(BitWidth, 0);
28302830
if (CollectAddOperandsWithScales(M, NewOps, AccumulatedConstant,
@@ -8768,13 +8768,11 @@ bool ScalarEvolution::BackedgeTakenInfo::isConstantMaxOrZero(
87688768
return MaxOrZero && !any_of(ExitNotTaken, PredicateNotAlwaysTrue);
87698769
}
87708770

8771-
ScalarEvolution::ExitLimit::ExitLimit(SCEVUse E)
8772-
: ExitLimit(E, E, E, false) {}
8771+
ScalarEvolution::ExitLimit::ExitLimit(SCEVUse E) : ExitLimit(E, E, E, false) {}
87738772

87748773
ScalarEvolution::ExitLimit::ExitLimit(
8775-
SCEVUse E, SCEVUse ConstantMaxNotTaken,
8776-
SCEVUse SymbolicMaxNotTaken, bool MaxOrZero,
8777-
ArrayRef<ArrayRef<const SCEVPredicate *>> PredLists)
8774+
SCEVUse E, SCEVUse ConstantMaxNotTaken, SCEVUse SymbolicMaxNotTaken,
8775+
bool MaxOrZero, ArrayRef<ArrayRef<const SCEVPredicate *>> PredLists)
87788776
: ExactNotTaken(E), ConstantMaxNotTaken(ConstantMaxNotTaken),
87798777
SymbolicMaxNotTaken(SymbolicMaxNotTaken), MaxOrZero(MaxOrZero) {
87808778
// If we prove the max count is zero, so is the symbolic bound. This happens
@@ -8813,8 +8811,7 @@ ScalarEvolution::ExitLimit::ExitLimit(
88138811
"Max backedge count should be int");
88148812
}
88158813

8816-
ScalarEvolution::ExitLimit::ExitLimit(SCEVUse E,
8817-
SCEVUse ConstantMaxNotTaken,
8814+
ScalarEvolution::ExitLimit::ExitLimit(SCEVUse E, SCEVUse ConstantMaxNotTaken,
88188815
SCEVUse SymbolicMaxNotTaken,
88198816
bool MaxOrZero,
88208817
ArrayRef<const SCEVPredicate *> PredList)
@@ -12947,9 +12944,9 @@ SCEVUse ScalarEvolution::computeMaxBECountForLT(SCEVUse Start, SCEVUse Stride,
1294712944
}
1294812945

1294912946
ScalarEvolution::ExitLimit
12950-
ScalarEvolution::howManyLessThans(SCEVUse LHS, SCEVUse RHS,
12951-
const Loop *L, bool IsSigned,
12952-
bool ControlsOnlyExit, bool AllowPredicates) {
12947+
ScalarEvolution::howManyLessThans(SCEVUse LHS, SCEVUse RHS, const Loop *L,
12948+
bool IsSigned, bool ControlsOnlyExit,
12949+
bool AllowPredicates) {
1295312950
SmallVector<const SCEVPredicate *> Predicates;
1295412951

1295512952
const SCEVAddRecExpr *IV = dyn_cast<SCEVAddRecExpr>(LHS);
@@ -13386,9 +13383,10 @@ ScalarEvolution::howManyLessThans(SCEVUse LHS, SCEVUse RHS,
1338613383
Predicates);
1338713384
}
1338813385

13389-
ScalarEvolution::ExitLimit ScalarEvolution::howManyGreaterThans(
13390-
SCEVUse LHS, SCEVUse RHS, const Loop *L, bool IsSigned,
13391-
bool ControlsOnlyExit, bool AllowPredicates) {
13386+
ScalarEvolution::ExitLimit
13387+
ScalarEvolution::howManyGreaterThans(SCEVUse LHS, SCEVUse RHS, const Loop *L,
13388+
bool IsSigned, bool ControlsOnlyExit,
13389+
bool AllowPredicates) {
1339213390
SmallVector<const SCEVPredicate *> Predicates;
1339313391
// We handle only IV > Invariant
1339413392
if (!isLoopInvariant(RHS, L))
@@ -14804,8 +14802,8 @@ class SCEVPredicateRewriter : public SCEVRewriteVisitor<SCEVPredicateRewriter> {
1480414802
/// If \p NewPreds is non-null, rewrite is free to add further predicates to
1480514803
/// \p NewPreds such that the result will be an AddRecExpr.
1480614804
static SCEVUse rewrite(SCEVUse S, const Loop *L, ScalarEvolution &SE,
14807-
SmallVectorImpl<const SCEVPredicate *> *NewPreds,
14808-
const SCEVPredicate *Pred) {
14805+
SmallVectorImpl<const SCEVPredicate *> *NewPreds,
14806+
const SCEVPredicate *Pred) {
1480914807
SCEVPredicateRewriter Rewriter(L, SE, NewPreds, Pred);
1481014808
return Rewriter.visit(S);
1481114809
}
@@ -14919,8 +14917,7 @@ SCEVUse ScalarEvolution::rewriteUsingPredicate(SCEVUse S, const Loop *L,
1491914917
}
1492014918

1492114919
const SCEVAddRecExpr *ScalarEvolution::convertSCEVToAddRecWithPredicates(
14922-
SCEVUse S, const Loop *L,
14923-
SmallVectorImpl<const SCEVPredicate *> &Preds) {
14920+
SCEVUse S, const Loop *L, SmallVectorImpl<const SCEVPredicate *> &Preds) {
1492414921
SmallVector<const SCEVPredicate *> TransformPreds;
1492514922
S = SCEVPredicateRewriter::rewrite(S, L, *this, &TransformPreds, nullptr);
1492614923
auto *AddRec = dyn_cast<SCEVAddRecExpr>(S);

llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ bool InductiveRangeCheck::reassociateSubLHS(
430430
auto getExprScaledIfOverflow = [&](Instruction::BinaryOps BinOp,
431431
const SCEV *LHS,
432432
const SCEV *RHS) -> const SCEV * {
433-
SCEVUse (ScalarEvolution:: *Operation)(SCEVUse, SCEVUse, SCEV::NoWrapFlags,
434-
unsigned);
433+
SCEVUse (ScalarEvolution::*Operation)(SCEVUse, SCEVUse, SCEV::NoWrapFlags,
434+
unsigned);
435435
switch (BinOp) {
436436
default:
437437
llvm_unreachable("Unsupported binary op");

0 commit comments

Comments
 (0)