svf-tools 1.0.317 → 1.0.321

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -32,7 +32,6 @@
 #include "Util/SVFUtil.h"
 #include "SVF-FE/LLVMUtil.h"
 #include "SVF-FE/CPPUtil.h"
-#include "Graphs/ExternalPAG.h"
 #include "Util/BasicTypes.h"
 #include "MemoryModel/PAGBuilderFromFile.h"
 
@@ -68,8 +67,6 @@ SVFIR* SVFIRBuilder::build(SVFModule* svfModule)
     visitGlobal(svfModule);
     ///// collect exception vals in the program
 
-    ExternalPAG::initialise(svfModule);
-
     /// handle functions
     for (SVFModule::iterator fit = svfModule->begin(), efit = svfModule->end();
             fit != efit; ++fit)
@@ -263,10 +260,8 @@ void SVFIRBuilder::processCE(const Value *val)
             NodeID nsrc1 = pag->getValueNode(src1);
             NodeID nsrc2 = pag->getValueNode(src2);
             NodeID nres = pag->getValueNode(selectce);
-            const CopyPE* cpy1 = addCopyEdge(nsrc1, nres);
-            const CopyPE* cpy2 = addCopyEdge(nsrc2, nres);
-            pag->addPhiNode(pag->getGNode(nres),cpy1);
-            pag->addPhiNode(pag->getGNode(nres),cpy2);
+            addPhiNode(nres,nsrc1);
+            addPhiNode(nres,nsrc2);
             setCurrentLocation(cval, cbb);
         }
         // if we meet a int2ptr, then it points-to black hole
@@ -524,8 +519,7 @@ void SVFIRBuilder::visitPHINode(PHINode &inst)
         assert((incomingInst==nullptr) || (incomingInst->getFunction() == inst.getFunction()));
 
         NodeID src = getValueNode(val);
-        const CopyPE* copy = addCopyEdge(src, dst);
-        pag->addPhiNode(pag->getGNode(dst), copy);
+        addPhiNode(dst,src);
     }
 }
 
