svf-tools 1.0.461 → 1.0.464

package/include/Util/BasicTypes.h

@@ -68,7 +68,6 @@ typedef llvm::BasicBlock BasicBlock;
 typedef llvm::Value Value;
 typedef llvm::Instruction Instruction;
 typedef llvm::CallBase CallBase;
-typedef llvm::GlobalObject GlobalObject;
 typedef llvm::GlobalValue GlobalValue;
 typedef llvm::GlobalVariable GlobalVariable;
 typedef llvm::Module Module;
@@ -86,9 +85,6 @@ typedef llvm::ArrayType ArrayType;
 typedef llvm::PointerType PointerType;
 typedef llvm::FunctionType FunctionType;
 
-/// LLVM data layout
-typedef llvm::DataLayout DataLayout;
-
 /// LLVM Aliases and constants
 typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
@@ -122,12 +118,8 @@ typedef llvm::succ_const_iterator succ_const_iterator;
 typedef llvm::GraphPrinter GraphPrinter;
 typedef llvm::IntegerType IntegerType;
 
-/// LLVM debug information
-typedef llvm::DIType DIType;
-typedef llvm::DICompositeType DICompositeType;
-typedef llvm::DIDerivedType DIDerivedType;
+// LLVM Debug Information
 typedef llvm::DISubprogram DISubprogram;
