svf-lib 1.0.1234 → 1.0.1236

package/SVF-osx/include/MSSA/MemSSA.h

@@ -120,8 +120,6 @@ public:
 protected:
     BVDataPTAImpl* pta;
     MRGenerator* mrGen;
-    DominanceFrontier* df;
-    DominatorTree* dt;
     MemSSAStat* stat;
 
     /// Create mu chi for candidate regions in a function
@@ -291,19 +289,6 @@ private:
             phi->setOpVer(getTopStackVer(phi->getMR()), pos);
         }
     }
-
-    //@}
-    /// Get/set methods for dominace frontier/tree
-    //@{
-    DominanceFrontier* getDF(const SVFFunction&)
-    {
-        return df;
-    }
-    DominatorTree* getDT(const SVFFunction&)
-    {
-        return dt;
-    }
-    void setCurrentDFDT(DominanceFrontier* f, DominatorTree* t);
     //@}
 
 public:
@@ -328,7 +313,7 @@ public:
         return mrGen;
     }
     /// We start from here
-    virtual void buildMemSSA(const SVFFunction& fun,DominanceFrontier*, DominatorTree*);
+    virtual void buildMemSSA(const SVFFunction& fun);
 
     /// Perform statistics
     void performStat();

package/SVF-osx/include/MSSA/SVFGBuilder.h

@@ -36,23 +36,6 @@
 namespace SVF
 {
 
-/*!
- * Dominator frontier used in MSSA
- */
-class MemSSADF : public DominanceFrontier
-{
-public:
-    MemSSADF() : DominanceFrontier()
-    {}
-
-    bool runOnDT(DominatorTree& dt)
-    {
-        releaseMemory();
-        analyze(dt);
-        return false;
-    }
-};
-
 /*!
  * SVFG Builder
  */

package/SVF-osx/include/SABER/SaberCondAllocator.h

@@ -144,16 +144,24 @@ public:
         return negConds.test(id);
     }
 
-    /// Get dominators
-    inline DominatorTree* getDT(const Function* fun)
+    inline bool postDominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const
     {
-        return cfInfoBuilder.getDT(fun);
+        const SVFFunction*  keyFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(bbKey->getParent());
+        const SVFFunction*  valueFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(bbValue->getParent());
+        assert((keyFunc == valueFunc) && "two basicblocks should be in the same function!");
+
+        return keyFunc->postDominate(bbKey,bbValue);
     }
-    /// Get Postdominators
-    inline PostDominatorTree* getPostDT(const Function* fun)
+
+    inline bool dominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const
     {
-        return cfInfoBuilder.getPostDT(fun);
+        const SVFFunction*  keyFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(bbKey->getParent());
+        const SVFFunction*  valueFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(bbValue->getParent());
+        assert((keyFunc == valueFunc) && "two basicblocks should be in the same function!");
+
+        return keyFunc->dominate(bbKey,bbValue);
     }
