Revert "Some clang-formatness"

This reverts commit f484375.

Author: jmorse

llvm/include/llvm/Analysis/LoopIterator.h

@@ -97,8 +97,8 @@ struct LoopBodyTraits {
 class LoopBlocksDFS {
 public:
   /// Postorder list iterators.
-  typedef SmallVector<BasicBlock *, 16>::const_iterator POIterator;
-  typedef SmallVector<BasicBlock *, 16>::const_reverse_iterator RPOIterator;
+  typedef SmallVector<BasicBlock*, 16>::const_iterator POIterator;
+  typedef SmallVector<BasicBlock*, 16>::const_reverse_iterator RPOIterator;
 
   friend class LoopBlocksTraversal;
 
@@ -108,8 +108,8 @@ class LoopBlocksDFS {
   /// Map each block to its postorder number. A block is only mapped after it is
   /// preorder visited by DFS. It's postorder number is initially zero and set
   /// to nonzero after it is finished by postorder traversal.
-  SmallDenseMap<BasicBlock *, unsigned, 16> PostNumbers;
-  SmallVector<BasicBlock *, 16> PostBlocks;
+  SmallDenseMap<BasicBlock*, unsigned, 16> PostNumbers;
+  SmallVector<BasicBlock*, 16> PostBlocks;
 
 public:
   LoopBlocksDFS(Loop *Container) :

llvm/lib/Analysis/MustExecute.cpp

@@ -28,7 +28,8 @@ using namespace llvm;
 
 #define DEBUG_TYPE "must-execute"
 
-const BlockColorMapT &LoopSafetyInfo::getBlockColors() const {
+const BlockColorMapT &
+LoopSafetyInfo::getBlockColors() const {
   return BlockColors;
 }
 

llvm/lib/Target/X86/X86WinEHState.cpp

@@ -70,10 +70,10 @@ class WinEHStatePass : public FunctionPass {
   bool isStateStoreNeeded(EHPersonality Personality, CallBase &Call);
   void rewriteSetJmpCall(IRBuilder<> &Builder, Function &F, CallBase &Call,
                          Value *State);
-  int getBaseStateForBB(BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
-                        BasicBlock *BB);
-  int getStateForCall(BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
-                      CallBase &Call);
+  int getBaseStateForBB(BlockColorMapT &BlockColors,
+                        WinEHFuncInfo &FuncInfo, BasicBlock *BB);
+  int getStateForCall(BlockColorMapT &BlockColors,
+                      WinEHFuncInfo &FuncInfo, CallBase &Call);
 
   // Module-level type getters.
   Type *getEHLinkRegistrationType();
@@ -500,8 +500,9 @@ void WinEHStatePass::rewriteSetJmpCall(IRBuilder<> &Builder, Function &F,
 }
 
 // Figure out what state we should assign calls in this block.
-int WinEHStatePass::getBaseStateForBB(BlockColorMapT &BlockColors,
-                                      WinEHFuncInfo &FuncInfo, BasicBlock *BB) {
+int WinEHStatePass::getBaseStateForBB(
+    BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
+    BasicBlock *BB) {
   int BaseState = ParentBaseState;
   auto &BBColors = BlockColors[BB];
 
@@ -518,8 +519,9 @@ int WinEHStatePass::getBaseStateForBB(BlockColorMapT &BlockColors,
 }
 
 // Calculate the state a call-site is in.
-int WinEHStatePass::getStateForCall(BlockColorMapT &BlockColors,
-                                    WinEHFuncInfo &FuncInfo, CallBase &Call) {
+int WinEHStatePass::getStateForCall(
+    BlockColorMapT &BlockColors, WinEHFuncInfo &FuncInfo,
+    CallBase &Call) {
   if (auto *II = dyn_cast<InvokeInst>(&Call)) {
     // Look up the state number of the EH pad this unwinds to.
     assert(FuncInfo.InvokeStateMap.count(II) && "invoke has no state!");

llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp

@@ -863,7 +863,8 @@ BasicBlock *FuncPGOInstrumentation<Edge, BBInfo>::getInstrBB(Edge *E) {
 // funclet information, if any is needed, that should be placed on the generated
 // value profiling call for the value profile candidate call.
 static void
-populateEHOperandBundle(VPCandidateInfo &Cand, BlockColorMapT &BlockColors,
+populateEHOperandBundle(VPCandidateInfo &Cand,
+                        BlockColorMapT &BlockColors,
                         SmallVectorImpl<OperandBundleDef> &OpBundles) {
   auto *OrigCall = dyn_cast<CallBase>(Cand.AnnotatedInst);
   if (!OrigCall)

llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp

@@ -414,7 +414,8 @@ void ObjCARCContract::tryToContractReleaseIntoStoreStrong(
 
 bool ObjCARCContract::tryToPeepholeInstruction(
     Function &F, Instruction *Inst, inst_iterator &Iter,
-    bool &TailOkForStoreStrongs, const BlockColorMapT &BlockColors) {
+    bool &TailOkForStoreStrongs,
+    const BlockColorMapT &BlockColors) {
   // Only these library routines return their argument. In particular,
   // objc_retainBlock does not necessarily return its argument.
   ARCInstKind Class = GetBasicARCInstKind(Inst);

llvm/lib/Transforms/Scalar/ConstraintElimination.cpp

@@ -288,8 +288,7 @@ class ConstraintInfo {
   SmallDenseMap<Value *, unsigned, 16> &getValue2Index(bool Signed) {
     return Signed ? SignedCS.getValue2Index() : UnsignedCS.getValue2Index();
   }
-  const SmallDenseMap<Value *, unsigned, 16> &
-  getValue2Index(bool Signed) const {
+  const SmallDenseMap<Value *, unsigned, 16> &getValue2Index(bool Signed) const {
     return Signed ? SignedCS.getValue2Index() : UnsignedCS.getValue2Index();
   }