svf-lib 1.0.1258 → 1.0.1260

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

@@ -107,10 +107,9 @@ public:
         if (edge != nullptr )
         {
             return false;
-
         }
-        CFLGrammar::Kind copyKind = grammar->str2Kind("Copy");
-        CFLGrammar::Kind copybarKind = grammar->str2Kind("Copybar");
+        CFLGrammar::Kind copyKind = grammar->str2Kind("copy");
+        CFLGrammar::Kind copybarKind = grammar->str2Kind("copybar");
         solver->pushIntoWorklist(graph->addCFLEdge(graph->getGNode(src),graph->getGNode(dst), copyKind));
         solver->pushIntoWorklist(graph->addCFLEdge(graph->getGNode(dst),graph->getGNode(src), copybarKind));
         return true;

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

@@ -246,6 +246,8 @@ public:
 
     Symbol insertNonTerminalSymbol(std::string strLit);
 
+    Symbol insertTerminalSymbol(std::string strLit);
+
     void insertAttribute(Kind kind, Attribute a);
 
     inline static Kind getAttributedKind(Attribute attribute, Kind kind)

package/SVF-osx/include/CFL/CFLGrammar.txt

@@ -1,39 +1,39 @@
 Start:  
    V
 Terminal:
-   Addr Copy Store Load Gep Vgep 
+   addr copy store load gep vgep 
 Productions:
    F -> epsilon;
-   F -> F Copy;
-   F -> Addr Memflow;
-   F -> F Store V Load;
-   F -> Store Memflow Load;
+   F -> F copy;
+   F -> addr Memflow;
+   F -> F store V load;
+   F -> store Memflow load;
    Fbar -> epsilon;
-   Fbar -> Copybar Fbar;
-   Fbar -> Memflowbar Addrbar;
-   Fbar -> Loadbar V Storebar Fbar;
-   Fbar -> Loadbar Memflowbar Storebar;
+   Fbar -> copybar Fbar;
+   Fbar -> Memflowbar addrbar;
+   Fbar -> loadbar V storebar Fbar;
+   Fbar -> loadbar Memflowbar storebar;
    V -> Fbar V F;
-   V -> Addrbar Addr;
-   V -> Gepbar_i V Gep_i;
-   V -> Gepbarpath V Gep_0;
-   V -> Gepbar_i F Gep_i;
-   V -> Gepbar_i Fbar Gep_i;
-   Copy -> Vgep;
-   Copybar -> Vgepbar;
-   Gep_1 -> Gep_0 F Gep_1;
-   Gepbar_1 -> Gepbar_1 Fbar Gepbar_0;
-   Gep_1 -> Gep_0 F Vgep;
-   Gepbar_1 -> Vgepbar Fbar Gepbar_0;
-   Gepbarpath -> Gepbar_0 Gepbar_0;
-   Gepbarpath -> Gepbarpath Gepbar_0;
-   Memflow -> Load Store;
+   V -> addrbar addr;
+   V -> gepbar_i V gep_i;
+   V -> gepbarpath V gep_0;
+   V -> gepbar_i F gep_i;
+   V -> gepbar_i Fbar gep_i;
+   copy -> vgep;
+   copybar -> vgepbar;
+   gep_1 -> gep_0 F gep_1;
+   gepbar_1 -> gepbar_1 Fbar gepbar_0;
+   gep_1 -> gep_0 F vgep;
+   gepbar_1 -> vgepbar Fbar gepbar_0;
+   gepbarpath -> gepbar_0 gepbar_0;
+   gepbarpath -> gepbarpath gepbar_0;
+   Memflow -> load store;
    Memflow -> Fbar Memflow;
    Memflow -> F Memflow Fbar;
-   Memflow -> Gep_i Memflow Gepbar_i;
-   Memflow -> Gepbar_i Memflow Gep_i;
-   Memflowbar -> Storebar Loadbar;
+   Memflow -> gep_i Memflow gepbar_i;
+   Memflow -> gepbar_i Memflow gep_i;
+   Memflowbar -> storebar loadbar;
    Memflowbar -> Memflowbar F;
    Memflowbar -> F Memflowbar Fbar;
