svf-tools 1.0.341 → 1.0.342

package/lib/Graphs/ICFG.cpp

@@ -61,7 +61,7 @@ FunExitBlockNode::FunExitBlockNode(NodeID id, const SVFFunction* f) : InterBlock
 const std::string ICFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "ICFGNode ID: " << getId();
+    rawstr << "ICFGNode" << getId();
     return rawstr.str();
 }
 
@@ -72,7 +72,9 @@ void ICFGNode::dump() const {
 const std::string GlobalBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GlobalBlockNode ID: " << getId();
+    rawstr << "GlobalBlockNode" << getId();
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
     return rawstr.str();
 }
 
@@ -80,8 +82,12 @@ const std::string GlobalBlockNode::toString() const {
 const std::string IntraBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "IntraBlockNode ID: " << getId();
-    rawstr << value2String(getInst()) << " {fun: " << getFun()->getName() << "}";
+    rawstr << "IntraBlockNode" << getId();
+    rawstr << " {fun: " << getFun()->getName() << getSourceLoc(getInst()) << "}";
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
+    if(getSVFStmts().empty())
+        rawstr << "\n" << value2String(getInst());
     return rawstr.str();
 }
 
@@ -89,24 +95,26 @@ const std::string IntraBlockNode::toString() const {
 const std::string FunEntryBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "FunEntryBlockNode ID: " << getId();
-    if (isExtCall(getFun()))
-        rawstr << " Entry(" << ")\n";
-    else
-        rawstr << " Entry(" << getSourceLoc(getFun()->getLLVMFun()) << ")\n";
-    rawstr << " {fun: " << getFun()->getName() << "}";
+    rawstr << "FunEntryBlockNode" << getId();
+    rawstr << " {fun: " << getFun()->getName();
+    if (isExtCall(getFun())==false)
+        rawstr << getSourceLoc(getFun()->getLLVMFun());
+    rawstr << "}";
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
     return rawstr.str();
 }
 
 const std::string FunExitBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "FunExitBlockNode ID: " << getId();
-    if (isExtCall(getFun()))
-        rawstr << " Exit(" << ")\n";
-    else
-        rawstr << " Exit(" << getSourceLoc(getFunExitBB(getFun()->getLLVMFun())->getFirstNonPHI()) << ")\n";
-    rawstr << " {fun: " << getFun()->getName() << "}";
+    rawstr << "FunExitBlockNode" << getId();
+    rawstr << " {fun: " << getFun()->getName();
+    if (isExtCall(getFun())==false)
+        rawstr << getSourceLoc(getFunExitBB(getFun()->getLLVMFun())->getFirstNonPHI());
+    rawstr << "}";
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
     return rawstr.str();
 }
 
@@ -114,23 +122,27 @@ const std::string FunExitBlockNode::toString() const {
 const std::string CallBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CallBlockNode ID: " << getId();
-    rawstr << value2String(getCallSite()) << " {fun: " << getFun()->getName() << "}";
+    rawstr << "CallBlockNode" << getId();
+    rawstr << " {fun: " << getFun()->getName() << getSourceLoc(getCallSite()) << "}";
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
     return rawstr.str();
 }
 
 const std::string RetBlockNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "RetBlockNode ID: " << getId();
-    rawstr << value2String(getCallSite()) << " {fun: " << getFun()->getName() << "}";
+    rawstr << "RetBlockNode" << getId();
+    rawstr << " {fun: " << getFun()->getName() << getSourceLoc(getCallSite()) << "}";
+    for (const SVFStmt *stmt : getSVFStmts())
+        rawstr << "\n" << stmt->toString();
     return rawstr.str();
 }
 
 const std::string ICFGEdge::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "ICFGEdge: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "ICFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "]\t";
     return rawstr.str();
 }
 
@@ -138,9 +150,9 @@ const std::string IntraCFGEdge::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     if(brCondition.first == nullptr)
-        rawstr << "IntraCFGEdge: [" << getDstID() << "<--" << getSrcID() << "]\t";
+        rawstr << "IntraCFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "]\t";
     else
-        rawstr << "IntraCFGEdge: [" << getDstID() << "<--" << getSrcID() << "] with condition (" << *brCondition.first << "==" << brCondition.second << ") \t";
+        rawstr << "IntraCFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "] with condition (" << *brCondition.first << "==" << brCondition.second << ") \t";
 
     return rawstr.str();
 }
@@ -148,16 +160,16 @@ const std::string IntraCFGEdge::toString() const {
 const std::string CallCFGEdge::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CallCFGEdge " << " [";
-    rawstr << getDstID() << "<--" << getSrcID() << "]\t CallSite: " << *cs << "\t";
+    rawstr << "CallCFGEdge " << " [ICFGNode";
+    rawstr << getDstID() << " <-- ICFGNode" << getSrcID() << "]\t CallSite: " << *cs << "\t";
     return rawstr.str();
 }
 
 const std::string RetCFGEdge::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "RetCFGEdge " << " [";
-    rawstr << getDstID() << "<--" << getSrcID() << "]\t CallSite: " << *cs << "\t";
+    rawstr << "RetCFGEdge " << " [ICFGNode";
+    rawstr << getDstID() << " <-- ICFGNode" << getSrcID() << "]\t CallSite: " << *cs << "\t";
     return rawstr.str();
 }
 

