Merge pull request #1754 from Xinlong-Wu/patch-1

yuleisui · web-flow · commit a58eaf879e14 · 2025-09-26T13:59:46.000+10:00
Fix join loop detection for joinSite instead of forkSite
diff --git a/svf/lib/MTA/MHP.cpp b/svf/lib/MTA/MHP.cpp
@@ -824,9 +824,9 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)
 
         if (isAliasedForkJoin(SVFUtil::cast<CallICFGNode>(forkSite), SVFUtil::cast<CallICFGNode>(joinSite)))
         {
-            if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite)))
+            if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite)))
             {
-                LoopBBs& joinLoop = getJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite));
+                LoopBBs& joinLoop = getJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite));
                 std::vector<const SVFBasicBlock *> exitbbs;
                 joinSite->getFun()->getExitBlocksOfLoop(joinSite->getBB(), exitbbs);
                 while (!exitbbs.empty())
@@ -856,7 +856,7 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)
         /// we process the loop exit
         else
         {
-            if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite)))
+            if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite)))
             {
                 std::vector<const SVFBasicBlock*> exitbbs;
                 joinSite->getFun()->getExitBlocksOfLoop(joinSite->getBB(), exitbbs);

Original file line number	Diff line number	Diff line change
`@@ -824,9 +824,9 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)`
`824`	`824`
`825`	`825`	`if (isAliasedForkJoin(SVFUtil::cast<CallICFGNode>(forkSite), SVFUtil::cast<CallICFGNode>(joinSite)))`
`826`	`826`	`{`
`827`		`- if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite)))`
	`827`	`+ if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite)))`
`828`	`828`	`{`
`829`		`- LoopBBs& joinLoop = getJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite));`
	`829`	`+ LoopBBs& joinLoop = getJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite));`
`830`	`830`	`std::vector<const SVFBasicBlock *> exitbbs;`
`831`	`831`	`joinSite->getFun()->getExitBlocksOfLoop(joinSite->getBB(), exitbbs);`
`832`	`832`	`while (!exitbbs.empty())`
`@@ -856,7 +856,7 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)`
`856`	`856`	`/// we process the loop exit`
`857`	`857`	`else`
`858`	`858`	`{`
`859`		`- if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(forkSite)))`
	`859`	`+ if (hasJoinLoop(SVFUtil::cast<CallICFGNode>(joinSite)))`
`860`	`860`	`{`
`861`	`861`	`std::vector<const SVFBasicBlock*> exitbbs;`
`862`	`862`	`joinSite->getFun()->getExitBlocksOfLoop(joinSite->getBB(), exitbbs);`