svf-lib 1.0.1136 → 1.0.1139

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

@@ -40,13 +40,13 @@
 namespace SVF
 {
 
-class CFLAlias : public PointerAnalysis
+class CFLAlias : public BVDataPTAImpl
 {
 
 public:
     typedef OrderedMap<CallSite, NodeID> CallSite2DummyValPN;
 
-    CFLAlias(SVFIR* ir) : PointerAnalysis(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
+    CFLAlias(SVFIR* ir) : BVDataPTAImpl(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
     {
     }
 
@@ -77,10 +77,9 @@ public:
     }
 
     /// Get points-to targets of a pointer.  V In this context
-    virtual const PointsTo& getPts(NodeID ptr)
+    virtual const PointsTo& getCFLPts(NodeID ptr)
     {
         /// 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++)
         {
@@ -88,19 +87,22 @@ public:
             {
                 // Need to Find dst addr src
                 CFLNode *vNode = graph->getGNode((*outedge)->getDstID());
-
+                addPts(ptr, svfir->getBaseValVar((*outedge)->getDstID()));
                 for(auto inEdge = vNode->getInEdges().begin(); inEdge!=vNode->getInEdges().end(); inEdge++)
                 {
                     if((*inEdge)->getEdgeKind() == 0)
                     {
-                        ps->set((*inEdge)->getSrcID());
+                        addPts(ptr, (*inEdge)->getSrcID());
                     }
                 }
             }
         }
-        return *ps;
+        return getPts(ptr);
     }
 
+    /// Need Original one for virtual table
+
+
     /// Add copy edge on constraint graph
     virtual inline bool addCopyEdge(NodeID src, NodeID dst)
     {

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

@@ -1,5 +1,5 @@
 Start:  
-   V 
+   V
 Terminal:
    Addr Copy Store Load Gep Vgep 
 Productions:
@@ -19,8 +19,14 @@ Productions:
    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;
+   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;
@@ -30,9 +36,4 @@ Productions:
    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;
-   
-   
-   
+   Memflowbar -> Gepbar_i Memflowbar Gep_i;

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

@@ -109,6 +109,7 @@ public:
         EXT_COPY,      // Handle copy edge
         EXT_LOAD,      // Handle load edge
         EXT_STORE,     // Handle store edge
+        EXT_GEPGEP,    // Handle Gep and Gep edges, and add a dummy node
         EXT_LOADSTORE, // Handle load and store edges, and add a dummy node
         EXT_COPY_N,    // Copy the character c (an unsigned char) to the first n characters of the string pointed to, by the argument str
         EXT_COPY_MN,   // Copies n characters from memory area src to memory area dest.
@@ -170,6 +171,7 @@ private:
         {"copy", EXT_COPY},
         {"load", EXT_LOAD},
         {"store", EXT_STORE},
+        {"gep_gep", EXT_GEPGEP},
         {"load_store", EXT_LOADSTORE},
         {"copy_n", EXT_COPY_N},
         {"copy_mn", EXT_COPY_MN},

package/SVF-linux/include/Util/ExtAPI.json

@@ -3270,5 +3270,10 @@
         "type": "CPP_EFT_DYNAMIC_CAST",
         "overwrite_app_function": 0,
         "copy": ["A0", "L"]
+    },
+    "_ZNSt5arrayIPK1ALm2EE4backEv":{
+        "type": "CPP_EFT_DYNAMIC_CAST",
+        "overwrite_app_function": 1,
+        "gep_gep": ["A0", "0", "V", "0", "L"]
     }
 }

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

@@ -40,13 +40,13 @@
 namespace SVF
 {
 
-class CFLAlias : public PointerAnalysis
+class CFLAlias : public BVDataPTAImpl
 {
 
 public:
     typedef OrderedMap<CallSite, NodeID> CallSite2DummyValPN;
 
-    CFLAlias(SVFIR* ir) : PointerAnalysis(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
+    CFLAlias(SVFIR* ir) : BVDataPTAImpl(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
     {
     }
 
@@ -77,10 +77,9 @@ public:
     }
 
     /// Get points-to targets of a pointer.  V In this context
-    virtual const PointsTo& getPts(NodeID ptr)
+    virtual const PointsTo& getCFLPts(NodeID ptr)
     {
         /// 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++)
         {
@@ -88,19 +87,22 @@ public:
             {
                 // Need to Find dst addr src
                 CFLNode *vNode = graph->getGNode((*outedge)->getDstID());
-
+                addPts(ptr, svfir->getBaseValVar((*outedge)->getDstID()));
                 for(auto inEdge = vNode->getInEdges().begin(); inEdge!=vNode->getInEdges().end(); inEdge++)
                 {
                     if((*inEdge)->getEdgeKind() == 0)
                     {
-                        ps->set((*inEdge)->getSrcID());
+                        addPts(ptr, (*inEdge)->getSrcID());
                     }
                 }
             }
         }
-        return *ps;
+        return getPts(ptr);
     }
 
+    /// Need Original one for virtual table
+
+
     /// Add copy edge on constraint graph
     virtual inline bool addCopyEdge(NodeID src, NodeID dst)
     {

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

@@ -1,5 +1,5 @@
 Start:  
-   V 
+   V
 Terminal:
    Addr Copy Store Load Gep Vgep 
 Productions:
@@ -19,8 +19,14 @@ Productions:
    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;
+   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;
@@ -30,9 +36,4 @@ Productions:
    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;
-   
-   
-   
+   Memflowbar -> Gepbar_i Memflowbar Gep_i;

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

@@ -109,6 +109,7 @@ public:
         EXT_COPY,      // Handle copy edge
         EXT_LOAD,      // Handle load edge
         EXT_STORE,     // Handle store edge
+        EXT_GEPGEP,    // Handle Gep and Gep edges, and add a dummy node
         EXT_LOADSTORE, // Handle load and store edges, and add a dummy node
         EXT_COPY_N,    // Copy the character c (an unsigned char) to the first n characters of the string pointed to, by the argument str
         EXT_COPY_MN,   // Copies n characters from memory area src to memory area dest.
@@ -170,6 +171,7 @@ private:
         {"copy", EXT_COPY},
         {"load", EXT_LOAD},
         {"store", EXT_STORE},
+        {"gep_gep", EXT_GEPGEP},
         {"load_store", EXT_LOADSTORE},
         {"copy_n", EXT_COPY_N},
         {"copy_mn", EXT_COPY_MN},

package/SVF-osx/include/Util/ExtAPI.json

@@ -3270,5 +3270,10 @@
         "type": "CPP_EFT_DYNAMIC_CAST",
         "overwrite_app_function": 0,
         "copy": ["A0", "L"]
+    },
+    "_ZNSt5arrayIPK1ALm2EE4backEv":{
+        "type": "CPP_EFT_DYNAMIC_CAST",
+        "overwrite_app_function": 1,
+        "gep_gep": ["A0", "0", "V", "0", "L"]
     }
 }

package/package.json

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