From beded0615e4db1996bc38035106b7eed11669e1e Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Wed, 16 Apr 2014 13:16:19 +0000
Subject: [PATCH] Minor formatting cleanups -- no functional changes intended.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206386 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../Analysis/Analyses/ThreadSafetyCommon.h    | 38 +++++++++----------
 .../clang/Analysis/Analyses/ThreadSafetyTIL.h |  2 +-
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/include/clang/Analysis/Analyses/ThreadSafetyCommon.h b/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
index 351b709a7d..4cbb7b9137 100644
--- a/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
+++ b/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
@@ -219,6 +219,18 @@ public:
     {}
   };
 
+  SExprBuilder(til::MemRegionRef A)
+    : Arena(A), SelfVar(nullptr), Scfg(nullptr), CallCtx(nullptr),
+    CurrentBB(nullptr), CurrentBlockID(0), CurrentVarID(0),
+    CurrentArgIndex(0) {
+    // FIXME: we don't always have a self-variable.
+    SelfVar = new (Arena)til::Variable(til::Variable::VK_SFun);
+  }
+
+  ~SExprBuilder() {
+    delete CallCtx;
+  }
+
   // Translate a clang statement or expression to a TIL expression.
   // Also performs substitution of variables; Ctx provides the context.
   // Dispatches on the type of S.
@@ -226,7 +238,8 @@ public:
   til::SCFG  *buildCFG(CFGWalker &Walker);
 
   til::SExpr *lookupStmt(const Stmt *S);
-  til::SCFG  *getCFG() const { return Scfg; }
+  const til::SCFG *getCFG() const { return Scfg; }
+  til::SCFG *getCFF() { return Scfg; }
 
 private:
   til::SExpr *translateDeclRefExpr(const DeclRefExpr *DRE,
@@ -252,12 +265,11 @@ private:
 
   til::SExpr *translateDeclStmt(const DeclStmt *S, CallingContext *Ctx);
 
-private:
   // Used for looking the index of a name.
-  typedef llvm::DenseMap<const ValueDecl*, unsigned> NameIndexMap;
+  typedef llvm::DenseMap<const ValueDecl *, unsigned> NameIndexMap;
 
   // Used for looking up the current SSA variable for a name, by index.
-  typedef CopyOnWriteVector<std::pair<const ValueDecl*, til::SExpr*> >
+  typedef CopyOnWriteVector<std::pair<const ValueDecl *, til::SExpr *>>
     NameVarMap;
 
   struct BlockInfo {
@@ -299,29 +311,13 @@ private:
 
   void mergeEntryMap(NameVarMap Map);
 
-public:
-  SExprBuilder(til::MemRegionRef A)
-      : Arena(A), SelfVar(nullptr), Scfg(nullptr), CallCtx(nullptr),
-        CurrentBB(nullptr), CurrentBlockID(0), CurrentVarID(0),
-        CurrentArgIndex(0)
-  {
-    // FIXME: we don't always have a self-variable.
-    SelfVar = new (Arena) til::Variable(til::Variable::VK_SFun);
-  }
-
-  ~SExprBuilder() {
-    if (CallCtx)
-      delete CallCtx;
-  }
-
-private:
   til::MemRegionRef Arena;
   til::Variable *SelfVar;       // Variable to use for 'this'.  May be null.
   til::SCFG *Scfg;
 
   StatementMap SMap;                       // Map from Stmt to TIL Variables
   NameIndexMap IdxMap;                     // Indices of clang local vars.
-  std::vector<til::BasicBlock*> BlockMap;  // Map from clang to til BBs.
+  std::vector<til::BasicBlock *> BlockMap; // Map from clang to til BBs.
   std::vector<BlockInfo> BBInfo;           // Extra information per BB.
                                            // Indexed by clang BlockID.
   SExprBuilder::CallingContext *CallCtx;   // Root calling context
diff --git a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
index eaf9a0d3d2..331e885178 100644
--- a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
+++ b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
@@ -1108,7 +1108,7 @@ public:
     return Visitor.reducePhi(*this, Nvs);
   }
 
-  template <class C> typename C::CType compare(Phi* E, C &Cmp) {
+  template <class C> typename C::CType compare(Phi *E, C &Cmp) {
     // TODO: implement CFG comparisons
     return Cmp.comparePointers(this, E);
   }
-- 
2.40.0