Merge pull request #31361 from eeckstein/remove-callsite

Remove includes to llvm's CallSite.h

Author: eeckstein

lib/IRGen/CallEmission.h

@@ -61,7 +61,7 @@ class CallEmission {
   void emitToUnmappedMemory(Address addr);
   void emitToUnmappedExplosion(Explosion &out);
   void emitYieldsToExplosion(Explosion &out);
-  llvm::CallSite emitCallSite();
+  llvm::CallInst *emitCallSite();
 
 public:
   CallEmission(IRGenFunction &IGF, Callee &&callee)

lib/IRGen/GenCall.cpp

@@ -28,7 +28,6 @@
 #include "swift/SIL/SILType.h"
 #include "swift/ABI/MetadataValues.h"
 #include "swift/Runtime/Config.h"
-#include "llvm/IR/CallSite.h"
 #include "llvm/IR/GlobalPtrAuthInfo.h"
 #include "llvm/Support/Compiler.h"
 
@@ -1517,7 +1516,7 @@ void CallEmission::emitToUnmappedExplosion(Explosion &out) {
   auto call = emitCallSite();
 
   // Bail out immediately on a void result.
-  llvm::Value *result = call.getInstruction();
+  llvm::Value *result = call;
   if (result->getType()->isVoidTy())
     return;
 
@@ -1585,7 +1584,7 @@ void CallEmission::emitToUnmappedMemory(Address result) {
 }
 
 /// The private routine to ultimately emit a call or invoke instruction.
-llvm::CallSite CallEmission::emitCallSite() {
+llvm::CallInst *CallEmission::emitCallSite() {
   assert(LastArgWritten == 0);
   assert(!EmittedCall);
   EmittedCall = true;
@@ -1733,8 +1732,7 @@ void CallEmission::emitYieldsToExplosion(Explosion &out) {
 
   // Pull the raw return values out.
   Explosion rawReturnValues;
-  extractScalarResults(IGF, call->getType(), call.getInstruction(),
-                       rawReturnValues);
+  extractScalarResults(IGF, call->getType(), call, rawReturnValues);
 
   auto coroInfo = getCallee().getSignature().getCoroutineInfo();
 

lib/IRGen/GenClass.cpp

@@ -33,7 +33,6 @@
 #include "swift/SIL/SILType.h"
 #include "swift/SIL/SILVTableVisitor.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/IR/CallSite.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalVariable.h"

lib/IRGen/GenControl.cpp

@@ -15,7 +15,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/IR/CallSite.h"
 #include "llvm/IR/Function.h"
 #include "IRGenFunction.h"
 #include "IRGenModule.h"

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -38,7 +38,6 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/IR/CallSite.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/IRBuilder.h"
@@ -543,8 +542,8 @@ static bool isEligibleFunction(Function *F) {
   // outweighs the benefit.
   for (BasicBlock &BB : *F) {
     for (Instruction &I : BB) {
-      if (CallSite CS = CallSite(&I)) {
-        Function *Callee = CS.getCalledFunction();
+      if (CallBase *CB = dyn_cast<CallBase>(&I)) {
+        Function *Callee = CB->getCalledFunction();
         if (Callee && !mayMergeCallsToFunction(*Callee))
           return false;
         if (!Callee || !Callee->isIntrinsic()) {