Merge pull request #1223 from jumormt/10.9

fix control dependence bug: no nearest common post dominator
SVF-tools · Oct 12, 2023 · 09ecc98 · 09ecc98
2 parents 519f05e + 4ea1ba3
commit 09ecc98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/svf/lib/SVFIR/SVFValue.cpp b/svf/lib/SVFIR/SVFValue.cpp
@@ -121,6 +121,8 @@ const SVFBasicBlock* SVFLoopAndDomInfo::findNearestCommonPDominator(const SVFBas
     // continue going up til we arrive at the same node.
     while (A != B)
     {
+        // no common PDominator
+        if(A == NULL) return NULL;
         const auto lvA = getBBPDomLevel().find(A);
         const auto lvB = getBBPDomLevel().find(B);
         assert(lvA != getBBPDomLevel().end() && lvB != getBBPDomLevel().end());

diff --git a/svf/lib/Util/CDGBuilder.cpp b/svf/lib/Util/CDGBuilder.cpp
@@ -64,6 +64,11 @@ void
 CDGBuilder::extractNodesBetweenPdomNodes(const SVFBasicBlock *succ, const SVFBasicBlock *LCA,
         std::vector<const SVFBasicBlock *> &tgtNodes)
 {
+    if (LCA == NULL)
+    {
+        tgtNodes.push_back(succ);
+        return;
+    }
     if (succ == LCA) return;
     std::vector<const SVFBasicBlock *> path;
     SVFLoopAndDomInfo *ld = const_cast<SVFFunction *>(LCA->getFunction())->getLoopAndDomInfo();