svf-tools 1.0.518 → 1.0.521

package/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/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/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/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/lib/CFL/CFLAlias.cpp

@@ -50,10 +50,10 @@ void CFLAlias::onTheFlyCallGraphSolve(const CallSiteToFunPtrMap& callsites, Call
             const Value *vtbl = getVCallVtblPtr(SVFUtil::getLLVMCallSite(cs->getCallSite()));
             assert(pag->hasValueNode(vtbl));
             NodeID vtblId = pag->getValueNode(vtbl);
-            resolveCPPIndCalls(cs, getPts(vtblId), newEdges);
+            resolveCPPIndCalls(cs, getCFLPts(vtblId), newEdges);
         }
         else
-            resolveIndCalls(iter->first,getPts(iter->second),newEdges);
+            resolveIndCalls(iter->first,getCFLPts(iter->second),newEdges);
     }
 }
 

package/lib/CFL/GrammarBuilder.cpp

@@ -42,6 +42,7 @@ const inline std::string GrammarBuilder::parseProductionsString() const
     std::string lineString;
     std::string lines = "";
     std::string startString;
+    const std::string WHITESPACE = " \n\r\t\f\v";
     int lineNum = 0;
     while (getline(textFile, lineString))
     {
@@ -49,11 +50,12 @@ const inline std::string GrammarBuilder::parseProductionsString() const
         {
             startString = stripSpace(lineString);
         }
-        lines.append(lineString);
+
+        lines.append(lineString.substr(lineString.find_first_not_of(WHITESPACE), lineString.find_last_not_of(WHITESPACE)+1));
         lineNum++;
     }
 
-    std::regex reg("Start:([\\s\\S]*)Terminal:[\\s]*([\\s\\S]*)Productions:([\\s\\S]*)");
+    std::regex reg("Start:([\\s\\S]*)Terminal:([\\s\\S]*)Productions:([\\s\\S]*)");
     std::smatch matches;
     if (std::regex_search(lines, matches, reg))
     {

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -27,7 +27,7 @@ BVDataPTAImpl::BVDataPTAImpl(SVFIR* p, PointerAnalysis::PTATY type, bool alias_c
 {
     if (type == Andersen_BASE || type == Andersen_WPA || type == AndersenWaveDiff_WPA
             || type == TypeCPP_WPA || type == FlowS_DDA
-            || type == AndersenSCD_WPA || type == AndersenSFR_WPA)
+            || type == AndersenSCD_WPA || type == AndersenSFR_WPA || type == CFLFICI_WPA )
     {
         // Only maintain reverse points-to when the analysis is field-sensitive, as objects turning
         // field-insensitive is all it is used for.

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -1404,6 +1404,22 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                         }
                         break;
                     }
+                    case ExtAPI::EXT_GEPGEP:
+                    {
+                        NodeID vnS = parseNode(args[0], cs, inst);
+                        u32_t offset1 = stoul(args[1]);
+                        NodeID vnV = parseNode(args[2], cs, inst);
+                        u32_t offset2 = stoul(args[3]);
+                        NodeID vnD = parseNode(args[4], cs, inst);
+                        if (vnD && vnV && vnS)
+                        {
+                            LocationSet l1(offset1);
+                            LocationSet l2(offset2);
+                            addNormalGepEdge(vnS, vnV, l1);
+                            addNormalGepEdge(vnV, vnD, l2);
+                        }
+                        break;
+                    }
                     // default
                     // illegal function operation of external function
                     case ExtAPI::EXT_OTHER:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.518",
+  "version": "1.0.521",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {