svf-lib 1.0.1066 → 1.0.1069

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

@@ -248,8 +248,8 @@ public:
     static const llvm::cl::opt<bool> ShowHiddenNode;
 
     // CFL option
-    static const llvm::cl::opt<std::string> InputFilename;
     static const llvm::cl::opt<std::string> GrammarFilename;
+    static const llvm::cl::opt<std::string> InputFilename;
     static const llvm::cl::opt<bool> GraphIsFromDot;
     static const llvm::cl::opt<bool> PrintCFL;
     static const llvm::cl::opt<bool> FlexSymMap;

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

@@ -44,6 +44,8 @@ class CFLAlias : public PointerAnalysis
 {
 
 public:
+    typedef OrderedMap<CallSite, NodeID> CallSite2DummyValPN;
+
     CFLAlias(SVFIR* ir) : PointerAnalysis(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
     {
     }
@@ -74,12 +76,45 @@ public:
             return AliasResult::NoAlias;
     }
 
-    /// Get points-to targets of a pointer.
+    /// Get points-to targets of a pointer.  V In this context
     virtual const PointsTo& getPts(NodeID ptr)
     {
-        /// Check Outgoing edge Dst of ptr
-        //PointsTo * ps;
-        abort(); // to be implemented
+        /// Check V Dst of ptr.
+        PointsTo *ps = new PointsTo();
+        CFLNode *funNode = graph->getGNode(ptr);
+        for(auto outedge = funNode->getOutEdges().begin(); outedge!=funNode->getOutEdges().end(); outedge++)
+        {
+            if((*outedge)->getEdgeKind() == graph->getStartKind())
+            {
+                // Need to Find dst addr src
+                CFLNode *vNode = graph->getGNode((*outedge)->getDstID());
+
+                for(auto inEdge = vNode->getInEdges().begin(); inEdge!=vNode->getInEdges().end(); inEdge++)
+                {
+                    if((*inEdge)->getEdgeKind() == 0)
+                    {
+                        ps->set((*inEdge)->getSrcID());
+                    }
+                }
+            }
+        }
+        return *ps;
+    }
+
+    /// Add copy edge on constraint graph
+    virtual inline bool addCopyEdge(NodeID src, NodeID dst)
+    {
+        const CFLEdge *edge = graph->hasEdge(graph->getGNode(src),graph->getGNode(dst), 1);
+        if (edge != nullptr )
+        {
+            return false;
+
+        }
+        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;
     }
 
     /// Given an object, get all the nodes having whose pointsto contains the object
@@ -89,7 +124,18 @@ public:
         abort(); // to be implemented
     }
 
+    /// Update call graph for the input indirect callsites
+    virtual bool updateCallGraph(const CallSiteToFunPtrMap& callsites);
+
+    /// On the fly call graph construction
+    virtual void onTheFlyCallGraphSolve(const CallSiteToFunPtrMap& callsites, CallEdgeMap& newEdges);
+
+    /// Connect formal and actual parameters for indirect callsites
+    void connectCaller2CalleeParams(CallSite cs, const SVFFunction* F);
+
+    void heapAllocatorViaIndCall(CallSite cs);
 private:
+    CallSite2DummyValPN callsite2DummyValPN;        ///< Map an instruction to a dummy obj which created at an indirect callsite, which invokes a heap allocator
     SVFIR* svfir;
     CFLGraph* graph;
     CFLGrammar* grammar;

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

@@ -54,6 +54,7 @@ public:
         /// Conversion of u32_t
         operator u32_t()
         {
+            static_assert(sizeof(struct Symbol)==sizeof(u32_t), "sizeof(struct Symbol)!=sizeof(u32_t)");
             u32_t num = 0;
             num += this->variableAttribute << 24;
             num += this->attribute << 8;
@@ -61,19 +62,10 @@ public:
             return num;
         }
 
