svf-tools 1.0.340 → 1.0.344

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/MemoryModel/SymbolTableInfo.cpp

@@ -268,7 +268,7 @@ bool SymbolTableInfo::isConstantObjSym(const Value *val)
 {
     if (const GlobalVariable* v = SVFUtil::dyn_cast<GlobalVariable>(val))
     {
-        if (cppUtil::isValVtbl(const_cast<GlobalVariable*>(v)))
+        if (cppUtil::isValVtbl(v))
             return false;
         else if (!v->hasInitializer()){
             if(v->isExternalLinkage(v->getLinkage()))
@@ -702,19 +702,24 @@ bool MemObj::isVarArray() const
     return typeInfo->isVarArray();
 }
 
-bool MemObj::isConstStruct() const
+bool MemObj::isConstantStruct() const
 {
-    return typeInfo->isConstStruct();
+    return typeInfo->isConstantStruct();
 }
 
-bool MemObj::isConstArray() const
+bool MemObj::isConstantArray() const
 {
-    return typeInfo->isConstArray();
+    return typeInfo->isConstantArray();
 }
 
-bool MemObj::isConstant() const
+bool MemObj::isConstDataOrConstGlobal() const
 {
-    return typeInfo->isConstant();
+    return typeInfo->isConstDataOrConstGlobal();
+}
+
+bool MemObj::isConstantData() const
+{
+    return typeInfo->isConstantData();
 }
 
 bool MemObj::hasPtrObj() const

package/lib/SABER/DoubleFreeChecker.cpp

@@ -38,7 +38,7 @@ void DoubleFreeChecker::reportBug(ProgSlice* slice)
     if(slice->isSatisfiableForPairs() == false)
     {
         const SVFGNode* src = slice->getSource();
-        const CallBlockNode* cs = getSrcCSID(src);
+        const CallICFGNode* cs = getSrcCSID(src);
         SVFUtil::errs() << bugMsg2("\t Double Free :") <<  " memory allocation at : ("
                         << getSourceLoc(cs->getCallSite()) << ")\n";
         SVFUtil::errs() << "\t\t double free path: \n" << slice->evalFinalCond() << "\n";

package/lib/SABER/FileChecker.cpp

@@ -35,14 +35,14 @@ using namespace SVFUtil;
 
 void FileChecker::reportNeverClose(const SVFGNode* src)
 {
-    const CallBlockNode* cs = getSrcCSID(src);
+    const CallICFGNode* cs = getSrcCSID(src);
     SVFUtil::errs() << bugMsg1("\t FileNeverClose :") <<  " file open location at : ("
                     << getSourceLoc(cs->getCallSite()) << ")\n";
 }
 
 void FileChecker::reportPartialClose(const SVFGNode* src)
 {
-    const CallBlockNode* cs = getSrcCSID(src);
+    const CallICFGNode* cs = getSrcCSID(src);
     SVFUtil::errs() << bugMsg2("\t PartialFileClose :") <<  " file open location at : ("
                     << getSourceLoc(cs->getCallSite()) << ")\n";
 }

package/lib/SABER/LeakChecker.cpp

@@ -46,7 +46,7 @@ void LeakChecker::initSrcs()
     for(SVFIR::CSToRetMap::iterator it = pag->getCallSiteRets().begin(),
             eit = pag->getCallSiteRets().end(); it!=eit; ++it)
     {
-        const RetBlockNode* cs = it->first;
+        const RetICFGNode* cs = it->first;
         /// if this callsite return reside in a dead function then we do not care about its leaks
         /// for example instruction `int* p = malloc(size)` is in a dead function, then program won't allocate this memory
         /// for example a customized malloc `int p = malloc()` returns an integer value, then program treat it as a system malloc
@@ -65,8 +65,8 @@ void LeakChecker::initSrcs()
                 worklist.push(it->first->getCallBlockNode());
                 while (!worklist.empty())
                 {
-                    const CallBlockNode* cs = worklist.pop();
-                    const RetBlockNode* retBlockNode = icfg->getRetBlockNode(cs->getCallSite());
+                    const CallICFGNode* cs = worklist.pop();
+                    const RetICFGNode* retBlockNode = icfg->getRetBlockNode(cs->getCallSite());
                     const PAGNode* pagNode = pag->getCallSiteRet(retBlockNode);
                     const SVFGNode* node = getSVFG()->getDefSVFGNode(pagNode);
                     if (visited.test(node->getId()) == 0)
@@ -138,14 +138,14 @@ void LeakChecker::initSnks()
 
 void LeakChecker::reportNeverFree(const SVFGNode* src)
 {
-    const CallBlockNode* cs = getSrcCSID(src);
+    const CallICFGNode* cs = getSrcCSID(src);
     SVFUtil::errs() << bugMsg1("\t NeverFree :") <<  " memory allocation at : ("
                     << getSourceLoc(cs->getCallSite()) << ")\n";
 }
 
 void LeakChecker::reportPartialLeak(const SVFGNode* src)
 {
-    const CallBlockNode* cs = getSrcCSID(src);
+    const CallICFGNode* cs = getSrcCSID(src);
     SVFUtil::errs() << bugMsg2("\t PartialLeak :") <<  " memory allocation at : ("
                     << getSourceLoc(cs->getCallSite()) << ")\n";
 }
@@ -175,7 +175,7 @@ void LeakChecker::reportBug(ProgSlice* slice)
 void LeakChecker::testsValidation(const ProgSlice* slice)
 {
     const SVFGNode* source = slice->getSource();
-    const CallBlockNode* cs = getSrcCSID(source);
+    const CallICFGNode* cs = getSrcCSID(source);
     const SVFFunction* fun = getCallee(cs->getCallSite());
     if(fun==nullptr)
         return;
@@ -188,7 +188,7 @@ void LeakChecker::testsValidation(const ProgSlice* slice)
 void LeakChecker::validateSuccessTests(const SVFGNode* source, const SVFFunction* fun)
 {
 
-    const CallBlockNode* cs = getSrcCSID(source);
+    const CallICFGNode* cs = getSrcCSID(source);
 
     bool success = false;
 
@@ -241,7 +241,7 @@ void LeakChecker::validateSuccessTests(const SVFGNode* source, const SVFFunction
 void LeakChecker::validateExpectedFailureTests(const SVFGNode* source, const SVFFunction* fun)
 {
 
-    const CallBlockNode* cs = getSrcCSID(source);
+    const CallICFGNode* cs = getSrcCSID(source);
 
     bool expectedFailure = false;
 

package/lib/SABER/ProgSlice.cpp

@@ -130,7 +130,7 @@ bool ProgSlice::isSatisfiableForPairs()
     return true;
 }
 
-const CallBlockNode* ProgSlice::getCallSite(const SVFGEdge* edge) const
+const CallICFGNode* ProgSlice::getCallSite(const SVFGEdge* edge) const
 {
     assert(edge->isCallVFGEdge() && "not a call svfg edge?");
     if(const CallDirSVFGEdge* callEdge = SVFUtil::dyn_cast<CallDirSVFGEdge>(edge))
@@ -138,7 +138,7 @@ const CallBlockNode* ProgSlice::getCallSite(const SVFGEdge* edge) const
     else
         return getSVFG()->getCallSite(SVFUtil::cast<CallIndSVFGEdge>(edge)->getCallSiteId());
 }
-const CallBlockNode* ProgSlice::getRetSite(const SVFGEdge* edge) const
+const CallICFGNode* ProgSlice::getRetSite(const SVFGEdge* edge) const
 {
     assert(edge->isRetVFGEdge() && "not a return svfg edge?");
     if(const RetDirSVFGEdge* callEdge = SVFUtil::dyn_cast<RetDirSVFGEdge>(edge))

package/lib/SVF-FE/CallGraphBuilder.cpp

@@ -55,7 +55,7 @@ PTACallGraph* CallGraphBuilder::buildCallGraph(SVFModule* svfModule)
             {
                 if(const SVFFunction* callee = getCallee(inst))
                 {
-                    const CallBlockNode* callBlockNode = icfg->getCallBlockNode(inst);
+                    const CallICFGNode* callBlockNode = icfg->getCallBlockNode(inst);
                     const SVFFunction* caller = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun);
                     callgraph->addDirectCallGraphEdge(callBlockNode,caller,callee);
                 }
@@ -83,7 +83,7 @@ PTACallGraph* ThreadCallGraphBuilder::buildThreadCallGraph(SVFModule* svfModule)
             const Instruction *inst = &*II;
             if (tdAPI->isTDFork(inst))
             {
-                const CallBlockNode* cs = icfg->getCallBlockNode(inst);
+                const CallICFGNode* cs = icfg->getCallBlockNode(inst);
                 cg->addForksite(cs);
                 const Function* forkee = SVFUtil::dyn_cast<Function>(tdAPI->getForkedFun(inst));
                 if (forkee)
@@ -98,7 +98,7 @@ PTACallGraph* ThreadCallGraphBuilder::buildThreadCallGraph(SVFModule* svfModule)
             }
             else if (tdAPI->isHareParFor(inst))
             {
-                const CallBlockNode* cs = icfg->getCallBlockNode(inst);
+                const CallICFGNode* cs = icfg->getCallBlockNode(inst);
                 cg->addParForSite(cs);
                 const Function* taskFunc = SVFUtil::dyn_cast<Function>(tdAPI->getTaskFuncAtHareParForSite(inst));
                 if (taskFunc)
@@ -122,7 +122,7 @@ PTACallGraph* ThreadCallGraphBuilder::buildThreadCallGraph(SVFModule* svfModule)
             const Instruction *inst = &*II;
             if (tdAPI->isTDJoin(inst))
             {
-                const CallBlockNode* cs = icfg->getCallBlockNode(inst);
+                const CallICFGNode* cs = icfg->getCallBlockNode(inst);
                 cg->addJoinsite(cs);
             }
         }

package/lib/SVF-FE/Graph2Json.cpp

@@ -31,7 +31,7 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
         llvm::json::Object ICFGNode_Obj;
         ICFGNode_Obj["ICFG_ID"] = id;
         ICFGNode_Obj["Node Type"] = getICFGKind(node->getNodeKind());
-        if(IntraBlockNode* bNode = SVFUtil::dyn_cast<IntraBlockNode>(node))
+        if(IntraICFGNode* bNode = SVFUtil::dyn_cast<IntraICFGNode>(node))
         {
             ICFGNode_Obj["Source Location"] = getSourceLoc(bNode->getInst());
             SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(bNode);
@@ -61,7 +61,7 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
             llvm::json::Value PagEdge_value = llvm::json::Array{PAGEdge_array};
             ICFGNode_Obj["SVFIR Edges"] = PagEdge_value;
         }
-        else if(FunEntryBlockNode* entry = SVFUtil::dyn_cast<FunEntryBlockNode>(node))
+        else if(FunEntryICFGNode* entry = SVFUtil::dyn_cast<FunEntryICFGNode>(node))
         {
             if (isExtCall(entry->getFun()))
                 ICFGNode_Obj["isExtCall"] = true;
@@ -72,7 +72,7 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
             }
             ICFGNode_Obj["Function Name"] = entry->getFun()->getName();
         }
-        else if (FunExitBlockNode* exit = SVFUtil::dyn_cast<FunExitBlockNode>(node))
+        else if (FunExitICFGNode* exit = SVFUtil::dyn_cast<FunExitICFGNode>(node))
         {
             if (isExtCall(exit->getFun()))
                 ICFGNode_Obj["isExtCall"] = true;
@@ -83,11 +83,11 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
             }
             ICFGNode_Obj["Function Name"] = exit->getFun()->getName();
         }
-        else if (CallBlockNode* call = SVFUtil::dyn_cast<CallBlockNode>(node))
+        else if (CallICFGNode* call = SVFUtil::dyn_cast<CallICFGNode>(node))
         {
             ICFGNode_Obj["Source Location"] = getSourceLoc(call->getCallSite());
         }
-        else if (RetBlockNode* ret = SVFUtil::dyn_cast<RetBlockNode>(node))
+        else if (RetICFGNode* ret = SVFUtil::dyn_cast<RetICFGNode>(node))
         {
             ICFGNode_Obj["Source Location"] = getSourceLoc(ret->getCallSite());
         }