Skip to content

Commit f484375

Browse files
committed
Some clang-formatness
I'm not going to fix all the clang-format errors as there's a lot of surrounding cruft that I haven't actually changed.
1 parent d2b935e commit f484375

File tree

6 files changed

+17
-21
lines changed

6 files changed

+17
-21
lines changed

llvm/include/llvm/Analysis/LoopIterator.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ struct LoopBodyTraits {
9797
class LoopBlocksDFS {
9898
public:
9999
/// Postorder list iterators.
100-
typedef SmallVector<BasicBlock*, 16>::const_iterator POIterator;
101-
typedef SmallVector<BasicBlock*, 16>::const_reverse_iterator RPOIterator;
100+
typedef SmallVector<BasicBlock *, 16>::const_iterator POIterator;
101+
typedef SmallVector<BasicBlock *, 16>::const_reverse_iterator RPOIterator;
102102

103103
friend class LoopBlocksTraversal;
104104

@@ -108,8 +108,8 @@ class LoopBlocksDFS {
108108
/// Map each block to its postorder number. A block is only mapped after it is
109109
/// preorder visited by DFS. It's postorder number is initially zero and set
110110
/// to nonzero after it is finished by postorder traversal.
111-
SmallDenseMap<BasicBlock*, unsigned, 16> PostNumbers;
112-
SmallVector<BasicBlock*, 16> PostBlocks;
111+
SmallDenseMap<BasicBlock *, unsigned, 16> PostNumbers;
112+
SmallVector<BasicBlock *, 16> PostBlocks;
113113

114114
public:
115115
LoopBlocksDFS(Loop *Container) :

llvm/lib/Analysis/MustExecute.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ using namespace llvm;
2828

2929
#define DEBUG_TYPE "must-execute"
3030

31-
const BlockColorMapT &
32-
LoopSafetyInfo::getBlockColors() const {
31+
const BlockColorMapT &LoopSafetyInfo::getBlockColors() const {
3332
return BlockColors;
3433
}
3534

llvm/lib/Target/X86/X86WinEHState.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ class WinEHStatePass : public FunctionPass {
7070
bool isStateStoreNeeded(EHPersonality Personality, CallBase &Call);
7171
void rewriteSetJmpCall(IRBuilder<> &Builder, Function &F, CallBase &Call,
7272
Value *State);
73-
int getBaseStateForBB(BlockColorMapT &BlockColors,
74-
WinEHFuncInfo &FuncInfo, BasicBlock *BB);
75-
int getStateForCall(BlockColorMapT &BlockColors,
76-
WinEHFuncInfo &FuncInfo, CallBase &Call);
73+
int getBaseStateForBB(BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
74+
BasicBlock *BB);
75+
int getStateForCall(BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
76+
CallBase &Call);
7777

7878
// Module-level type getters.
7979
Type *getEHLinkRegistrationType();
@@ -500,9 +500,8 @@ void WinEHStatePass::rewriteSetJmpCall(IRBuilder<> &Builder, Function &F,
500500
}
501501

502502
// Figure out what state we should assign calls in this block.
503-
int WinEHStatePass::getBaseStateForBB(
504-
BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
505-
BasicBlock *BB) {
503+
int WinEHStatePass::getBaseStateForBB(BlockColorMapT &BlockColors,
504+
WinEHFuncInfo &FuncInfo, BasicBlock *BB) {
506505
int BaseState = ParentBaseState;
507506
auto &BBColors = BlockColors[BB];
508507

@@ -519,9 +518,8 @@ int WinEHStatePass::getBaseStateForBB(
519518
}
520519

521520
// Calculate the state a call-site is in.
522-
int WinEHStatePass::getStateForCall(
523-
BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
524-
CallBase &Call) {
521+
int WinEHStatePass::getStateForCall(BlockColorMapT &BlockColors,
522+
WinEHFuncInfo &FuncInfo, CallBase &Call) {
525523
if (auto *II = dyn_cast<InvokeInst>(&Call)) {
526524
// Look up the state number of the EH pad this unwinds to.
527525
assert(FuncInfo.InvokeStateMap.count(II) && "invoke has no state!");

llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,7 @@ BasicBlock *FuncPGOInstrumentation<Edge, BBInfo>::getInstrBB(Edge *E) {
863863
// funclet information, if any is needed, that should be placed on the generated
864864
// value profiling call for the value profile candidate call.
865865
static void
866-
populateEHOperandBundle(VPCandidateInfo &Cand,
867-
BlockColorMapT &BlockColors,
866+
populateEHOperandBundle(VPCandidateInfo &Cand, BlockColorMapT &BlockColors,
868867
SmallVectorImpl<OperandBundleDef> &OpBundles) {
869868
auto *OrigCall = dyn_cast<CallBase>(Cand.AnnotatedInst);
870869
if (!OrigCall)

llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,7 @@ void ObjCARCContract::tryToContractReleaseIntoStoreStrong(
414414

415415
bool ObjCARCContract::tryToPeepholeInstruction(
416416
Function &F, Instruction *Inst, inst_iterator &Iter,
417-
bool &TailOkForStoreStrongs,
418-
const BlockColorMapT &BlockColors) {
417+
bool &TailOkForStoreStrongs, const BlockColorMapT &BlockColors) {
419418
// Only these library routines return their argument. In particular,
420419
// objc_retainBlock does not necessarily return its argument.
421420
ARCInstKind Class = GetBasicARCInstKind(Inst);

llvm/lib/Transforms/Scalar/ConstraintElimination.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ class ConstraintInfo {
288288
SmallDenseMap<Value *, unsigned, 16> &getValue2Index(bool Signed) {
289289
return Signed ? SignedCS.getValue2Index() : UnsignedCS.getValue2Index();
290290
}
291-
const SmallDenseMap<Value *, unsigned, 16> &getValue2Index(bool Signed) const {
291+
const SmallDenseMap<Value *, unsigned, 16> &
292+
getValue2Index(bool Signed) const {
292293
return Signed ? SignedCS.getValue2Index() : UnsignedCS.getValue2Index();
293294
}
294295

0 commit comments

Comments
 (0)