-        /// Conversion of u64_t
-        operator u64_t()
+        operator u32_t() const
         {
-            u64_t num = 0;
-            num += this->variableAttribute << 24;
-            num += this->attribute << 8;
-            num += this->kind;
-            return num;
-        }
-
-        operator s64_t() const
-        {
-            s64_t num = 0;
+            static_assert(sizeof(struct Symbol)==sizeof(u32_t), "sizeof(struct Symbol)!=sizeof(u32_t)");
+            u32_t num = 0;
             num += this->variableAttribute << 24;
             num += this->attribute << 8;
             num += this->kind;
@@ -82,10 +74,10 @@ public:
 
         bool operator<(const Symbol& rhs)
         {
-            return this->kind < rhs.kind;
+            return u32_t(*this) < u32_t(rhs);
         }
 
-        void operator=(const int& i)
+        void operator=(const u32_t& i)
         {
             this->kind = EdgeKindMask & i;
             this->attribute = i >> EdgeKindMaskBits;
@@ -99,11 +91,6 @@ public:
             this->variableAttribute = num >> 24;
         }
 
-        void operator=(const Kind& kind)
-        {
-            this->kind = kind;
-        }
-
         bool operator==(const Symbol& s)
         {
             return ((this->kind == s.kind) && (this->attribute == s.attribute) && (this->variableAttribute == s.variableAttribute));
@@ -119,21 +106,15 @@ public:
             return ! (*this == s) ;
         }
 
-
-        bool operator==(const int& i)
+        bool operator==(const u32_t& i)
         {
-            return ((this->kind == (EdgeKindMask & i)) && (this->attribute == (i >> EdgeKindMaskBits)) && (this->variableAttribute == (i >> AttributedKindMaskBits)));
+            return  u32_t(*this) == u32_t(i);
         }
 
         bool operator==(const Kind& k) const
         {
             return (this->kind == k);
         }
-
-        bool operator==(const Kind& k)
-        {
-            return (this->kind == k);
-        }
     } Symbol;
 
     class SymbolHash
@@ -389,7 +370,7 @@ public:
     void dump(std::string fileName) const;
 
 
-    const inline int num_generator()
+    const inline u32_t num_generator()
     {
         return newTerminalSubscript++;
     }

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

@@ -5,13 +5,34 @@ Terminal:
 Productions:
    F -> epsilon;
    F -> F Copy;
+   F -> Addr Memflow;
    F -> F Store V Load;
-   Gepbar_j -> Vgepbar Fbar Gepbar_i; 
+   F -> Store Memflow Load;
    Fbar -> epsilon;
    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;
    Gep_j -> Gep_i F Vgep;
+   Gepbar_j -> Vgepbar Fbar Gepbar_i;
+   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;
+   Memflowbar -> Memflowbar F;
+   Memflowbar -> F Memflowbar Fbar;
+   Memflowbar -> Gep_i Memflowbar Gepbar_i;
+   Memflowbar -> Gepbar_i Memflowbar Gep_i;
+   Gepbarpath -> Gepbar_i Gepbar_j;
+   Gepbarpath -> Gepbarpath Gepbar_i;
+   
+   
    

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

@@ -68,14 +68,6 @@ public:
     {
         return grammar;
     }
-
-protected:
-    /// Worklist operations
-    //@{
-    inline const CFLEdge* popFromWorklist()
-    {
-        return worklist.pop();
-    }
     inline bool pushIntoWorklist(const CFLEdge* item)
     {
         return worklist.push(item);
@@ -84,6 +76,15 @@ protected:
     {
         return worklist.empty();
     }
+
+protected:
+    /// Worklist operations
+    //@{
+    inline const CFLEdge* popFromWorklist()
+    {
+        return worklist.pop();
+    }
+
     inline bool isInWorklist(const CFLEdge* item)
     {
         return worklist.find(item);
@@ -95,6 +96,7 @@ private:
     CFLGrammar* grammar;
     /// Worklist for resolution
     WorkList worklist;
+
 };
 
 }

package/SVF-osx/include/Graphs/CFLGraph.h

@@ -111,7 +111,6 @@ public:
 
 private:
     CFLEdgeSet cflEdgeSet;
-
 };
 
 }

package/SVF-osx/include/Graphs/GraphPrinter.h

@@ -28,8 +28,8 @@
  *      Author: Yulei
  */
 
-#ifndef INCLUDE_UTIL_GRAPHPRINTER_H_
-#define INCLUDE_UTIL_GRAPHPRINTER_H_
+#ifndef INCLUDE_GRAPHS_GRAPHPRINTER_H_
+#define INCLUDE_GRAPHS_GRAPHPRINTER_H_
 
 #include <system_error>
 #include <llvm/Support/ToolOutputFile.h>
@@ -116,4 +116,4 @@ public:
 
 
 
-#endif /* INCLUDE_UTIL_GRAPHPRINTER_H_ */
+#endif /* INCLUDE_GRAPHS_GRAPHPRINTER_H_ */

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

@@ -248,10 +248,10 @@ public:
     static const llvm::cl::opt<bool> ShowHiddenNode;
 
     // CFL option
-    static const llvm::cl::opt<std::string> InputFilename;
     static const llvm::cl::opt<std::string> GrammarFilename;
+    static const llvm::cl::opt<std::string> InputFilename;
     static const llvm::cl::opt<bool> GraphIsFromDot;
-    static const llvm::cl::opt<bool> GrammarIsEBNF;
+    static const llvm::cl::opt<bool> PrintCFL;
     static const llvm::cl::opt<bool> FlexSymMap;
 
     // Loop Analysis

package/package.json

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