svf-lib 1.0.1246 → 1.0.1248

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

@@ -58,7 +58,7 @@ class List
     class ListNode
     {
     public:
-        ListNode(const Data& d)
+        ListNode(const Data &d)
         {
             data = d;
             next = nullptr;
@@ -67,7 +67,7 @@ class List
         ~ListNode() {}
 
         Data data;
-        ListNode* next;
+        ListNode *next;
     };
 
     typedef Set<Data> DataSet;
@@ -87,16 +87,16 @@ public:
         return (head == nullptr);
     }
 
-    inline bool find(const Data& data) const
+    inline bool find(const Data &data) const
     {
-        return (nodeSet.find(data) == nodeSet.end() ? false : true);
+        return nodeSet.find(data) != nodeSet.end();
     }
 
-    void push(const Data& data)
+    void push(const Data &data)
     {
         if (nodeSet.find(data) == nodeSet.end())
         {
-            Node* new_node = new Node(data);
+            Node *new_node = new Node(data);
             if (head == nullptr)
                 head = new_node;// the list is empty
             else
@@ -109,12 +109,12 @@ public:
     {
         assert(head != nullptr && "list is empty");
         /// get node from list head
-        Node* head_node = head;
+        Node *head_node = head;
 
         /// change list head to the next node
         head = head->next;
         if (head == nullptr)
-            tail = nullptr;	/// the last node is popped.
+            tail = nullptr;    /// the last node is popped.
 
         Data data = head_node->data;
         nodeSet.erase(data);
@@ -124,8 +124,8 @@ public:
 
 private:
     DataSet nodeSet;
-    Node* head;
-    Node* tail;
+    Node *head;
+    Node *tail;
 };
 
 /**
@@ -136,6 +136,7 @@ private:
 template<class Data>
 class FIFOWorkList
 {
+    typedef Set<Data> DataSet;
     typedef std::deque<Data> DataDeque;
 public:
     FIFOWorkList() {}
@@ -147,28 +148,30 @@ public:
         return data_list.empty();
     }
 
-    inline bool find(const Data& data) const
+    inline u32_t size() const
     {
-        return std::find(data_list.begin(), data_list.end(), data) != data_list.end();
+        assert(data_list.size() == data_set.size() && "list and set must be the same size!");
+        return data_list.size();
     }
 
-    /**
-     * Push a data into the work list.
-     */
-    inline bool push(const Data& data)
+    inline bool find(const Data &data) const
     {
-        data_list.push_back(data);
-        return true;
+        return data_set.find(data) != data_set.end();
     }
 
     /**
-     * Pop a data from the END of work list.
+     * Push a data into the work list.
      */
-    inline Data pop()
+    inline bool push(const Data &data)
     {
-        Data data = front();
-        removeFront();
-        return data;
+        if (!find(data))
+        {
+            data_list.push_back(data);
+            data_set.insert(data);
+            return true;
+        }
+        else
+            return false;
     }
 
     /**
@@ -177,16 +180,29 @@ public:
     inline void removeFront()
     {
         assert(!empty() && "work list is empty");
+        data_set.erase(front());
         data_list.pop_front();
     }
 
     /**
      * Get reference of top data from the END of work list.
      */
-    inline Data& front()
+    inline Data &front()
+    {
+        assert(!empty() && "work list is empty");
+        Data &data = data_list.front();
+        return data;
+    }
+
+    /**
+     * Pop a data from the END of work list.
+     */
+    inline Data pop()
     {
         assert(!empty() && "work list is empty");
-        Data& data = data_list.front();
+        Data data = data_list.front();
+        data_list.pop_front();
+        data_set.erase(data);
         return data;
     }
 
@@ -196,10 +212,12 @@ public:
     inline void clear()
     {
         data_list.clear();
+        data_set.clear();
     }
 
 private:
-    DataDeque data_list;	///< work list using std::vector.
+    DataSet data_set;    ///< store all data in the work list.
+    DataDeque data_list;    ///< work list using std::vector.
 };
 
 /**
@@ -210,6 +228,7 @@ private:
 template<class Data>
 class FILOWorkList
 {
+    typedef Set<Data> DataSet;
     typedef std::vector<Data> DataVector;
 public:
     FILOWorkList() {}
@@ -221,18 +240,30 @@ public:
         return data_list.empty();
     }
 
-    inline bool find(const Data& data) const
+    inline u32_t size() const
     {
-        return std::find(data_list.begin(), data_list.end(), data) != data_list.end();
+        assert(data_list.size() == data_set.size() && "list and set must be the same size!");
+        return data_list.size();
+    }
+
+    inline bool find(const Data &data) const
+    {
+        return data_set.find(data) != data_set.end();;
     }
 
     /**
      * Push a data into the work list.
      */
-    inline bool push(const Data& data)
+    inline bool push(const Data &data)
     {
-        data_list.push_back(data);
-        return true;
+        if (!find(data))
+        {
+            data_list.push_back(data);
+            data_set.insert(data);
+            return true;
+        }
+        else
+            return false;
     }
 
     /**
@@ -240,8 +271,10 @@ public:
      */
     inline Data pop()
     {
-        Data data = back();
-        removeBack();
+        assert(!empty() && "work list is empty");
+        Data data = data_list.back();
+        data_list.pop_back();
+        data_set.erase(data);
         return data;
     }
 
@@ -251,16 +284,17 @@ public:
     inline void removeBack()
     {
         assert(!empty() && "work list is empty");
+        data_set.erase(back());
         data_list.pop_back();
     }
 
     /**
      * Get reference of top data from the END of work list.
      */
-    inline Data& back()
+    inline Data &back()
     {
         assert(!empty() && "work list is empty");
-        Data& data = data_list.back();
+        Data &data = data_list.back();
         return data;
     }
 
@@ -270,10 +304,12 @@ public:
     inline void clear()
     {
         data_list.clear();
+        data_set.clear();
     }
 
 private:
-    DataVector data_list;	///< work list using std::vector.
+    DataSet data_set;    ///< store all data in the work list.
+    DataVector data_list;    ///< work list using std::vector.
 };
 
 } // End namespace SVF

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