-namespace dwarf = llvm::dwarf;
 
 class SVFFunction : public SVFValue
 {

package/include/Util/Options.h

@@ -241,9 +241,6 @@ public:
     static const llvm::cl::opt<bool> TBHCStoreReuse;
     static const llvm::cl::opt<bool> TBHCAllReuse;
 
-    // TypeAnalysis.cpp
-    static const llvm::cl::opt<bool> GenICFG;
-
     // WPAPass.cpp
     static const llvm::cl::opt<bool> AnderSVFG;
     static const llvm::cl::opt<bool> SABERFULLSVFG;

package/lib/MemoryModel/SVFIR.cpp

@@ -350,14 +350,13 @@ GepStmt* SVFIR::addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool c
  */
 GepStmt* SVFIR::addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
 {
-    const LocationSet& baseLS = getLocationSetFromBaseNode(src);
-    SVFVar* baseNode = getGNode(getBaseValVar(src));
+    SVFVar* baseNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
     if(hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
         return nullptr;
     else
     {
-        GepStmt* gepPE = new GepStmt(baseNode, dstNode, baseLS+ls);
+        GepStmt* gepPE = new GepStmt(baseNode, dstNode, ls);
         addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
@@ -370,14 +369,13 @@ GepStmt* SVFIR::addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
  */
 GepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
 {
-    const LocationSet& baseLS = getLocationSetFromBaseNode(src);
-    SVFVar* baseNode = getGNode(getBaseValVar(src));
+    SVFVar* baseNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
     if(hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
         return nullptr;
     else
     {
-        GepStmt* gepPE = new GepStmt(baseNode, dstNode,baseLS+ls, true);
+        GepStmt* gepPE = new GepStmt(baseNode, dstNode,ls, true);
         addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
@@ -559,28 +557,6 @@ NodeID SVFIR::getGepValVar(const Value* curInst, NodeID base, const LocationSet&
     }
 }
 
-/*!
- * Get a base SVFVar given a pointer
- * Return the source node of its connected normal gep edge
- * Otherwise return the node id itself
- * s32_t offset : gep offset
- */
-LocationSet SVFIR::getLocationSetFromBaseNode(NodeID nodeId)
-{
-    SVFVar* node  = getGNode(nodeId);
-    SVFStmt::SVFStmtSetTy& geps = node->getIncomingEdges(SVFStmt::Gep);
-    /// if this node is already a base node
-    if(geps.empty())
-        return LocationSet(0);
-
-    assert(geps.size()==1 && "one node can only be connected by at most one gep edge!");
-    SVFVar::iterator it = geps.begin();
-    const GepStmt* gepEdge = SVFUtil::cast<GepStmt>(*it);
-    if(gepEdge->isVariantFieldGep())
-        return LocationSet(0);
-    else
-        return gepEdge->getLocationSet();
-}
 
 /*!
  * Clean up memory

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -1347,7 +1347,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 // We have vArg3 points to the entry of _Rb_tree_node_base { color; parent; left; right; }.
                 // Now we calculate the offset from base to vArg3
                 NodeID vnArg3 = pag->getValueNode(vArg3);
-                s32_t offset = pag->getLocationSetFromBaseNode(vnArg3).accumulateConstantFieldIdx();
+                s32_t offset = getLocationSetFromBaseNode(vnArg3).accumulateConstantFieldIdx();
 
                 // We get all flattened fields of base
                 vector<LocationSet> fields;
@@ -1373,7 +1373,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 NodeID vnD = pag->getValueNode(inst);
                 Value *vArg = cs.getArgument(0);
                 NodeID vnArg = pag->getValueNode(vArg);
-                s32_t offset = pag->getLocationSetFromBaseNode(vnArg).accumulateConstantFieldIdx();
+                s32_t offset = getLocationSetFromBaseNode(vnArg).accumulateConstantFieldIdx();
 
                 // We get all fields
                 vector<LocationSet> fields;
@@ -1740,3 +1740,26 @@ void SVFIRBuilder::updateCallGraph(PTACallGraph* callgraph)
     if (Options::PAGDotGraph)
         pag->dump("svfir_final");
 }
+
+/*!
+ * Get a base SVFVar given a pointer
+ * Return the source node of its connected normal gep edge
+ * Otherwise return the node id itself
+ * s32_t offset : gep offset
+ */
+LocationSet SVFIRBuilder::getLocationSetFromBaseNode(NodeID nodeId)
+{
+    SVFVar* node  = pag->getGNode(nodeId);
+    SVFStmt::SVFStmtSetTy& geps = node->getIncomingEdges(SVFStmt::Gep);
+    /// if this node is already a base node
+    if(geps.empty())
+        return LocationSet(0);
+
+    assert(geps.size()==1 && "one node can only be connected by at most one gep edge!");
+    SVFVar::iterator it = geps.begin();
+    const GepStmt* gepEdge = SVFUtil::cast<GepStmt>(*it);
+    if(gepEdge->isVariantFieldGep())
+        return LocationSet(0);
+    else
+        return gepEdge->getLocationSet();
+}

package/lib/Util/Options.cpp

@@ -739,14 +739,6 @@ const llvm::cl::opt<bool> Options::TBHCAllReuse(
 );
 
 
-// TypeAnalysis.cpp
-const llvm::cl::opt<bool> Options::GenICFG(
-    "gen-icfg",
-    llvm::cl::init(true),
-    llvm::cl::desc("Generate ICFG graph")
-);
-
-
 //WPAPass.cpp
 const llvm::cl::opt<bool> Options::AnderSVFG(
     "svfg",

package/lib/WPA/FlowSensitiveTBHC.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "Util/Options.h"
+#include "SVF-FE/BasicTypes.h"
 #include "SVF-FE/DCHG.h"
 #include "SVF-FE/CPPUtil.h"
 #include "WPA/FlowSensitiveTBHC.h"

package/lib/WPA/TypeAnalysis.cpp

@@ -46,7 +46,7 @@ using namespace std;
 void TypeAnalysis::initialize()
 {
     AndersenBase::initialize();
-    if (Options::GenICFG)
+    if (Options::DumpICFG)
     {
         icfg = SVFIR::getPAG()->getICFG();
         icfg->dump("icfg_initial");

package/lib/WPA/TypeBasedHeapCloning.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "SVF-FE/CPPUtil.h"
+#include "SVF-FE/BasicTypes.h"
 #include "WPA/TypeBasedHeapCloning.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 

package/package.json

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