CalleeAnalysis: no need to provide the PassManager to the getMemBehaviorFn

A NFC simplification

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/Analysis/CalleeAnalysis.swift

@@ -23,10 +23,9 @@ public struct CalleeAnalysis {
         return inst.instruction.isDeinitBarrier(bca.analysis)
       },
       // getMemBehaviorFn
-      { (bridgedCtxt: BridgedPassContext, bridgedApply: BridgedInstruction, observeRetains: Bool) -> swift.MemoryBehavior in
-        let context = FunctionPassContext(_bridged: bridgedCtxt)
+      { (bridgedApply: BridgedInstruction, observeRetains: Bool, bca: BridgedCalleeAnalysis) -> swift.MemoryBehavior in
         let apply = bridgedApply.instruction as! ApplySite
-        let e = context.calleeAnalysis.getSideEffects(of: apply)
+        let e = bca.analysis.getSideEffects(of: apply)
         return e.getMemBehavior(observeRetains: observeRetains)
       }
     )

include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

@@ -183,7 +183,6 @@ class CalleeCache {
 
 class BasicCalleeAnalysis : public SILAnalysis {
   SILModule &M;
-  SILPassManager *pm = nullptr;
   std::unique_ptr<CalleeCache> Cache;
 
 public:
@@ -197,8 +196,6 @@ class BasicCalleeAnalysis : public SILAnalysis {
     return S->getKind() == SILAnalysisKind::BasicCallee;
   }
 
-  virtual void initialize(SILPassManager *pm) override { this->pm = pm; }
-
   /// Invalidate all information in this analysis.
   virtual void invalidate() override {
     Cache.reset();

include/swift/SILOptimizer/OptimizerBridging.h

@@ -62,7 +62,7 @@ struct BridgedCalleeAnalysis {
 
   typedef bool (* _Nonnull IsDeinitBarrierFn)(BridgedInstruction, BridgedCalleeAnalysis bca);
   typedef swift::MemoryBehavior (* _Nonnull GetMemBehvaiorFn)(
-        BridgedPassContext context, BridgedInstruction apply, bool observeRetains);
+        BridgedInstruction apply, bool observeRetains, BridgedCalleeAnalysis bca);
 
   static void registerAnalysis(IsDeinitBarrierFn isDeinitBarrierFn,
                                GetMemBehvaiorFn getEffectsFn);

lib/SILOptimizer/Analysis/BasicCalleeAnalysis.cpp

@@ -352,9 +352,9 @@ void BridgedCalleeAnalysis::registerAnalysis(IsDeinitBarrierFn instructionIsDein
 MemoryBehavior BasicCalleeAnalysis::
 getMemoryBehavior(ApplySite as, bool observeRetains) {
   if (getMemBehvaiorFunction) {
-    auto b = getMemBehvaiorFunction({pm->getSwiftPassInvocation()},
-                                    {as.getInstruction()->asSILNode()},
-                                    observeRetains);
+    auto b = getMemBehvaiorFunction({as.getInstruction()->asSILNode()},
+                                    observeRetains,
+                                    {this});
     return (MemoryBehavior)b;
   }
   return MemoryBehavior::MayHaveSideEffects;