svf-lib 1.0.1216 → 1.0.1219

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

@@ -155,6 +155,15 @@ public:
     /// Build Bidirectional graph by copying nodes and edges from any graph inherited from GenericGraph
     /// And transfer Load Store to copy edge and address edge to construct PEG style CFG
     CFLGraph* buildBiPEGgraph(ConstraintGraph *graph, Kind startKind, GrammarBase *grammar, SVFIR* pag);
+
+private:
+    void connectVGep(CFLGraph *cflGraph,  ConstraintGraph *graph, ConstraintNode *src, ConstraintNode *dst, u32_t level, SVFIR* pag);
+
+    /// Handle edge except for the GEP
+    void addBiCFLEdge(CFLGraph *cflGraph,  ConstraintNode* src, ConstraintNode* dst, CFLGrammar::Kind label);
+
+    /// Add Bidirectional GEP edge with attribute
+    void addBiGepCFLEdge(CFLGraph *cflGraph,  ConstraintNode* src, ConstraintNode* dst, CFLGrammar::Attribute attri);
 };
 
 }// SVF

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

@@ -1,7 +1,7 @@
 Start:  
    V
 Terminal:
-   Addr Copy Store Load Gep Vgep 
+   Addr Copy Store Load Gep
 Productions:
    F -> epsilon;
    M -> Addr V Addrbar;
@@ -14,15 +14,11 @@ Productions:
    Fbar -> epsilon;
    Fbar -> Copybar Fbar;
    Fbar -> M Copybar Fbar;
-   Gep_1 -> Gep_0 F Vgep;
-   Gepbar_1 -> Vgepbar Fbar Gepbar_0;
-   Gepbarpath -> Gepbar_0 Gepbar_0;
-   Gepbarpath -> Gepbarpath Gepbar_0;
-   Gep_3 -> Gep_0;
-   Gepbar_3 -> Gepbar_0;
+   ArrayPath -> Gepbar_0 Gepbar_0;
+   ArrayPath -> ArrayPath Gepbar_0;
    Memcpy -> Addrbar V Addr;
    Memcpy -> Gep_i Memcpy Gepbar_i;
    Memcpy -> F Memcpy Fbar;
    V -> Gepbar_i Memcpy Gep_i;
    V -> Gep_i Memcpy Gepbar_i;
-   V -> Gepbarpath V Gep_0;
+   V -> ArrayPath V Gep_0;

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

@@ -155,6 +155,15 @@ public:
     /// Build Bidirectional graph by copying nodes and edges from any graph inherited from GenericGraph
     /// And transfer Load Store to copy edge and address edge to construct PEG style CFG
     CFLGraph* buildBiPEGgraph(ConstraintGraph *graph, Kind startKind, GrammarBase *grammar, SVFIR* pag);
+
+private:
+    void connectVGep(CFLGraph *cflGraph,  ConstraintGraph *graph, ConstraintNode *src, ConstraintNode *dst, u32_t level, SVFIR* pag);
+
+    /// Handle edge except for the GEP
+    void addBiCFLEdge(CFLGraph *cflGraph,  ConstraintNode* src, ConstraintNode* dst, CFLGrammar::Kind label);
+
+    /// Add Bidirectional GEP edge with attribute
+    void addBiGepCFLEdge(CFLGraph *cflGraph,  ConstraintNode* src, ConstraintNode* dst, CFLGrammar::Attribute attri);
 };
 
 }// SVF

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

@@ -1,7 +1,7 @@
 Start:  
    V
 Terminal:
-   Addr Copy Store Load Gep Vgep 
+   Addr Copy Store Load Gep
 Productions:
    F -> epsilon;
    M -> Addr V Addrbar;
@@ -14,15 +14,11 @@ Productions:
    Fbar -> epsilon;
    Fbar -> Copybar Fbar;
    Fbar -> M Copybar Fbar;
-   Gep_1 -> Gep_0 F Vgep;
-   Gepbar_1 -> Vgepbar Fbar Gepbar_0;
-   Gepbarpath -> Gepbar_0 Gepbar_0;
-   Gepbarpath -> Gepbarpath Gepbar_0;
-   Gep_3 -> Gep_0;
-   Gepbar_3 -> Gepbar_0;
+   ArrayPath -> Gepbar_0 Gepbar_0;
+   ArrayPath -> ArrayPath Gepbar_0;
    Memcpy -> Addrbar V Addr;
    Memcpy -> Gep_i Memcpy Gepbar_i;
    Memcpy -> F Memcpy Fbar;
    V -> Gepbar_i Memcpy Gep_i;
    V -> Gep_i Memcpy Gepbar_i;
-   V -> Gepbarpath V Gep_0;
+   V -> ArrayPath V Gep_0;

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

@@ -302,6 +302,9 @@ public:
     // Does (F) reallocate a new object?
     bool is_realloc(const SVFFunction *F);
 
+    // Does (F) have the same return type(pointer or nonpointer) and same number of arguments
+    bool is_sameSignature(const SVFFunction *F);
+
     // Should (F) be considered "external" (either not defined in the program
     //   or a user-defined version of a known alloc or no-op)?
     bool is_ext(const SVFFunction *F);