From fe8a2ad4a0e1d83127cf34a1937b47e60373f324 Mon Sep 17 00:00:00 2001 From: Mircea Trofin Date: Mon, 13 Apr 2020 21:41:25 -0700 Subject: [PATCH] [llvm][NFC][CallSite] Remove CallSite from CGSCCPassManager Reviewers: craig.topper, dblaikie, davidxl Subscribers: llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D78080 --- llvm/include/llvm/Analysis/CGSCCPassManager.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/llvm/include/llvm/Analysis/CGSCCPassManager.h b/llvm/include/llvm/Analysis/CGSCCPassManager.h index 6e3b4aa..4c51917 100644 --- a/llvm/include/llvm/Analysis/CGSCCPassManager.h +++ b/llvm/include/llvm/Analysis/CGSCCPassManager.h @@ -95,7 +95,6 @@ #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Analysis/LazyCallGraph.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/Function.h" #include "llvm/IR/InstIterator.h" #include "llvm/IR/PassManager.h" @@ -605,8 +604,8 @@ public: CallCounts.insert(std::make_pair(&N.getFunction(), CountLocal)) .first->second; for (Instruction &I : instructions(N.getFunction())) - if (auto CS = CallSite(&I)) { - if (CS.getCalledFunction()) { + if (auto *CB = dyn_cast(&I)) { + if (CB->getCalledFunction()) { ++Count.Direct; } else { ++Count.Indirect; @@ -648,17 +647,17 @@ public: auto IsDevirtualizedHandle = [&](WeakTrackingVH &CallH) { if (!CallH) return false; - auto CS = CallSite(CallH); - if (!CS) + auto *CB = dyn_cast(CallH); + if (!CB) return false; // If the call is still indirect, leave it alone. - Function *F = CS.getCalledFunction(); + Function *F = CB->getCalledFunction(); if (!F) return false; LLVM_DEBUG(dbgs() << "Found devirtualized call from " - << CS.getParent()->getParent()->getName() << " to " + << CB->getParent()->getParent()->getName() << " to " << F->getName() << "\n"); // We now have a direct call where previously we had an indirect call, -- 2.7.4