@@ -617,13 +611,13 @@ void SVFIRBuilder::visitCastInst(CastInst &inst)
 void SVFIRBuilder::visitBinaryOperator(BinaryOperator &inst)
 {
     NodeID dst = getValueNode(&inst);
-    for (u32_t i = 0; i < inst.getNumOperands(); i++)
-    {
-        Value* opnd = inst.getOperand(i);
-        NodeID src = getValueNode(opnd);
-        const BinaryOPPE* binayPE = addBinaryOPEdge(src, dst);
-        pag->addBinaryNode(pag->getGNode(dst),binayPE);
-    }
+    assert(inst.getNumOperands() == 2 && "not two operands for BinaryOperator?");
+    Value* op1 = inst.getOperand(0);
+    NodeID op1Node = getValueNode(op1);
+    Value* op2 = inst.getOperand(1);
+    NodeID op2Node = getValueNode(op2);
+    u32_t opcode = inst.getOpcode();
+    const BinaryOPPE* binayPE = addBinaryOPEdge(op1Node, op2Node, dst, opcode);
 }
 
 /*!
@@ -632,13 +626,11 @@ void SVFIRBuilder::visitBinaryOperator(BinaryOperator &inst)
 void SVFIRBuilder::visitUnaryOperator(UnaryOperator &inst)
 {
     NodeID dst = getValueNode(&inst);
-    for (u32_t i = 0; i < inst.getNumOperands(); i++)
-    {
-        Value* opnd = inst.getOperand(i);
-        NodeID src = getValueNode(opnd);
-        const UnaryOPPE* unaryPE = addUnaryOPEdge(src, dst);
-        pag->addUnaryNode(pag->getGNode(dst),unaryPE);
-    }
+    assert(inst.getNumOperands() == 1 && "not one operand for Unary instruction?");
+    Value* opnd = inst.getOperand(0);
+    NodeID src = getValueNode(opnd);
+    u32_t opcode = inst.getOpcode();
+    const UnaryOPPE* unaryPE = addUnaryOPEdge(src, dst, opcode);
 }
 
 /*!
@@ -647,13 +639,13 @@ void SVFIRBuilder::visitUnaryOperator(UnaryOperator &inst)
 void SVFIRBuilder::visitCmpInst(CmpInst &inst)
 {
     NodeID dst = getValueNode(&inst);
-    for (u32_t i = 0; i < inst.getNumOperands(); i++)
-    {
-        Value* opnd = inst.getOperand(i);
-        NodeID src = getValueNode(opnd);
-        const CmpPE* cmpPE = addCmpEdge(src, dst);
-        pag->addCmpNode(pag->getGNode(dst),cmpPE);
-    }
+    assert(inst.getNumOperands() == 2 && "not two operands for compare instruction?");
+    Value* op1 = inst.getOperand(0);
+    NodeID op1Node = getValueNode(op1);
+    Value* op2 = inst.getOperand(1);
+    NodeID op2Node = getValueNode(op2);
+    u32_t opcode = inst.getOpcode();
+    const CmpPE* cmpPE = addCmpEdge(op1Node, op2Node, dst, opcode);
 }
 
 
@@ -668,12 +660,10 @@ void SVFIRBuilder::visitSelectInst(SelectInst &inst)
     NodeID dst = getValueNode(&inst);
     NodeID src1 = getValueNode(inst.getTrueValue());
     NodeID src2 = getValueNode(inst.getFalseValue());
-    const CopyPE* cpy1 = addCopyEdge(src1, dst);
-    const CopyPE* cpy2 = addCopyEdge(src2, dst);
 
     /// Two operands have same incoming basic block, both are the current BB
-    pag->addPhiNode(pag->getGNode(dst), cpy1);
-    pag->addPhiNode(pag->getGNode(dst), cpy2);
+    addPhiNode(dst,src1);
+    addPhiNode(dst,src2);
 }
 
 /*
@@ -707,15 +697,8 @@ void SVFIRBuilder::visitCallSite(CallSite cs)
     {
         if (isExtCall(callee))
         {
-            if (ExternalPAG::hasExternalPAG(callee))
-            {
-                ExternalPAG::connectCallsiteToExternalPAG(&cs);
-            }
-            else
-            {
-                // There is no extpag for the function, use the old method.
-                handleExtCall(cs, callee);
-            }
+            // There is no extpag for the function, use the old method.
+            handleExtCall(cs, callee);
         }
         else
         {
@@ -747,8 +730,7 @@ void SVFIRBuilder::visitReturnInst(ReturnInst &inst)
         NodeID rnF = getReturnNode(F);
         NodeID vnS = getValueNode(src);
         //vnS may be null if src is a null ptr
-        const CopyPE* copy = addCopyEdge(vnS, rnF);
-        pag->addPhiNode(pag->getGNode(rnF), copy);
+        addPhiNode(rnF,vnS);
     }
 }
 
@@ -786,22 +768,35 @@ void SVFIRBuilder::visitExtractElementInst(ExtractElementInst &inst)
  * br %cmp label %if.then, label %if.else
  */
 void SVFIRBuilder::visitBranchInst(BranchInst &inst){
-    NodeID dst = getValueNode(&inst);
-    NodeID src;
+    NodeID brinst = getValueNode(&inst);
+    NodeID cond;
 	if (inst.isConditional())
-		src = getValueNode(inst.getCondition());
+		cond = getValueNode(inst.getCondition());
 	else
-		src = pag->getNullPtr();
-	const UnaryOPPE *unaryPE = addUnaryOPEdge(src, dst);
-    pag->addUnaryNode(pag->getGNode(dst),unaryPE);
+		cond = pag->getNullPtr();
+
+    std::vector<const ICFGNode*> successors;
+    for (u32_t i = 0; i < inst.getNumSuccessors(); ++i)
+    {
+        const Instruction* succInst = &inst.getSuccessor(i)->front();
+        const ICFGNode* icfgNode = pag->getICFG()->getBlockICFGNode(succInst);
+        successors.push_back(icfgNode);
+    }
+    const BranchStmt *brStmt = addBranchStmt(brinst, cond,successors);
 }
 
 void SVFIRBuilder::visitSwitchInst(SwitchInst &inst){
-    NodeID dst = getValueNode(&inst);
-    Value* opnd = inst.getCondition();
-    NodeID src = getValueNode(opnd);
-    const UnaryOPPE* unaryPE = addUnaryOPEdge(src, dst);
-    pag->addUnaryNode(pag->getGNode(dst),unaryPE);
+    NodeID brinst = getValueNode(&inst);
+    NodeID cond = getValueNode(inst.getCondition());
+
+    std::vector<const ICFGNode*> successors;
+    for (u32_t i = 0; i < inst.getNumSuccessors(); ++i)
+    {
+        const Instruction* succInst = &inst.getSuccessor(i)->front();
+        const ICFGNode* icfgNode = pag->getICFG()->getBlockICFGNode(succInst);
+        successors.push_back(icfgNode);
+    }
+    const BranchStmt *brStmt = addBranchStmt(brinst, cond,successors);
 }
 
 ///   %ap = alloca %struct.va_list
