Merge pull request #21778 from bob-wilson/llvm-r350503

master-next: Adjust for LLVM r350503

Author: bob-wilson

include/swift/LLVMPasses/Passes.h

@@ -30,7 +30,7 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
+    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
                                    const llvm::MemoryLocation &Loc);
   };
 

lib/LLVMPasses/LLVMSwiftAA.cpp

@@ -32,17 +32,16 @@ static ModRefInfo getConservativeModRefForKind(const llvm::Instruction &I) {
   llvm_unreachable("Not a valid Instruction.");
 }
 
-ModRefInfo SwiftAAResult::getModRefInfo(llvm::ImmutableCallSite CS,
+ModRefInfo SwiftAAResult::getModRefInfo(const llvm::CallBase *Call,
                                         const llvm::MemoryLocation &Loc) {
   // We know at compile time that certain entry points do not modify any
   // compiler-visible state ever. Quickly check if we have one of those
   // instructions and return if so.
-  if (ModRefInfo::NoModRef ==
-      getConservativeModRefForKind(*CS.getInstruction()))
+  if (ModRefInfo::NoModRef == getConservativeModRefForKind(*Call))
     return ModRefInfo::NoModRef;
 
   // Otherwise, delegate to the rest of the AA ModRefInfo machinery.
-  return AAResultBase::getModRefInfo(CS, Loc);
+  return AAResultBase::getModRefInfo(Call, Loc);
 }
 
 //===----------------------------------------------------------------------===//