@@ -162,13 +162,6 @@ public:
         return keyFunc->dominate(bbKey,bbValue);
     }
 
-    /// Get LoopInfo
-    inline LoopInfo* getLoopInfo(const Function* f)
-    {
-        return cfInfoBuilder.getLoopInfo(f);
-    }
-
-
     /// Guard Computation for a value-flow (between two basic blocks)
     //@{
     virtual Condition ComputeIntraVFGGuard(const BasicBlock* src, const BasicBlock* dst);

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

@@ -26,6 +26,8 @@
 
 #include <llvm/Support/SourceMgr.h>
 
+#include "llvm/Analysis/LoopInfo.h"
+
 namespace SVF
 {
 
@@ -73,6 +75,11 @@ typedef llvm::DominanceFrontier DominanceFrontier;
 typedef llvm::PostDominatorTree PostDominatorTree;
 typedef llvm::DominanceFrontierBase<llvm::BasicBlock, false> DominanceFrontierBase;
 
+/// LLVM Loop
+typedef llvm::Loop Loop;
+typedef llvm::LoopInfo LoopInfo;
+typedef llvm::User User;
+
 // LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;
 typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;

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

@@ -55,7 +55,6 @@
 #include <llvm/BinaryFormat/Dwarf.h>
 #endif
 
-#include "llvm/Analysis/LoopInfo.h"
 #include "llvm/IR/CFG.h"
 #include "llvm/BinaryFormat/Dwarf.h"
 
@@ -74,9 +73,6 @@ typedef llvm::Instruction Instruction;
 typedef llvm::CallBase CallBase;
 typedef llvm::GlobalValue GlobalValue;
 typedef llvm::GlobalVariable GlobalVariable;
-typedef llvm::User User;
-typedef llvm::Loop Loop;
-typedef llvm::LoopInfo LoopInfo;
 
 /// LLVM outputs
 typedef llvm::raw_string_ostream raw_string_ostream;
@@ -129,11 +125,8 @@ private:
     Map<const BasicBlock*,Set<const BasicBlock*>> dtBBsMap;
     Map<const BasicBlock*,Set<const BasicBlock*>> dfBBsMap;
     Map<const BasicBlock*,Set<const BasicBlock*>> pdtBBsMap;
+    Map<const BasicBlock*,std::vector<const BasicBlock*>> bb2LoopMap;
 public:
-    SVFFunction(const std::string& val): SVFValue(val,SVFValue::SVFFunc),
-        isDecl(false), isIntri(false), fun(nullptr), exitBB(nullptr), isUncalled(false), isNotRet(false)
-    {
-    }
 
     SVFFunction(Function* f): SVFValue(f->getName().str(),SVFValue::SVFFunc),
         isDecl(f->isDeclaration()), isIntri(f->isIntrinsic()), fun(f), exitBB(nullptr), isUncalled(false), isNotRet(false)
@@ -216,6 +209,28 @@ public:
         return dfBBsMap;
     }
 
