swiftlang · eeckstein · Jul 29, 2025 · Jul 25, 2025 · Jul 25, 2025 · Jul 25, 2025
@@ -15,7 +15,7 @@ import SIL
 
 extension FunctionPassContext {
   var aliasAnalysis: AliasAnalysis {
-    let bridgedAA = _bridged.getAliasAnalysis()
+    let bridgedAA = bridgedPassContext.getAliasAnalysis()
     return AliasAnalysis(bridged: bridgedAA, context: self)
   }
 }
@@ -113,15 +113,15 @@ struct AliasAnalysis {
         bridgedAliasAnalysis.mutableCachePointer.assumingMemoryBound(to: Cache.self).deinitialize(count: 1)
       },
       // getMemEffectsFn
-      { (bridgedCtxt: BridgedPassContext,
+      { (bridgedCtxt: BridgedContext,
          bridgedAliasAnalysis: BridgedAliasAnalysis,
          bridgedAddr: BridgedValue,
          bridgedInst: BridgedInstruction) -> BridgedMemoryBehavior in
         let aa = AliasAnalysis(bridged: bridgedAliasAnalysis, context: FunctionPassContext(_bridged: bridgedCtxt))
         return aa.getMemoryEffect(of: bridgedInst.instruction, on: bridgedAddr.value).bridged
       },
       // isObjReleasedFn
-      { (bridgedCtxt: BridgedPassContext,
+      { (bridgedCtxt: BridgedContext,
          bridgedAliasAnalysis: BridgedAliasAnalysis,
          bridgedObj: BridgedValue,
          bridgedInst: BridgedInstruction) -> Bool in
@@ -142,7 +142,7 @@ struct AliasAnalysis {
       },
 
       // isAddrVisibleFromObj
-      { (bridgedCtxt: BridgedPassContext,
+      { (bridgedCtxt: BridgedContext,
          bridgedAliasAnalysis: BridgedAliasAnalysis,
          bridgedAddr: BridgedValue,
          bridgedObj: BridgedValue) -> Bool in
@@ -159,7 +159,7 @@ struct AliasAnalysis {
       },
 
       // mayAliasFn
-      { (bridgedCtxt: BridgedPassContext,
+      { (bridgedCtxt: BridgedContext,
          bridgedAliasAnalysis: BridgedAliasAnalysis,
          bridgedLhs: BridgedValue,
          bridgedRhs: BridgedValue) -> Bool in

@@ -7,11 +7,6 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 swift_compiler_sources(Optimizer
-  BasicBlockRange.swift
   DeadEndBlocks.swift
   FunctionUses.swift
-  InstructionRange.swift
-  ReachableBlocks.swift
-  Set.swift
-  Stack.swift
-  Worklist.swift)
+  ReachableBlocks.swift)
@@ -102,7 +102,7 @@ private func tryConvertBoxesToStack(in function: Function, _ context: FunctionPa
     hoistMarkUnresolvedInsts(stackAddress: stack, checkKind: .consumableAndAssignable, context)
   }
   if !promotableBoxes.isEmpty {
-    function.fixStackNesting(context)
+    context.fixStackNesting(in: function)
   }
 
   return functionsToSpecialize

@@ -158,7 +158,7 @@ let autodiffClosureSpecialization = FunctionPass(name: "autodiff-closure-special
     }
 
     if context.needFixStackNesting {
-      function.fixStackNesting(context)
+      context.fixStackNesting(in: function)
     }
 
     remainingSpecializationRounds -= 1
@@ -836,7 +836,7 @@ private extension SpecializationCloner {
     }
 
     if (self.context.needFixStackNesting) {
-      self.cloned.fixStackNesting(self.context)
+      self.context.fixStackNesting(in: self.cloned)
     }
   }
 }

@@ -72,7 +72,7 @@ let computeEscapeEffects = FunctionPass(name: "compute-escape-effects") {
     return
   }
 
-  context.modifyEffects(in: function) { (effects: inout FunctionEffects) in
+  function.modifyEffects(context) { (effects: inout FunctionEffects) in
     effects.escapeEffects.arguments = newEffects
   }
 }

@@ -69,7 +69,7 @@ let computeSideEffects = FunctionPass(name: "compute-side-effects") {
   }
 
   // Finally replace the function's side effects.
-  context.modifyEffects(in: function) { (effects: inout FunctionEffects) in
+  function.modifyEffects(context) { (effects: inout FunctionEffects) in
     let globalEffects = function.isProgramTerminationPoint ?
                             collectedEffects.globalEffects.forProgramTerminationPoints
                           : collectedEffects.globalEffects

@@ -110,7 +110,7 @@ func runSimplification(on function: Function, _ context: FunctionPassContext,
   } while !worklist.isEmpty
 
   if context.needFixStackNesting {
-    function.fixStackNesting(context)
+    context.fixStackNesting(in: function)
   }
 
   return changed

@@ -57,7 +57,7 @@ let stackPromotion = FunctionPass(name: "stack-promotion") {
   }
   if needFixStackNesting {
     // Make sure that all stack allocating instructions are nested correctly.
-    function.fixStackNesting(context)
+    context.fixStackNesting(in: function)
   }
 }
 

@@ -56,7 +56,7 @@ extension BuiltinInst : OnoneSimplifiable, SILCombineSimplifiable {
       case .Xor:
         simplifyNegation(context)
       default:
-        if let literal = constantFold(context) {
+        if let literal = context.constantFold(builtin: self) {
           uses.replaceAll(with: literal, context)
         }
     }
@@ -240,7 +240,7 @@ private extension BuiltinInst {
     if constantFoldStringNullPointerCheck(isEqual: isEqual, context) {
       return
     }
-    if let literal = constantFold(context) {
+    if let literal = context.constantFold(builtin: self) {
       uses.replaceAll(with: literal, context)
     }
   }

@@ -113,7 +113,7 @@ private struct StackProtectionOptimization {
       process(instruction: inst, in: function, mustFixStackNesting: &mustFixStackNesting, context)
     }
     if mustFixStackNesting {
-      function.fixStackNesting(context)
+      context.fixStackNesting(in: function)
     }
   }
 

@@ -7,9 +7,10 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 swift_compiler_sources(Optimizer
-  Context.swift
+  ContextCommon.swift
+  FunctionPassContext.swift
   ModulePassContext.swift
   Options.swift
   Passes.swift
-  PassRegistration.swift)
-
+  PassRegistration.swift
+  SimplifyContext.swift)
-Original file line number
+Diff line change
@@ Expand Up @@
         return
       }
-      context.modifyEffects(in: function) { (effects: inout FunctionEffects) in
+      function.modifyEffects(context) { (effects: inout FunctionEffects) in
         effects.escapeEffects.arguments = newEffects
       }
     }
@@ Expand Down @@