From d22989c34ede9ebe1cdb52c30407d35a1d117f2e Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Tue, 21 Apr 2020 23:29:17 -0700 Subject: [PATCH] [CallSite removal][Target] Replace CallSite with CallBase. NFC In some cases just delete an unneeded include. --- llvm/lib/Target/ARM/ARMFastISel.cpp | 37 +++++++++---------- .../lib/Target/ARM/ARMTargetTransformInfo.cpp | 4 +- llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 1 - llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 1 - .../WebAssemblyLowerEmscriptenEHSjLj.cpp | 1 - 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/llvm/lib/Target/ARM/ARMFastISel.cpp b/llvm/lib/Target/ARM/ARMFastISel.cpp index 11bff747837c5..0939d890f36bc 100644 --- a/llvm/lib/Target/ARM/ARMFastISel.cpp +++ b/llvm/lib/Target/ARM/ARMFastISel.cpp @@ -48,7 +48,6 @@ #include "llvm/CodeGen/ValueTypes.h" #include "llvm/IR/Argument.h" #include "llvm/IR/Attributes.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/CallingConv.h" #include "llvm/IR/Constant.h" #include "llvm/IR/Constants.h" @@ -2298,12 +2297,11 @@ bool ARMFastISel::SelectCall(const Instruction *I, if (CI->isTailCall()) return false; // Check the calling convention. - ImmutableCallSite CS(CI); - CallingConv::ID CC = CS.getCallingConv(); + CallingConv::ID CC = CI->getCallingConv(); // TODO: Avoid some calling conventions? - FunctionType *FTy = CS.getFunctionType(); + FunctionType *FTy = CI->getFunctionType(); bool isVarArg = FTy->isVarArg(); // Handle *simple* calls for now. @@ -2330,47 +2328,46 @@ bool ARMFastISel::SelectCall(const Instruction *I, SmallVector ArgRegs; SmallVector ArgVTs; SmallVector ArgFlags; - unsigned arg_size = CS.arg_size(); + unsigned arg_size = CI->arg_size(); Args.reserve(arg_size); ArgRegs.reserve(arg_size); ArgVTs.reserve(arg_size); ArgFlags.reserve(arg_size); - for (ImmutableCallSite::arg_iterator i = CS.arg_begin(), e = CS.arg_end(); - i != e; ++i) { + for (auto ArgI = CI->arg_begin(), ArgE = CI->arg_end(); ArgI != ArgE; ++ArgI) { // If we're lowering a memory intrinsic instead of a regular call, skip the // last argument, which shouldn't be passed to the underlying function. - if (IntrMemName && e - i <= 1) + if (IntrMemName && ArgE - ArgI <= 1) break; ISD::ArgFlagsTy Flags; - unsigned ArgIdx = i - CS.arg_begin(); - if (CS.paramHasAttr(ArgIdx, Attribute::SExt)) + unsigned ArgIdx = ArgI - CI->arg_begin(); + if (CI->paramHasAttr(ArgIdx, Attribute::SExt)) Flags.setSExt(); - if (CS.paramHasAttr(ArgIdx, Attribute::ZExt)) + if (CI->paramHasAttr(ArgIdx, Attribute::ZExt)) Flags.setZExt(); // FIXME: Only handle *easy* calls for now. - if (CS.paramHasAttr(ArgIdx, Attribute::InReg) || - CS.paramHasAttr(ArgIdx, Attribute::StructRet) || - CS.paramHasAttr(ArgIdx, Attribute::SwiftSelf) || - CS.paramHasAttr(ArgIdx, Attribute::SwiftError) || - CS.paramHasAttr(ArgIdx, Attribute::Nest) || - CS.paramHasAttr(ArgIdx, Attribute::ByVal)) + if (CI->paramHasAttr(ArgIdx, Attribute::InReg) || + CI->paramHasAttr(ArgIdx, Attribute::StructRet) || + CI->paramHasAttr(ArgIdx, Attribute::SwiftSelf) || + CI->paramHasAttr(ArgIdx, Attribute::SwiftError) || + CI->paramHasAttr(ArgIdx, Attribute::Nest) || + CI->paramHasAttr(ArgIdx, Attribute::ByVal)) return false; - Type *ArgTy = (*i)->getType(); + Type *ArgTy = (*ArgI)->getType(); MVT ArgVT; if (!isTypeLegal(ArgTy, ArgVT) && ArgVT != MVT::i16 && ArgVT != MVT::i8 && ArgVT != MVT::i1) return false; - Register Arg = getRegForValue(*i); + Register Arg = getRegForValue(*ArgI); if (!Arg.isValid()) return false; Flags.setOrigAlign(Align(DL.getABITypeAlignment(ArgTy))); - Args.push_back(*i); + Args.push_back(*ArgI); ArgRegs.push_back(Arg); ArgVTs.push_back(ArgVT); ArgFlags.push_back(Flags); diff --git a/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp b/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp index 34d819696e1aa..bab6d224b84de 100644 --- a/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp +++ b/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp @@ -16,7 +16,6 @@ #include "llvm/CodeGen/ISDOpcodes.h" #include "llvm/CodeGen/ValueTypes.h" #include "llvm/IR/BasicBlock.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/Instruction.h" @@ -1354,8 +1353,7 @@ void ARMTTIImpl::getUnrollingPreferences(Loop *L, ScalarEvolution &SE, return; if (isa(I) || isa(I)) { - ImmutableCallSite CS(&I); - if (const Function *F = CS.getCalledFunction()) { + if (const Function *F = cast(I).getCalledFunction()) { if (!isLoweredToCall(F)) continue; } diff --git a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp index 472625290d403..1fbbed770c5ca 100644 --- a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp @@ -31,7 +31,6 @@ #include "llvm/CodeGen/ValueTypes.h" #include "llvm/IR/Argument.h" #include "llvm/IR/Attributes.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/Constants.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DerivedTypes.h" diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index 22f148e4b7459..3c3a144a9b98e 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -55,7 +55,6 @@ #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h" #include "llvm/CodeGen/TargetRegisterInfo.h" #include "llvm/CodeGen/ValueTypes.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/CallingConv.h" #include "llvm/IR/Constant.h" #include "llvm/IR/Constants.h" diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp index b35652898c3bf..be4fe0b312267 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp @@ -208,7 +208,6 @@ ///===----------------------------------------------------------------------===// #include "WebAssembly.h" -#include "llvm/IR/CallSite.h" #include "llvm/IR/DebugInfoMetadata.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/IRBuilder.h"