+
     /// Get LoopInfo
     inline LoopInfo* getLoopInfo(const Function* f)
     {

package/SVF-osx/include/SVF-FE/BasicTypes.h

@@ -17,6 +17,8 @@
 #include <llvm/IR/DerivedTypes.h>
 
 #include <llvm/Analysis/MemoryLocation.h>
+#include <llvm/Analysis/DominanceFrontier.h>
+#include <llvm/Analysis/PostDominators.h>
 #include <llvm/Analysis/ScalarEvolution.h>
 #include <llvm/Analysis/ScalarEvolutionExpressions.h>
 
@@ -64,6 +66,13 @@ typedef llvm::ConstantData ConstantData;
 typedef llvm::ConstantArray ConstantArray;
 typedef llvm::Constant Constant;
 
+/// LLVM Dominators
+typedef llvm::DominatorTree DominatorTree;
+typedef llvm::DomTreeNode DomTreeNode;
+typedef llvm::DominanceFrontier DominanceFrontier;
+typedef llvm::PostDominatorTree PostDominatorTree;
+typedef llvm::DominanceFrontierBase<llvm::BasicBlock, false> DominanceFrontierBase;
+
 // LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;
 typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;

package/SVF-osx/include/SVF-FE/LLVMModule.h

@@ -42,9 +42,9 @@ class LLVMModuleSet
 {
 public:
 
-    typedef std::vector<const SVFFunction*> FunctionSetType;
-    typedef Map<const SVFFunction*, const SVFFunction*> FunDeclToDefMapTy;
-    typedef Map<const SVFFunction*, FunctionSetType> FunDefToDeclsMapTy;
+    typedef std::vector<const Function*> FunctionSetType;
+    typedef Map<const Function*, const Function*> FunDeclToDefMapTy;
+    typedef Map<const Function*, FunctionSetType> FunDefToDeclsMapTy;
     typedef Map<const GlobalVariable*, GlobalVariable*> GlobalDefToRepMapTy;
 
 private:
@@ -133,25 +133,14 @@ public:
         return nullptr;
     }
 
-    /// Fun decl --> def
     bool hasDefinition(const Function *fun) const
-    {
-        return hasDefinition(svfModule->getSVFFunction(fun));
-    }
-
-    bool hasDefinition(const SVFFunction *fun) const
     {
         assert(fun->isDeclaration() && "not a function declaration?");
         FunDeclToDefMapTy::const_iterator it = FunDeclToDefMap.find(fun);
         return it != FunDeclToDefMap.end();
     }
 
-    const SVFFunction *getDefinition(const Function *fun) const
-    {
-        return getDefinition(svfModule->getSVFFunction(fun));
-    }
-
-    const SVFFunction *getDefinition(const SVFFunction *fun) const
+    const Function *getDefinition(const Function *fun) const
     {
         assert(fun->isDeclaration() && "not a function declaration?");
         FunDeclToDefMapTy::const_iterator it = FunDeclToDefMap.find(fun);
@@ -159,18 +148,12 @@ public:
         return it->second;
     }
 
-    /// Fun def --> decl
     bool hasDeclaration(const Function *fun) const
-    {
-        return hasDeclaration(svfModule->getSVFFunction(fun));
-    }
-
-    bool hasDeclaration(const SVFFunction *fun) const
     {
         if(fun->isDeclaration() && !hasDefinition(fun))
             return false;
 
-        const SVFFunction* funDef = fun;
+        const Function* funDef = fun;
         if(fun->isDeclaration() && hasDefinition(fun))
             funDef = getDefinition(fun);
 
@@ -180,12 +163,7 @@ public:
 
     const FunctionSetType& getDeclaration(const Function *fun) const
     {
-        return getDeclaration(svfModule->getSVFFunction(fun));
-    }
-
-    const FunctionSetType& getDeclaration(const SVFFunction *fun) const
-    {
-        const SVFFunction* funDef = fun;
+        const Function* funDef = fun;
         if(fun->isDeclaration() && hasDefinition(fun))
             funDef = getDefinition(fun);
 

package/SVF-osx/include/Util/BasicTypes.h

@@ -103,12 +103,6 @@ typedef llvm::CallInst CallInst;
 typedef llvm::StoreInst StoreInst;
 typedef llvm::LoadInst LoadInst;
 
-/// LLVM Dominators
-typedef llvm::DominanceFrontier DominanceFrontier;
-typedef llvm::DominatorTree DominatorTree;
-typedef llvm::PostDominatorTree PostDominatorTree;
-typedef llvm::DomTreeNode DomTreeNode;
-typedef llvm::DominanceFrontierBase<BasicBlock, false> DominanceFrontierBase;
 
 /// LLVM Iterators
 #if LLVM_VERSION_MAJOR >= 11
@@ -132,6 +126,9 @@ private:
     std::vector<const BasicBlock*> reachableBBs;
     bool isUncalled;
     bool isNotRet;
+    Map<const BasicBlock*,Set<const BasicBlock*>> dtBBsMap;
+    Map<const BasicBlock*,Set<const BasicBlock*>> dfBBsMap;
+    Map<const BasicBlock*,Set<const BasicBlock*>> pdtBBsMap;
 public:
     SVFFunction(const std::string& val): SVFValue(val,SVFValue::SVFFunc),
         isDecl(false), isIntri(false), fun(nullptr), exitBB(nullptr), isUncalled(false), isNotRet(false)
@@ -209,7 +206,42 @@ public:
         this->reachableBBs = reachableBBs;
     }
 
-    inline const bool isNotRetFunction() const
+    inline const Map<const BasicBlock*,Set<const BasicBlock*>>& getDomFrontierMap() const
+    {
+        return dfBBsMap;
+    }
+
+    inline Map<const BasicBlock*,Set<const BasicBlock*>>& getDomFrontierMap()
+    {
+        return dfBBsMap;
+    }
+
+    inline const Map<const BasicBlock*,Set<const BasicBlock*>>& getPostDomTreeMap() const
+    {
+        return pdtBBsMap;
+    }
+
+    inline Map<const BasicBlock*,Set<const BasicBlock*>>& getPostDomTreeMap()
+    {
+        return pdtBBsMap;
+    }
+
+    inline Map<const BasicBlock*,Set<const BasicBlock*>>& getDomTreeMap()
+    {
+        return dtBBsMap;
+    }
+
+    inline const Map<const BasicBlock*,Set<const BasicBlock*>>& getDomTreeMap() const
+    {
+        return dtBBsMap;
+    }
+
+    inline bool isUnreachable(const BasicBlock* bb) const
+    {
+        return std::find(reachableBBs.begin(), reachableBBs.end(), bb)==reachableBBs.end();
+    }
+
+    inline bool isNotRetFunction() const
     {
         return isNotRet;
     }
@@ -219,6 +251,67 @@ public:
         return this->exitBB;
     }
 
+    bool dominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const
+    {
+        if (bbKey == bbValue)
+            return true;
+
+        // An unreachable node is dominated by anything.
+        if (isUnreachable(bbValue))
+        {
+            return true;
+        }
+
+        // And dominates nothing.
+        if (isUnreachable(bbKey))
+        {
+            return false;
+        }
+
+        const Map<const BasicBlock*,Set<const BasicBlock*>>& dtBBsMap = getDomTreeMap();
+        Map<const BasicBlock*,Set<const BasicBlock*>>::const_iterator mapIter = dtBBsMap.find(bbKey);
+        if (mapIter != dtBBsMap.end())
+        {
+            const Set<const BasicBlock*> & dtBBs = mapIter->second;
+            if (dtBBs.find(bbValue) != dtBBs.end())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    bool postDominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const
+    {
+        if (bbKey == bbValue)
+            return true;
+
+        // An unreachable node is dominated by anything.
+        if (isUnreachable(bbValue))
+        {
+            return true;
+        }
+
+        // And dominates nothing.
+        if (isUnreachable(bbKey))
+        {
+            return false;
+        }
+
+        const Map<const BasicBlock*,Set<const BasicBlock*>>& dtBBsMap = getPostDomTreeMap();
+        Map<const BasicBlock*,Set<const BasicBlock*>>::const_iterator mapIter = dtBBsMap.find(bbKey);
+        if (mapIter != dtBBsMap.end())
+        {
+            const Set<const BasicBlock*> & dtBBs = mapIter->second;
+            if (dtBBs.find(bbValue) != dtBBs.end())
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     // Dump Control Flow Graph of llvm function, with instructions
     void viewCFG();
 

package/SVF-osx/include/Util/SVFUtil.h

@@ -260,7 +260,7 @@ inline const SVFFunction* getDefFunForMultipleModule(const Function* fun)
     LLVMModuleSet* llvmModuleset = LLVMModuleSet::getLLVMModuleSet();
     const SVFFunction* svfFun = llvmModuleset->getSVFFunction(fun);
     if (fun->isDeclaration() && llvmModuleset->hasDefinition(fun))
-        svfFun = LLVMModuleSet::getLLVMModuleSet()->getDefinition(fun);
+        svfFun = llvmModuleset->getSVFFunction(LLVMModuleSet::getLLVMModuleSet()->getDefinition(fun));
     return svfFun;
 }
 

package/SVF-osx/include/Util/WorkList.h

@@ -58,7 +58,7 @@ class List
     class ListNode
     {
     public:
-        ListNode(Data d)
+        ListNode(const Data& d)
         {
             data = d;
             next = nullptr;
@@ -87,12 +87,12 @@ public:
         return (head == nullptr);
     }
 
-    inline bool find(Data data) const
+    inline bool find(const Data& data) const
     {
         return (nodeSet.find(data) == nodeSet.end() ? false : true);
     }
 
-    void push(Data data)
+    void push(const Data& data)
     {
         if (nodeSet.find(data) == nodeSet.end())
         {
@@ -136,7 +136,6 @@ private:
 template<class Data>
 class FIFOWorkList
 {
-    typedef Set<Data> DataSet;
     typedef std::deque<Data> DataDeque;
 public:
     FIFOWorkList() {}
@@ -148,35 +147,46 @@ public:
         return data_list.empty();
     }
 
-    inline bool find(Data data) const
+    inline bool find(const Data& data) const
     {
-        return (data_set.find(data) == data_set.end() ? false : true);
+        return std::find(data_list.begin(), data_list.end(), data) != data_list.end();
     }
 
     /**
      * Push a data into the work list.
      */
-    inline bool push(Data data)
+    inline bool push(const Data& data)
     {
-        if (data_set.find(data) == data_set.end())
-        {
-            data_list.push_back(data);
-            data_set.insert(data);
-            return true;
-        }
-        else
-            return false;
+        data_list.push_back(data);
+        return true;
     }
 
     /**
      * Pop a data from the END of work list.
      */
     inline Data pop()
+    {
+        Data data = front();
+        removeFront();
+        return data;
+    }
+
+    /**
+     * Remove a data from the END of work list, no return value
+     */
+    inline void removeFront()
     {
         assert(!empty() && "work list is empty");
-        Data data = data_list.front();
         data_list.pop_front();
-        data_set.erase(data);
+    }
+
+    /**
+     * Get reference of top data from the END of work list.
+     */
+    inline Data& front()
+    {
+        assert(!empty() && "work list is empty");
+        Data& data = data_list.front();
         return data;
     }
 
@@ -186,11 +196,9 @@ public:
     inline void clear()
     {
         data_list.clear();
-        data_set.clear();
     }
 
 private:
-    DataSet data_set;	///< store all data in the work list.
     DataDeque data_list;	///< work list using std::vector.
 };
 
@@ -202,7 +210,6 @@ private:
 template<class Data>
 class FILOWorkList
 {
-    typedef Set<Data> DataSet;
     typedef std::vector<Data> DataVector;
 public:
     FILOWorkList() {}
@@ -214,35 +221,46 @@ public:
         return data_list.empty();
     }
 
-    inline bool find(Data data) const
+    inline bool find(const Data& data) const
     {
-        return (data_set.find(data) == data_set.end() ? false : true);
+        return std::find(data_list.begin(), data_list.end(), data) != data_list.end();
     }
 
     /**
      * Push a data into the work list.
      */
-    inline bool push(Data data)
+    inline bool push(const Data& data)
     {
-        if (data_set.find(data) == data_set.end())
-        {
-            data_list.push_back(data);
-            data_set.insert(data);
-            return true;
-        }
-        else
-            return false;
+        data_list.push_back(data);
+        return true;
     }
 
     /**
      * Pop a data from the END of work list.
      */
     inline Data pop()
+    {
+        Data data = back();
+        removeBack();
+        return data;
+    }
+
+    /**
+     * Remove a data from the END of work list, no return value
+     */
+    inline void removeBack()
     {
         assert(!empty() && "work list is empty");
-        Data data = data_list.back();
         data_list.pop_back();
-        data_set.erase(data);
+    }
+
+    /**
+     * Get reference of top data from the END of work list.
+     */
+    inline Data& back()
+    {
+        assert(!empty() && "work list is empty");
+        Data& data = data_list.back();
         return data;
     }
 
@@ -252,11 +270,9 @@ public:
     inline void clear()
     {
         data_list.clear();
-        data_set.clear();
     }
 
 private:
-    DataSet data_set;	///< store all data in the work list.
     DataVector data_list;	///< work list using std::vector.
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1234",
+  "version": "1.0.1236",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {