svf-tools 1.0.995 → 1.0.997

package/svf-llvm/lib/LLVMUtil.cpp

@@ -648,17 +648,13 @@ bool LLVMUtil::isHeapAllocExtCallViaArg(const Instruction* inst)
 
 bool LLVMUtil::isNonInstricCallSite(const Instruction* inst)
 {
-    SVFInstruction* svfINst =
-        LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(inst);
-    bool res = SVFUtil::isNonInstricCallSite(svfINst);
-    bool res2 = false;
+    bool res = false;
 
     if(isIntrinsicInst(inst))
-        res2 = false;
+        res = false;
     else
-        res2 = isCallSite(inst);
-    assert(res == res2);
-    return res2;
+        res = isCallSite(inst);
+    return res;
 }
 
 namespace SVF
@@ -688,4 +684,25 @@ std::string SVFValue::toString() const
     return rawstr.str();
 }
 
+
+const std::string SVFBaseNode::toString() const
+{
+    std::string str;
+    llvm::raw_string_ostream rawstr(str);
+    if (const SVF::CallGraphNode* fun = SVFUtil::dyn_cast<CallGraphNode>(this))
+    {
+        rawstr << "Function: " << fun->getFunction()->getName() << " ";
+    }
+    else
+    {
+        auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
+        if (llvmVal)
+            rawstr << " " << *llvmVal << " ";
+        else
+            rawstr << " No llvmVal found";
+    }
+    rawstr << getSourceLoc();
+    return rawstr.str();
+}
+
 } // namespace SVF

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1171,7 +1171,7 @@ void SVFIRBuilder::updateCallGraph(CallGraph* callgraph)
     for (; iter != eiter; iter++)
     {
         const CallICFGNode* callBlock = iter->first;
-        const CallBase* callbase = SVFUtil::cast<CallBase>(llvmModuleSet()->getLLVMValue(callBlock->getCallSite()));
+        const CallBase* callbase = SVFUtil::cast<CallBase>(llvmModuleSet()->getLLVMValue(callBlock));
         assert(callBlock->isIndirectCall() && "this is not an indirect call?");
         const CallGraph::FunctionSet& functions = iter->second;
         for (CallGraph::FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
@@ -1186,7 +1186,7 @@ void SVFIRBuilder::updateCallGraph(CallGraph* callgraph)
             }
             else
             {
-                setCurrentLocation(callBlock->getCallSite(), callBlock->getCallSite()->getParent());
+                setCurrentLocation(llvmModuleSet()->getSVFValue(llvmModuleSet()->getLLVMValue(callBlock)), callBlock->getBB());
                 handleDirectCall(const_cast<CallBase*>(callbase), callee);
             }
         }

package/svf-llvm/lib/SVFIRExtAPI.cpp

@@ -256,7 +256,7 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
 
     if (isThreadForkCall(callICFGNode))
     {
-        if (const SVFFunction* forkedFun = SVFUtil::dyn_cast<SVFFunction>(getForkedFun(callICFGNode)))
+        if (const SVFFunction* forkedFun = SVFUtil::dyn_cast<SVFFunction>(getForkedFun(callICFGNode)->getValue()))
         {
             forkedFun = forkedFun->getDefFunForMultipleModule();
             const SVFVar* actualParm = getActualParmAtForkSite(callICFGNode);

package/svf-llvm/lib/SymbolTableBuilder.cpp

@@ -205,7 +205,7 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
                 {
                     collectSym(sw->getCondition());
                 }
-                else if (isNonInstricCallSite(LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(&inst)))
+                else if (isNonInstricCallSite(&inst))
                 {
 
                     const CallBase* cs = LLVMUtil::getLLVMCallSite(&inst);
@@ -634,7 +634,7 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
 
     // We consider two types of objects:
     // (1) A heap/static object from a callsite
-    if (I && isNonInstricCallSite(LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(I)))
+    if (I && isNonInstricCallSite(I))
     {
         objTy = inferTypeOfHeapObjOrStaticObj(I);
     }