+    inline bool hasLoopInfo(const BasicBlock* bb) const
+    {
+        return bb2LoopMap.find(bb)!=bb2LoopMap.end();
+    }
+
+    inline const std::vector<const BasicBlock*>& getLoopInfo(const BasicBlock* bb) const
+    {
+        Map<const BasicBlock*, std::vector<const BasicBlock*>>::const_iterator mapIter = bb2LoopMap.find(bb);
+        if(mapIter != bb2LoopMap.end())
+            return mapIter->second;
+        else
+        {
+            assert(hasLoopInfo(bb) && "loopinfo does not exit(bb not in a loop)");
+            abort();
+        }
+    }
+
+    inline void addToBB2LoopMap(const BasicBlock* bb, const BasicBlock* loopBB)
+    {
+        bb2LoopMap[bb].push_back(loopBB);
+    }
+
     inline const Map<const BasicBlock*,Set<const BasicBlock*>>& getPostDomTreeMap() const
     {
         return pdtBBsMap;
@@ -251,6 +266,35 @@ public:
         return this->exitBB;
     }
 
+    void getExitBlocksOfLoop(const BasicBlock* bb, Set<const BasicBlock*>& exitbbs) const
+    {
+        if (hasLoopInfo(bb))
+        {
+            const std::vector<const BasicBlock*>& blocks = getLoopInfo(bb);
+            assert(!blocks.empty() && "no available loop info?");
+            for (const BasicBlock* block : blocks)
+            {
+                for (succ_const_iterator succIt = succ_begin(block); succIt != succ_end(block); succIt++)
+                {
+                    const BasicBlock* succ = *succIt;
+                    if ((std::find(blocks.begin(), blocks.end(), succ)==blocks.end()))
+                        exitbbs.insert(succ);
+                }
+            }
+        }
+    }
+
+    bool isLoopHeader(const BasicBlock* bb) const
+    {
+        if (hasLoopInfo(bb))
+        {
+            const std::vector<const BasicBlock*>& blocks = getLoopInfo(bb);
+            assert(!blocks.empty() && "no available loop info?");
+            return blocks.front() == bb;
+        }
+        return false;
+    }
+
     bool dominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const
     {
         if (bbKey == bbValue)
@@ -352,7 +396,6 @@ public:
     {
         return CB;
     }
-    using arg_iterator = User::const_op_iterator;
     Value *getArgument(unsigned ArgNo) const
     {
         return CB->getArgOperand(ArgNo);
@@ -361,14 +404,6 @@ public:
     {
         return CB->getType();
     }
-    User::const_op_iterator arg_begin() const
-    {
-        return CB->arg_begin();
-    }
-    User::const_op_iterator arg_end() const
-    {
-        return CB->arg_end();
-    }
     unsigned arg_size() const
     {
         return CB->arg_size();

package/package.json

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