Merge pull request #23893 from gottesmm/master-next-49450147

[upstream-update] Add to SwiftAAResult a getModRefInfo entrypoint tha…

Author: gottesmm

include/swift/LLVMPasses/Passes.h

@@ -31,7 +31,13 @@ namespace swift {
 
     using AAResultBase::getModRefInfo;
     llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc);
+                                   const llvm::MemoryLocation &Loc) {
+      llvm::AAQueryInfo AAQI;
+      return getModRefInfo(Call, Loc, AAQI);
+    }
+    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
+                                   const llvm::MemoryLocation &Loc,
+                                   llvm::AAQueryInfo &AAQI);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {

lib/LLVMPasses/LLVMSwiftAA.cpp

@@ -33,15 +33,15 @@ static ModRefInfo getConservativeModRefForKind(const llvm::Instruction &I) {
 }
 
 ModRefInfo SwiftAAResult::getModRefInfo(const llvm::CallBase *Call,
-                                        const llvm::MemoryLocation &Loc) {
+                                        const llvm::MemoryLocation &Loc,
+                                        llvm::AAQueryInfo &AAQI) {
   // 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(*Call))
     return ModRefInfo::NoModRef;
 
   // Otherwise, delegate to the rest of the AA ModRefInfo machinery.
-  AAQueryInfo AAQI;
   return AAResultBase::getModRefInfo(Call, Loc, AAQI);
 }