@@ -1477,7 +1472,13 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
         if (!(SVFUtil::isa<GepPE>(edge) && SVFUtil::isa<GepValPN>(edge->getDstNode())))
             assert(curBB && "instruction does not have a basic block??");
 
-        icfgNode = pag->getICFG()->getBlockICFGNode(curInst);
+        /// We will have one unique function exit ICFGNode for all returns
+        if(const ReturnInst* retInst = SVFUtil::dyn_cast<ReturnInst>(curVal)){
+            const SVFFunction *fun = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(retInst->getParent()->getParent());
+            icfgNode = pag->getICFG()->getFunExitBlockNode(fun);
+        }
+        else
+            icfgNode = pag->getICFG()->getBlockICFGNode(curInst);
     }
     else if (const Argument* arg = SVFUtil::dyn_cast<Argument>(curVal))
     {

package/lib/WPA/Andersen.cpp

@@ -28,7 +28,7 @@
  */
 
 #include "Util/Options.h"
-#include "SVF-FE/CommonCHG.h"
+#include "Graphs/CHG.h"
 #include "SVF-FE/LLVMUtil.h"
 #include "MemoryModel/PointsTo.h"
 #include "WPA/Andersen.h"

package/lib/WPA/TypeAnalysis.cpp

@@ -30,7 +30,7 @@
 #include "Util/Options.h"
 #include "SVF-FE/CPPUtil.h"
 #include "SVF-FE/ICFGBuilder.h"
-#include "SVF-FE/CHG.h"
+#include "Graphs/CHG.h"
 #include "WPA/TypeAnalysis.h"
 #include "MemoryModel/PTAStat.h"
 #include "Graphs/ICFGStat.h"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.317",
+  "version": "1.0.321",
   "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": {

package/tools/Example/svf-ex.cpp

@@ -183,7 +183,7 @@ int main(int argc, char ** argv)
     VFG* vfg = new VFG(callgraph);
 
     /// Sparse value-flow graph (SVFG)
-    SVFGBuilder svfBuilder;
+    SVFGBuilder svfBuilder(true);
     SVFG* svfg = svfBuilder.buildFullSVFGWithoutOPT(ander);
 
     /// Collect uses of an LLVM Value

package/include/Graphs/ExternalPAG.h

@@ -1,147 +0,0 @@
-//===- ExternalPAG.h -- Program assignment graph------------------------------//
-
-/*
- * ExternalPAG.h
- *
- *  Created on: Aug 20, 2018
- *      Author: Mohamad Barbar
- */
-
-#ifndef EXTERNALPAG_H_
-#define EXTERNALPAG_H_
-
-#include "MemoryModel/SVFVariables.h"
-
-extern llvm::cl::list<std::string> DumpPAGFunctions;
-
-namespace SVF
-{
-
-/// Represents the SVFIR of a function loaded externally (i.e. from file).
-/// It's purpose is to be attached to the main SVFIR (almost) seamlessly.
-class ExternalPAG
-{
-private:
-    /// Maps function names to the entry nodes of the extpag which implements
-    /// it. This is to connect arguments and callsites.
-    static Map<const SVFFunction*, Map<int, PAGNode *>>
-            functionToExternalPAGEntries;
-    static Map<const SVFFunction*, PAGNode *> functionToExternalPAGReturns;
-
-    /// Name of the function this external SVFIR represents.
-    std::string functionName;
-
-    /// Value nodes in this external SVFIR, represented by NodeIDs
-    /// because we will rebuild these nodes in the main SVFIR.
-    NodeSet valueNodes;
-    /// Object nodes in this external SVFIR, represented by NodeIDs
-    /// because we will rebuild these nodes in the main SVFIR.
-    NodeSet objectNodes;
-    /// Edges in this external SVFIR, represented by the parts of an Edge because
-    /// we will rebuild these edges in the main SVFIR.
-    OrderedSet<std::tuple<NodeID, NodeID, std::string, int>> edges;
-
-    // Special nodes.
-
-    /// Nodes in the ExternalPAG which call edges should connect to.
-    /// argNodes[0] is arg 0, argNodes[1] is arg 1, ...
-    Map<int, NodeID> argNodes;
-    /// Node from which return edges connect.
-    NodeID returnNode;
-
-    /// Whether this function has a return or not.
-    bool hasReturn;
-
-    /// For passing that passed to -extpags option, splitting fname@path into
-    /// a pair.
-    static std::vector<std::pair<std::string, std::string>>
-            parseExternalPAGs(llvm::cl::list<std::string> &extpagsArgs);
-
-    /// Reads nodes and edges from file.
-    ///
-    /// File format:
-    /// Node: nodeID Nodetype [[0|1|2|...]+|ret]
-    ///  * Giving a number means that node represents such argument.
-    ///  * Giving ret means that node represents the return node..
-    /// Edge: nodeID edgetype NodeID Offset
-    ///
-    /// Example:
-    /// 1 o
-    /// 2 v
-    /// 3 v
-    /// 4 v
-    /// 1 addr 2 0
-    /// 1 addr 3 0
-    /// 3 gep 4 4
-    void readFromFile(std::string filename);
-
-public:
-    ExternalPAG(std::string functionName) : functionName(functionName),
-        returnNode(-1), hasReturn(false) {}
-
-    ~ExternalPAG() {}
-
-    /// Parses command line arguments and attaches external PAGs to main
-    /// SVFIR.
-    static void initialise(SVFModule* svfModule);
-
-    /// Connects callsite if a external SVFIR implementing the relevant function
-    /// has been added.
-    /// Returns true on success, false otherwise.
-    static bool connectCallsiteToExternalPAG(CallSite *cs);
-
-    /// Whether an external SVFIR implementing function exists.
-    static bool hasExternalPAG(const SVFFunction* function);
-
-    /// Dump individual PAGs of specified functions. Currently to outs().
-    static void dumpFunctions(std::vector<std::string> functions);
-
-    std::string getFunctionName() const
-    {
-        return functionName;
-    }
-
-    NodeSet &getValueNodes()
-    {
-        return valueNodes;
-    }
-    NodeSet &getObjectNodes()
-    {
-        return objectNodes;
-    }
-    OrderedSet<std::tuple<NodeID, NodeID, std::string, int>> &getEdges()
-    {
-        return edges;
-    }
-
-    Map<int, NodeID> &getArgNodes()
-    {
-        return argNodes;
-    }
-
-    NodeID getReturnNode() const
-    {
-        return returnNode;
-    }
-    void setReturnNode(NodeID returnNode)
-    {
-        this->returnNode = returnNode;
-        hasReturn = true;
-    }
-
-    /// Does this function have a return node?
-    bool hasReturnNode() const
-    {
-        return hasReturn;
-    }
-
-    /// Adds (creates new equivalents) all the nodes and edges of this extpag to
-    /// the main SVFIR. function is used as a key for future lookups.
-    /// Returns true on success, false otherwise (incl. if it already exists).
-    bool addExternalPAG(const SVFFunction* function);
-
-};
-
-} // End namespace SVF
-
-#endif  /* EXTERNALPAG_H_ */

package/include/SVF-FE/CommonCHG.h

@@ -1,49 +0,0 @@
-//===----- CommonCHG.h -- Base class of CHG implementations ------------------//
-// A common base to CHGraph and DCHGraph.
-
-/*
- * CommonCHG.h
- *
- *  Created on: Aug 24, 2019
- *      Author: Mohamad Barbar
- */
-
-#ifndef COMMONCHG_H_
-#define COMMONCHG_H_
-
-namespace SVF
-{
-
-typedef Set<const GlobalValue*> VTableSet;
-typedef Set<const SVFFunction*> VFunSet;
-
-/// Common base for class hierarchy graph. Only implements what PointerAnalysis needs.
-class CommonCHGraph
-{
-public:
-    virtual ~CommonCHGraph() { };
-    enum CHGKind
-    {
-        Standard,
-        DI
-    };
-
-    virtual bool csHasVFnsBasedonCHA(CallSite cs) = 0;
-    virtual const VFunSet &getCSVFsBasedonCHA(CallSite cs) = 0;
-    virtual bool csHasVtblsBasedonCHA(CallSite cs) = 0;
-    virtual const VTableSet &getCSVtblsBasedonCHA(CallSite cs) = 0;
-    virtual void getVFnsFromVtbls(CallSite cs, const VTableSet &vtbls, VFunSet &virtualFunctions) = 0;
-
-    CHGKind getKind(void) const
-    {
-        return kind;
-    }
-
-protected:
-    CHGKind kind;
-};
-
-} // End namespace SVF
-
-#endif /* COMMONCHG_H_ */
-