Merge pull request #1766 from FXTi/master

yuleisui · web-flow · commit 80c478f8f1aa · 2025-11-06T12:14:58.000+11:00
Fix(#1765): Use thunk function as placeholder when it can't be resolved
diff --git a/svf-llvm/lib/CHGBuilder.cpp b/svf-llvm/lib/CHGBuilder.cpp
@@ -739,12 +739,10 @@ void CHGBuilder::addFuncToFuncVector(CHNode::FuncVector &v, const Function *lf)
 {
     if (cppUtil::isCPPThunkFunction(lf))
     {
-        if (const auto* tf = cppUtil::getThunkTarget(lf))
-        {
-            const FunObjVar* pFunction =
-                llvmModuleSet()->getFunObjVar(tf);
-            v.push_back(pFunction);
-        }
+        const auto* tf = cppUtil::getThunkTarget(lf);
+        const FunObjVar* pFunction =
+            llvmModuleSet()->getFunObjVar(tf ? tf : lf);
+        v.push_back(pFunction);
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -739,12 +739,10 @@ void CHGBuilder::addFuncToFuncVector(CHNode::FuncVector &v, const Function *lf)`
`739`	`739`	`{`
`740`	`740`	`if (cppUtil::isCPPThunkFunction(lf))`
`741`	`741`	`{`
`742`		`- if (const auto* tf = cppUtil::getThunkTarget(lf))`
`743`		`- {`
`744`		`- const FunObjVar* pFunction =`
`745`		`- llvmModuleSet()->getFunObjVar(tf);`
`746`		`- v.push_back(pFunction);`
`747`		`- }`
	`742`	`+ const auto* tf = cppUtil::getThunkTarget(lf);`
	`743`	`+ const FunObjVar* pFunction =`
	`744`	`+ llvmModuleSet()->getFunObjVar(tf ? tf : lf);`
	`745`	`+ v.push_back(pFunction);`
`748`	`746`	`}`
`749`	`747`	`else`
`750`	`748`	`{`