svf-lib 1.0.1289 → 1.0.1291

package/SVF-linux/include/CFL/CFLAlias.h

@@ -58,7 +58,7 @@ public:
     virtual void solve();
 
     /// Interface exposed to users of our Alias analysis, given Value infos
-    virtual AliasResult alias(const Value* v1, const Value* v2)
+    virtual AliasResult alias(const SVFValue* v1, const SVFValue* v2)
     {
         NodeID n1 = svfir->getValueNode(v1);
         NodeID n2 = svfir->getValueNode(v2);

package/SVF-linux/include/CFL/CFLBase.h

@@ -38,7 +38,7 @@
 #include "MemoryModel/PointerAnalysis.h"
 #include "Graphs/ConsG.h"
 #include "Util/Options.h"
-#include "Util/SVFBasicTypes.h"
+#include "SVFIR/SVFType.h"
 
 namespace SVF
 {

package/SVF-linux/include/CFL/CFLGrammar.h

@@ -28,7 +28,7 @@
  */
 #ifndef CFLGrammar_H_
 #define CFLGrammar_H_
-#include "Util/SVFBasicTypes.h"
+#include "SVFIR/SVFType.h"
 
 namespace SVF
 {

package/SVF-linux/include/DDA/DDAClient.h

@@ -34,10 +34,10 @@
 #ifndef DDACLIENT_H_
 #define DDACLIENT_H_
 
-#include "MemoryModel/SVFIR.h"
+#include "SVFIR/SVFIR.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Graphs/SVFG.h"
-#include "Util/BasicTypes.h"
+#include "SVFIR/SVFValue.h"
 
 namespace SVF
 {

package/SVF-linux/include/DDA/DDAPass.h

@@ -57,13 +57,13 @@ public:
     ~DDAPass();
 
     /// Interface expose to users of our pointer analysis, given Value infos
-    virtual AliasResult alias(const Value* V1,	const Value* V2);
+    virtual AliasResult alias(const SVFValue* V1,	const SVFValue* V2);
 
     /// Interface expose to users of our pointer analysis, given PAGNodes
     virtual AliasResult alias(NodeID V1, NodeID V2);
 
     /// We start from here
-    virtual void runOnModule(SVFModule* module);
+    virtual void runOnModule(SVFIR* module);
 
     /// Select a client
     virtual void selectClient(SVFModule* module);
@@ -78,7 +78,7 @@ private:
     /// Print queries' pts
     void printQueryPTS();
     /// Create pointer analysis according to specified kind and analyze the module.
-    void runPointerAnalysis(SVFModule* module, u32_t kind);
+    void runPointerAnalysis(SVFIR* module, u32_t kind);
     /// Context insensitive Edge for DDA
     void initCxtInsensitiveEdges(PointerAnalysis* pta, const SVFG* svfg,const SVFGSCC* svfgSCC, SVFGEdgeSet& insensitveEdges);
     /// Return TRUE if this edge is inside a SVFG SCC, i.e., src node and dst node are in the same SCC on the SVFG.

package/SVF-linux/include/Graphs/CHG.h

@@ -33,7 +33,7 @@
 #ifndef CHA_H_
 #define CHA_H_
 
-#include "Util/SVFModule.h"
+#include "SVFIR/SVFModule.h"
 #include "Graphs/GenericGraph.h"
 #include "Util/WorkList.h"
 
@@ -43,7 +43,7 @@ namespace SVF
 class SVFModule;
 class CHNode;
 
-typedef Set<const GlobalValue*> VTableSet;
+typedef Set<const SVFGlobalValue*> VTableSet;
 typedef Set<const SVFFunction*> VFunSet;
 
 /// Common base for class hierarchy graph. Only implements what PointerAnalysis needs.
@@ -174,18 +174,18 @@ public:
     }
     void getVirtualFunctions(u32_t idx, FuncVector &virtualFunctions) const;
 
-    const GlobalValue *getVTable() const
+    const SVFGlobalValue *getVTable() const
     {
         return vtable;
     }
 
-    void setVTable(const GlobalValue *vtbl)
+    void setVTable(const SVFGlobalValue *vtbl)
     {
         vtable = vtbl;
     }
 
 private:
-    const GlobalValue* vtable;
+    const SVFGlobalValue* vtable;
     std::string className;
     size_t flags;
     /*

package/SVF-linux/include/Graphs/ConsG.h

@@ -74,7 +74,7 @@ protected:
 
     /// Wappers used internally, not expose to Andernsen Pass
     //@{
-    inline NodeID getValueNode(const Value* value) const
+    inline NodeID getValueNode(const SVFValue* value) const
     {
         return sccRepNode(pag->getValueNode(value));
     }

package/SVF-linux/include/Graphs/ConsGEdge.h

@@ -30,7 +30,7 @@
 #ifndef CONSGEDGE_H_
 #define CONSGEDGE_H_
 
-#include "MemoryModel/SVFIR.h"
+#include "SVFIR/SVFIR.h"
 #include "Util/WorkList.h"
 
 #include <map>

package/SVF-linux/include/Graphs/GenericGraph.h

@@ -30,7 +30,7 @@
 #ifndef GENERICGRAPH_H_
 #define GENERICGRAPH_H_
 
-#include "Util/BasicTypes.h"
+#include "SVFIR/SVFValue.h"
 
 namespace SVF
 {

package/SVF-linux/include/Graphs/ICFG.h

@@ -158,7 +158,7 @@ protected:
     /// Add control-flow edges for top level pointers
     //@{
     ICFGEdge* addIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode);
-    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s32_t branchCondVal);
+    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const SVFValue* condition, s32_t branchCondVal);
     ICFGEdge* addCallEdge(ICFGNode* srcNode, ICFGNode* dstNode, const SVFInstruction* cs);
     ICFGEdge* addRetEdge(ICFGNode* srcNode, ICFGNode* dstNode, const SVFInstruction* cs);
     //@}

package/SVF-linux/include/Graphs/ICFGEdge.h

@@ -134,7 +134,7 @@ public:
     }
     //@}
 
-    const Value* getCondition() const
+    const SVFValue* getCondition() const
     {
         return conditionVar;
     }
@@ -145,7 +145,7 @@ public:
         return branchCondVal;
     }
 
-    void setBranchCondition(const Value* c, s32_t bVal)
+    void setBranchCondition(const SVFValue* c, s32_t bVal)
     {
         conditionVar = c;
         branchCondVal = bVal;
@@ -158,7 +158,7 @@ private:
     /// branchCondVal is the value when this condition should hold to execute this CFGEdge.
     /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
     /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
-    const Value* conditionVar;
+    const SVFValue* conditionVar;
     s32_t branchCondVal;
 };
 

package/SVF-linux/include/Graphs/IRGraph.h

@@ -31,8 +31,8 @@
 #ifndef IRGRAPH_H_
 #define IRGRAPH_H_
 
-#include "MemoryModel/SVFStatements.h"
-#include "MemoryModel/SVFVariables.h"
+#include "SVFIR/SVFStatements.h"
+#include "SVFIR/SVFVariables.h"
 #include "Util/NodeIDAllocator.h"
 #include "Util/SVFUtil.h"
 #include "Graphs/ICFG.h"
@@ -49,7 +49,7 @@ class IRGraph : public GenericGraph<SVFVar,SVFStmt>
 {
 public:
     typedef Set<const SVFStmt*> SVFStmtSet;
-    typedef Map<const Value*,SVFStmtSet> ValueToEdgeMap;
+    typedef Map<const SVFValue*,SVFStmtSet> ValueToEdgeMap;
 
 protected:
     SVFStmt::KindToSVFStmtMapTy KindToSVFStmtSetMap;  // < SVFIR edge map containing all PAGEdges
@@ -78,7 +78,7 @@ protected:
     SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind, const SVFVar* op2);
 
     /// Map a value to a set of edges
-    inline void mapValueToEdge(const Value* V, SVFStmt *edge)
+    inline void mapValueToEdge(const SVFValue* V, SVFStmt *edge)
     {
         auto inserted = valueToEdgeMap.emplace(V, SVFStmtSet{edge});
         if (!inserted.second)
@@ -87,7 +87,7 @@ protected:
         }
     }
     /// get MemObj according to LLVM value
-    inline const MemObj* getMemObj(const Value* val) const
+    inline const MemObj* getMemObj(const SVFValue* val) const
     {
         return symInfo->getObj(symInfo->getObjSym(val));
     }
@@ -102,13 +102,17 @@ public:
 
     virtual ~IRGraph();
 
+    inline SymbolTableInfo* getSymbolInfo() const
+    {
+        return symInfo;
+    }
     /// Whether this SVFIR built from a txt file
     inline bool isBuiltFromFile()
     {
         return fromFile;
     }
     /// Get all SVFIR Edges that corresponds to an LLVM value
-    inline const SVFStmtSet& getValueEdges(const Value* V)
+    inline const SVFStmtSet& getValueEdges(const SVFValue* V)
     {
         auto it = valueToEdgeMap.find(V);
         if (it == valueToEdgeMap.end())
@@ -121,17 +125,17 @@ public:
 
     /// Get SVFIR Node according to LLVM value
     ///getNode - Return the node corresponding to the specified pointer.
-    inline NodeID getValueNode(const Value* V)
+    inline NodeID getValueNode(const SVFValue* V)
     {
         return symInfo->getValSym(V);
     }
-    inline bool hasValueNode(const Value* V)
+    inline bool hasValueNode(const SVFValue* V)
     {
         return symInfo->hasValSym(V);
     }
     /// getObject - Return the obj node id refer to the memory object for the
     /// specified global, heap or alloca instruction according to llvm value.
-    inline NodeID getObjectNode(const Value* V)
+    inline NodeID getObjectNode(const SVFValue* V)
     {
         return symInfo->getObjSym(V);
     }

package/SVF-linux/include/Graphs/PTACallGraph.h

@@ -31,7 +31,7 @@
 #define PTACALLGRAPH_H_
 
 #include "Graphs/GenericGraph.h"
-#include "Util/BasicTypes.h"
+#include "SVFIR/SVFValue.h"
 #include "Graphs/ICFG.h"
 #include <set>
 

package/SVF-linux/include/Graphs/SVFGOPT.h

@@ -303,11 +303,11 @@ private:
     //@{
     inline bool formalInOfAddressTakenFunc(const FormalINSVFGNode* fi) const
     {
-        return (fi->getFun()->getLLVMFun()->hasAddressTaken());
+        return (fi->getFun()->hasAddressTaken());
     }
     inline bool formalOutOfAddressTakenFunc(const FormalOUTSVFGNode* fo) const
     {
-        return (fo->getFun()->getLLVMFun()->hasAddressTaken());
+        return (fo->getFun()->hasAddressTaken());
     }
     //@}
 

package/SVF-linux/include/Graphs/ThreadCallGraph.h

@@ -70,7 +70,7 @@ public:
     virtual const std::string toString() const
     {
         std::string str;
-        raw_string_ostream rawstr(str);
+        std::stringstream rawstr(str);
         rawstr << "ThreadForkEdge ";
         rawstr << "CallSite ID: " << getCallSiteID();
         rawstr << " srcNode ID " << getSrcID() << " (fun: " << getSrcNode()->getFunction()->getName() << ")";
@@ -110,7 +110,7 @@ public:
     virtual const std::string toString() const
     {
         std::string str;
-        raw_string_ostream rawstr(str);
+        std::stringstream rawstr(str);
         rawstr << "ThreadJoinEdge ";
         rawstr << "CallSite ID: " << getCallSiteID();
         rawstr << " srcNode ID " << getSrcID() << " (fun: " << getSrcNode()->getFunction()->getName() << ")";

package/SVF-linux/include/Graphs/VFG.h

@@ -31,7 +31,7 @@
 #define INCLUDE_UTIL_VFG_H_
 
 
-#include "MemoryModel/SVFIR.h"
+#include "SVFIR/SVFIR.h"
 #include "Graphs/PTACallGraph.h"
 #include "Graphs/VFGNode.h"
 #include "Graphs/VFGEdge.h"

package/SVF-linux/include/Graphs/VFGNode.h

@@ -33,7 +33,7 @@
 #include "Graphs/GenericGraph.h"
 #include "Graphs/SVFGEdge.h"
 #include "Graphs/ICFGNode.h"
-#include "MemoryModel/SVFIR.h"
+#include "SVFIR/SVFIR.h"
 
 namespace SVF
 {
@@ -87,7 +87,7 @@ public:
     }
 
     /// Return the corresponding LLVM value, if possible, nullptr otherwise.
-    virtual const Value* getValue() const
+    virtual const SVFValue* getValue() const
     {
         return nullptr;
     }
@@ -189,7 +189,7 @@ public:
     }
     //@}
 
-    const Value* getValue() const override;
+    const SVFValue* getValue() const override;
     const std::string toString() const override;
 };
 
@@ -384,7 +384,7 @@ public:
 
     const NodeBS getDefSVFVars() const override;
 
-    const Value* getValue() const override;
+    const SVFValue* getValue() const override;
     const std::string toString() const override;
 };
 
@@ -455,7 +455,7 @@ public:
 
     const NodeBS getDefSVFVars() const override;
 
-    const Value* getValue() const override;
+    const SVFValue* getValue() const override;
     const std::string toString() const override;
 };
 
@@ -699,7 +699,7 @@ public:
 
     const NodeBS getDefSVFVars() const override;
 
-    const Value* getValue() const override;
+    const SVFValue* getValue() const override;
     const std::string toString() const override;
 };
 
@@ -836,7 +836,7 @@ public:
     }
     //@}
 
-    const Value* getValue() const override;
+    const SVFValue* getValue() const override;
     const std::string toString() const override;
 };
 

package/SVF-linux/include/MSSA/MemRegion.h

@@ -34,7 +34,7 @@
 #ifndef MEMORYREGION_H_
 #define MEMORYREGION_H_
 
-#include "MemoryModel/SVFIR.h"
+#include "SVFIR/SVFIR.h"
 #include "Graphs/PTACallGraph.h"
 #include "Util/SCC.h"
 #include "Util/WorkList.h"
@@ -480,7 +480,7 @@ public:
     NodeBS getModInfoForCall(const CallICFGNode* cs);
     NodeBS getRefInfoForCall(const CallICFGNode* cs);
     ModRefInfo getModRefInfo(const CallICFGNode* cs);
-    ModRefInfo getModRefInfo(const CallICFGNode* cs, const Value* V);
+    ModRefInfo getModRefInfo(const CallICFGNode* cs, const SVFValue* V);
     ModRefInfo getModRefInfo(const CallICFGNode* cs1, const CallICFGNode* cs2);
     //@}
 

package/SVF-linux/include/MTA/LockAnalysis.h

@@ -34,7 +34,6 @@
  *
  */
 #include "MTA/TCT.h"
-#include "SVF-FE/DataFlowUtil.h"
 
 namespace SVF
 {
@@ -437,8 +436,6 @@ private:
     /// Match context
     bool matchCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee);
 
-    void validateResults();
-
     /// Whether it is a lock site
     inline bool isTDFork(const SVFInstruction* call)
     {
@@ -455,7 +452,7 @@ private:
         return getTCG()->getThreadAPI()->isTDRelease(call);
     }
     /// Get lock value
-    inline const Value* getLockVal(const SVFInstruction* call)
+    inline const SVFValue* getLockVal(const SVFInstruction* call)
     {
         return getTCG()->getThreadAPI()->getLockVal(call);
     }

package/SVF-linux/include/MTA/MHP.h

@@ -32,7 +32,6 @@
 
 #include "MTA/TCT.h"
 #include "Util/SVFUtil.h"
-#include "SVF-FE/LLVMUtil.h"
 namespace SVF
 {
 
@@ -54,6 +53,7 @@ public:
     typedef Set<CxtThreadStmt> CxtThreadStmtSet;
     typedef Map<CxtThreadStmt,NodeBS> ThreadStmtToThreadInterleav;
     typedef Map<const SVFInstruction*,CxtThreadStmtSet> InstToThreadStmtSetMap;
+    typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
 
     typedef Set<CxtStmt> LockSpan;
 
@@ -167,9 +167,6 @@ private:
     /// Handle intra
     void handleIntra(const CxtThreadStmt& cts);
 
-    /// Use RCResultValidator to validate mhp results
-    void validateResults();
-
     /// Add/Remove interleaving thread for statement inst
     //@{
     inline void addInterleavingThread(const CxtThreadStmt& tgr, NodeID tid)
@@ -221,12 +218,6 @@ private:
     {
         return tct->getTCTNode(curTid)->isMultiforked();
     }
-
-    /// Get the next instructions following control flow
-    inline void getNextInsts(const SVFInstruction* inst, InstVec& instVec)
-    {
-        tct->getNextInsts(inst,instVec);
-    }
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
     {
@@ -265,7 +256,10 @@ private:
     NodeBS getDirAndIndJoinedTid(const CallStrCxt& cxt, const SVFInstruction* call);
 
     /// Whether a context-sensitive join satisfies symmetric loop pattern
-    const Loop* isJoinInSymmetricLoop(const CallStrCxt& cxt, const SVFInstruction* call) const;
+    bool hasJoinInSymmetricLoop(const CallStrCxt& cxt, const SVFInstruction* call) const;
+
+    /// Whether a context-sensitive join satisfies symmetric loop pattern
+    const LoopBBs& getJoinInSymmetricLoop(const CallStrCxt& cxt, const SVFInstruction* call) const;
 
     /// Whether thread t1 happens before t2 based on ForkJoin Analysis
     bool isHBPair(NodeID tid1, NodeID tid2);
@@ -303,13 +297,14 @@ public:
         TDDead,  //  thread is dead
     };
 
+    typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
     typedef TCT::InstVec InstVec;
     typedef Map<CxtStmt,ValDomain> CxtStmtToAliveFlagMap;
     typedef Map<CxtStmt,NodeBS> CxtStmtToTIDMap;
     typedef Set<NodePair> ThreadPairSet;
-    typedef Map<CxtStmt, const Loop*> CxtStmtToLoopMap;
+    typedef Map<CxtStmt, LoopBBs> CxtStmtToLoopMap;
     typedef FIFOWorkList<CxtStmt> CxtStmtWorkList;
-    typedef Map<const SVFInstruction*, PTASCEV> forkjoinToPTASCEVMap;
+
     ForkJoinAnalysis(TCT* t) : tct(t)
     {
         collectSCEVInfo();
@@ -331,12 +326,16 @@ public:
     NodeBS getDirAndIndJoinedTid(const CxtStmt& cs);
 
     /// Whether a context-sensitive join satisfies symmetric loop pattern
-    inline const Loop* isJoinInSymmetricLoop(const CxtStmt& cs) const
+    inline const LoopBBs& getJoinInSymmetricLoop(const CxtStmt& cs) const
     {
         CxtStmtToLoopMap::const_iterator it = cxtJoinInLoop.find(cs);
-        if(it!=cxtJoinInLoop.end())
-            return it->second;
-        return nullptr;
+        assert(it!=cxtJoinInLoop.end() && "does not have the loop");
+        return it->second;
+    }
+    inline bool hasJoinInSymmetricLoop(const CxtStmt& cs) const
+    {
+        CxtStmtToLoopMap::const_iterator it = cxtJoinInLoop.find(cs);
+        return it!=cxtJoinInLoop.end();
     }
     /// Whether thread t1 happens-before thread t2
     inline bool isHBPair(NodeID tid1, NodeID tid2)
@@ -368,14 +367,13 @@ public:
     }
 
     /// Get loop for join site
-    inline const Loop* getJoinLoop(const SVFInstruction* inst)
+    inline LoopBBs& getJoinLoop(const SVFInstruction* inst)
     {
         return tct->getJoinLoop(inst);
     }
-    /// Get SE for function
-    inline ScalarEvolution* getSE(const SVFInstruction* inst)
+    inline bool hasJoinLoop(const SVFInstruction* inst)
     {
-        return tct->getSE(inst);
+        return tct->hasJoinLoop(inst);
     }
 private:
 
@@ -476,11 +474,6 @@ private:
     }
     //@}
 
-    /// Get the next instructions following control flow
-    inline void getNextInsts(const SVFInstruction* inst, InstVec& instSet)
-    {
-        tct->getNextInsts(inst,instSet);
-    }
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
     {
@@ -503,12 +496,12 @@ private:
         return getTCG()->getThreadAPI()->isTDJoin(call);
     }
     /// Get forked thread
-    inline const Value* getForkedThread(const SVFInstruction* call)
+    inline const SVFValue* getForkedThread(const SVFInstruction* call)
     {
         return getTCG()->getThreadAPI()->getForkedThread(call);
     }
     /// Get joined thread
-    inline const Value* getJoinedThread(const SVFInstruction* call)
+    inline const SVFValue* getJoinedThread(const SVFInstruction* call)
     {
         return getTCG()->getThreadAPI()->getJoinedThread(call);
     }
@@ -555,7 +548,7 @@ private:
     //@}
 
     /// Add inloop join
-    inline void addSymmetricLoopJoin(const CxtStmt& cs, const Loop* lp)
+    inline void addSymmetricLoopJoin(const CxtStmt& cs, LoopBBs& lp)
     {
         cxtJoinInLoop[cs] = lp;
     }
@@ -569,8 +562,6 @@ private:
     ThreadPairSet HPPair;		///< threads happen-in-parallel
     ThreadPairSet fullJoin;		///< t1 fully joins t2 along all program path
     ThreadPairSet partialJoin;		///< t1 partially joins t2 along some program path(s)
-    PTACFInfoBuilder  ptaCFInfo; ///< PTA control flow info
-    forkjoinToPTASCEVMap fkjnToPTASCEVMap; //< map a pointer at a fork/join site to its corresponing scev expression
 };
 
 } // End namespace SVF

package/SVF-linux/include/MTA/MTA.h

@@ -36,8 +36,7 @@
 
 #include <set>
 #include <vector>
-#include "Util/BasicTypes.h"
-#include "SVF-FE/BasicTypes.h"
+#include "SVFIR/SVFValue.h"
 
 namespace SVF
 {
@@ -54,19 +53,12 @@ class SVFModule;
 /*!
  * Base data race detector
  */
-class MTA: public ModulePass
+class MTA
 {
 
 public:
-    typedef Set<const LoadInst*> LoadSet;
-    typedef Set<const StoreInst*> StoreSet;
-    typedef Map<const SVFFunction*, ScalarEvolution*> FunToSEMap;
-    typedef Map<const SVFFunction*, LoopInfo*> FunToLoopInfoMap;
-
-    /// Pass ID
-    static char ID;
-
-    static ModulePass* modulePass;
+    typedef Set<const SVFInstruction*> LoadSet;
+    typedef Set<const SVFInstruction*> StoreSet;
 
     /// Constructor
     MTA();
@@ -76,10 +68,7 @@ public:
 
 
     /// We start the pass here
-
-    virtual bool runOnModule(Module& module);
-    /// We start the pass here
-    virtual bool runOnModule(SVFModule* module);
+    virtual bool runOnModule(SVFIR* module);
     /// Compute MHP
     virtual MHP* computeMHP(SVFModule* module);
     /// Compute locksets
@@ -87,31 +76,23 @@ public:
     /// Perform detection
     virtual void detect(SVFModule* module);
 
-    /// Pass name
-    virtual llvm::StringRef getPassName() const
-    {
-        return "Multi threaded program analysis pass";
-    }
-
     void dump(Module &module, MHP *mhp, LockAnalysis *lsa);
 
-    // Get ScalarEvolution for Function F.
-    static inline ScalarEvolution* getSE(const SVFFunction* F)
+    MHP* getMHP()
     {
-        FunToSEMap::iterator it = func2ScevMap.find(F);
-        if (it != func2ScevMap.end())
-            return it->second;
-        ScalarEvolutionWrapperPass *scev = &modulePass->getAnalysis<ScalarEvolutionWrapperPass>(*const_cast<Function*>(F->getLLVMFun()));
-        func2ScevMap[F] = &scev->getSE();
-        return &scev->getSE();
+        return mhp;
     }
 
+    LockAnalysis* getLockAnalysis()
+    {
+        return lsa;
+    }
 private:
     ThreadCallGraph* tcg;
     TCT* tct;
     MTAStat* stat;
-    static FunToSEMap func2ScevMap;
-    static FunToLoopInfoMap func2LoopInfoMap;
+    MHP* mhp;
+    LockAnalysis* lsa;
 };
 
 } // End namespace SVF