Fix SubroutineInliner CallGraph crash.

LLVM 22 removed CallGraphNode::removeCallEdgeFor. The initial porting
effort replaced it with removeOneAbstractEdgeTo, which matches edges
with a null call site and would cause assertion within this function
when called on real direct call. Restored original behaviour with
removeCallEdgeForLegacy helper function.

Author: kkreczko

IGC/WrapperLLVM/include/llvmWrapper/Analysis/CallGraph.h

@@ -9,15 +9,37 @@ SPDX-License-Identifier: MIT
 #ifndef IGCLLVM_CALL_GRAPH_H
 #define IGCLLVM_CALL_GRAPH_H
 
+#include "Probe/Assertion.h"
 #include "IGC/common/LLVMWarningsPush.hpp"
 #include "llvm/Config/llvm-config.h"
 #include "llvm/Analysis/CallGraph.h"
+#include "llvm/IR/AbstractCallSite.h"
 #include "IGC/common/LLVMWarningsPop.hpp"
 
 namespace IGCLLVM {
-using CallGraphNode = llvm::CallGraphNode;
+// Compatibility for CallGraphNode::removeCallEdgeFor(CallBase&), removed in LLVM 22. Drops the call-graph
+// edge for the concrete call site CB (removeOneAbstractEdgeTo alone only matches null/abstract edges),
+// then drops the abstract edges for any callback functions.
+inline void removeCallEdgeFor(llvm::CallGraphNode *Node, llvm::CallGraph &CG, llvm::CallBase &CB) {
+#if LLVM_VERSION_MAJOR < 22
+  (void)CG;
+  Node->removeCallEdgeFor(CB);
+#else
+  for (auto I = Node->begin(), E = Node->end(); I != E; ++I) {
+    if (I->first && *I->first == &CB) {
+      Node->removeCallEdge(I);
+      llvm::forEachCallbackFunction(
+          CB, [&](llvm::Function *Cb) { Node->removeOneAbstractEdgeTo(CG.getOrInsertFunction(Cb)); });
+      return;
+    }
+  }
+  IGC_ASSERT_MESSAGE(false, "Cannot find callsite to remove!");
+#endif
+}
 
+using CallGraphNode = llvm::CallGraphNode;
 using CallRecord = llvm::CallGraphNode::CallRecord;
+
 } // namespace IGCLLVM
 
 #endif

IGC/WrapperLLVM/lib/llvmWrapper/Transforms/IPO/InlineHelper.cpp

@@ -400,11 +400,9 @@ bool inlineCallsImpl(CallGraphSCC &SCC, CallGraph &CG, std::function<AssumptionC
         LLVM_DEBUG(dbgs() << "    -> Deleting dead call: " << CB << "\n");
         // Update the call graph by deleting the edge from Callee to Caller.
         setInlineRemark(CB, "trivially dead");
-#if LLVM_VERSION_MAJOR >= 22
-        CG[Caller]->removeOneAbstractEdgeTo(CG[Callee]);
-#else
-        CG[Caller]->removeCallEdgeFor(CB);
-#endif
+
+        IGCLLVM::removeCallEdgeFor(CG[Caller], CG, CB);
+
         CB.eraseFromParent();
       } else {
         // Get DebugLoc to report. CB will be invalid after Inliner.
@@ -416,11 +414,7 @@ bool inlineCallsImpl(CallGraphSCC &SCC, CallGraph &CG, std::function<AssumptionC
 
 #if LLVM_VERSION_MAJOR >= 17
         CallGraphNode *CallerNode = CG[Caller];
-#if LLVM_VERSION_MAJOR >= 22
-        CallerNode->removeOneAbstractEdgeTo(CG[Callee]);
-#else
-        CallerNode->removeCallEdgeFor(CB);
-#endif
+        IGCLLVM::removeCallEdgeFor(CallerNode, CG, CB);
 #endif
 
         InlineResult IR = inlineCallIfPossible(CB, InlineInfo, InlinedArrayAllocas, InlineHistoryID, InsertLifetime,