-   Memflowbar -> Gep_i Memflowbar Gepbar_i;
-   Memflowbar -> Gepbar_i Memflowbar Gep_i;
+   Memflowbar -> gep_i Memflowbar gepbar_i;
+   Memflowbar -> gepbar_i Memflowbar gep_i;

package/SVF-osx/include/CFL/PEGGrammar.txt

@@ -1,11 +1,11 @@
 Start:  
    V
 Terminal:
-   Addr Copy Store Load Gep
+   addr copy store load gep
 Productions:
-   F -> ( Copy M ? ) *;
-   Fbar -> ( M ? Copybar ) *;
-   M -> Addr V Addrbar;
-   V -> Fbar V F | Gepbar_i V Gep_i | M | epsilon | Gepbar_i Memcpy Gep_i | Gep_i Memcpy Gepbar_i | ArrayPath V Gep_0;
-   ArrayPath -> Gepbar_0 Gepbar_0 | ArrayPath Gepbar_0;
-   Memcpy -> Addrbar V Addr | Gep_i Memcpy Gepbar_i | F Memcpy Fbar;
+   F -> ( copy M ? ) *;
+   Fbar -> ( M ? copybar ) *;
+   M -> addr V addrbar;
+   V -> Fbar V F | gepbar_i V gep_i | M | epsilon | gepbar_i Memcpy gep_i | gep_i Memcpy gepbar_i | ArrayPath V gep_0;
+   ArrayPath -> gepbar_0 gepbar_0 | ArrayPath gepbar_0;
+   Memcpy -> addrbar V addr | gep_i Memcpy gepbar_i | F Memcpy Fbar;

package/SVF-osx/include/CFL/VFG.txt

@@ -1,7 +1,7 @@
 Start:  
    A
 Terminal:
-   a Call Ret
+   a call ret
 Productions:
-   A -> A A | a | Call_i A Ret_i | epsilon;
-   Abar -> Abar Abar | abar | Retbar_i Abar Callbar_i | epsilon; 
+   A -> A A | a | call_i A ret_i | epsilon;
+   Abar -> Abar Abar | abar | retbar_i Abar callbar_i | epsilon; 

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

@@ -188,6 +188,9 @@ typedef llvm::SCEVConstant SCEVConstant;
 typedef llvm::ScalarEvolution ScalarEvolution;
 typedef llvm::SCEV SCEV;
 
+/// LLVM outputs
+typedef llvm::raw_fd_ostream raw_fd_ostream;
+
 // LLVM Types.
 typedef llvm::VectorType VectorType;
 #if (LLVM_VERSION_MAJOR >= 9)

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

@@ -76,7 +76,6 @@ typedef llvm::GlobalVariable GlobalVariable;
 
 /// LLVM outputs
 typedef llvm::raw_string_ostream raw_string_ostream;
-typedef llvm::raw_fd_ostream raw_fd_ostream;
 
 /// LLVM types
 typedef llvm::StructType StructType;
@@ -214,17 +213,7 @@ public:
         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();
-        }
-    }
+    const std::vector<const BasicBlock*>& getLoopInfo(const BasicBlock* bb) const;
 
     inline void addToBB2LoopMap(const BasicBlock* bb, const BasicBlock* loopBB)
     {
@@ -266,95 +255,13 @@ 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)
-            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;
-    }
+    void getExitBlocksOfLoop(const BasicBlock* bb, Set<const BasicBlock*>& exitbbs) const;
+
+    bool isLoopHeader(const BasicBlock* bb) const;
+
+    bool dominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const;
+
+    bool postDominate(const BasicBlock* bbKey, const BasicBlock* bbValue) const;
 
     // Dump Control Flow Graph of llvm function, with instructions
     void viewCFG();

package/package.json

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