Merge pull request #1446 from jumormt/master

Fix bug and CI
SVF-tools · Apr 28, 2024 · dc559ce · dc559ce
2 parents b8c2a57 + 75e7d2d
commit dc559ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml
@@ -26,7 +26,7 @@ jobs:
         if: runner.os == 'macOS'
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 14.2.0
+          xcode-version: 14.3.1
       - name: mac-setup-workaround
         if: runner.os == 'macOS'
         run: |

diff --git a/.github/workflows/svf-lib_publish.yml b/.github/workflows/svf-lib_publish.yml
@@ -26,7 +26,7 @@ jobs:
         if: runner.os == 'macOS'
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 14.2.0
+          xcode-version: 14.3.1
       - name: mac-setup-workaround
         if: runner.os == 'macOS'
         run: |

diff --git a/svf/lib/Graphs/VFG.cpp b/svf/lib/Graphs/VFG.cpp
@@ -754,7 +754,9 @@ void VFG::connectDirectVFGEdges()
                 continue;
             /// for all other cases, like copy/gep/load/ret, connect the RHS pointer to its def
             if (stmtNode->getPAGSrcNode()->isConstDataOrAggDataButNotNullPtr() == false)
-                addIntraDirectVFEdge(getDef(stmtNode->getPAGSrcNode()), nodeId);
+                // for ptr vfg, we skip src node of integer type if it is at a int2ptr copystmt
+                if(isInterestedPAGNode(stmtNode->getPAGSrcNode()))
+                    addIntraDirectVFEdge(getDef(stmtNode->getPAGSrcNode()), nodeId);
             if (const GepStmt* gepStmt = SVFUtil::dyn_cast<GepStmt>(stmtNode->getPAGEdge()))
             {
                 for (const auto &varType: gepStmt->getOffsetVarAndGepTypePairVec())