package/lib/MemoryModel/SVFStatements.cpp

@@ -61,76 +61,76 @@ bool SVFStmt::isPTAEdge() const
 const std::string SVFStmt::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "SVFStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "SVFStmt: [Var" << getDstID() << " <-- Var" << getSrcID() << "]\t";
     return rawstr.str();
 }
 
 const std::string AddrStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "AddrStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "AddrStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string CopyStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CopyStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "CopyStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string PhiStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "PhiStmt: [" << getResID() << "<--(";
+    rawstr << "PhiStmt: [Var" << getResID() << " <-- (Var";
     for(const SVFVar* op : getOpndVars())
         rawstr << op->getId() << ",";
     rawstr << ")]\t";
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string CmpStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CmpStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "CmpStmt: [Var" << getResID() << " <-- (Var" << getOpVarID(0) << " predicate" << getPredicate() << " Var" << getOpVarID(1) << ")]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string BinaryOPStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "BinaryOPStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "BinaryOPStmt: [Var" << getResID() << " <-- (Var" << getOpVarID(0) << " opcode" << getOpcode() << " Var" << getOpVarID(1) << ")]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string UnaryOPStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "UnaryOPStmt: [" << getResID() << "<--" << getOpVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "UnaryOPStmt: [Var" << getResID() << " <-- " << " opcode" << getOpcode() << " Var" << getOpVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
@@ -138,13 +138,17 @@ const std::string BranchStmt::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     if(isConditional())
-        rawstr << "BranchStmt: [" <<  getCondition()->toString() << "]\t";
+        rawstr << "BranchStmt: [Condition Var" <<  getCondition()->getId() << "]\t";
     else
         rawstr << "BranchStmt: [" <<  " Unconditional branch" << "]\t";
-    if (Options::PAGDotGraphShorter) {
+
+    for(u32_t i = 0; i < getNumSuccessors(); i++)
+        rawstr << "Successor " << i << " ICFGNode" << getSuccessor(i)->getId() << "\n";
+
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
@@ -152,99 +156,99 @@ const std::string BranchStmt::toString() const {
 const std::string LoadStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "LoadStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "LoadStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string StoreStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "StoreStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "StoreStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string GepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "GepStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string NormalGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "NormalGepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "NormalGepStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string VariantGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "VariantGepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "VariantGepStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string CallPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CallPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "CallPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string RetPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "RetPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "RetPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string TDForkPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "TDForkPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "TDForkPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 
 const std::string TDJoinPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "TDJoinPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
-    if (Options::PAGDotGraphShorter) {
+    rawstr << "TDJoinPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(getValue());
     }
-    rawstr << value2String(getValue());
     return rawstr.str();
 }
 

package/lib/MemoryModel/SVFVariables.cpp

@@ -112,10 +112,10 @@ const std::string ValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "ValVar ID: " << getId();
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(value);
     }
-    rawstr << value2String(value);
     return rawstr.str();
 }
 
@@ -123,10 +123,10 @@ const std::string ObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "ObjVar ID: " << getId();
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(value);
     }
-    rawstr << value2String(value);
     return rawstr.str();
 }
 
@@ -134,10 +134,10 @@ const std::string GepValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "GepValVar ID: " << getId() << " with offset_" + llvm::utostr(getFieldOffset());
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(value);
     }
-    rawstr << value2String(value);
     return rawstr.str();
 }
 
@@ -145,10 +145,10 @@ const std::string GepObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "GepObjVar ID: " << getId() << " with offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(value);
     }
-    rawstr << value2String(value);
     return rawstr.str();
 }
 
@@ -156,10 +156,10 @@ const std::string FIObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "FIObjVar ID: " << getId() << " (base object)";
-    if (Options::PAGDotGraphShorter) {
+    if (Options::ShowSVFIRValue) {
         rawstr << "\n";
+        rawstr << value2String(value);
     }
-    rawstr << value2String(value);
     return rawstr.str();
 }
 

package/lib/Util/Options.cpp

@@ -296,10 +296,10 @@ namespace SVF
         llvm::cl::desc("Dump dot graph of SVFIR")
     );
 
-    const llvm::cl::opt<bool> Options::PAGDotGraphShorter(
-            "dump-pag-shorter",
+    const llvm::cl::opt<bool> Options::ShowSVFIRValue(
+            "show-ir-value",
             llvm::cl::init(true),
-            llvm::cl::desc("If dumping dot graph of SVFIR, use shorter lines")
+            llvm::cl::desc("Show values of SVFIR (e.g., when generating dot graph)")
     );
 
     const llvm::cl::opt<bool> Options::DumpICFG(

package/lib/Util/SVFUtil.cpp

@@ -359,6 +359,8 @@ std::string SVFUtil::getSourceLoc(const Value* val)
     }
     rawstr << " }";
 
+    if(rawstr.str()=="{  }")
+        return "";
     return rawstr.str();
 }
 

package/package.json

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