Optimizer: rename GuaranteedPhiUpdater -> PhiUpdater

Because it now has the replacePhisWithIncomingValues utility, which works for all kind of phis.

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -140,5 +140,5 @@ private func registerSwiftAnalyses() {
 
 private func registerUtilities() {
   registerVerifier()
-  registerGuaranteedPhiUpdater()
+  registerPhiUpdater()
 }

SwiftCompilerSources/Sources/Optimizer/Utilities/CMakeLists.txt

@@ -9,7 +9,6 @@
 swift_compiler_sources(Optimizer
   AccessUtilsTest.swift
   AddressUtils.swift
-  GuaranteedPhiUpdater.swift
   BorrowUtils.swift
   SpecializationCloner.swift
   DiagnosticEngine.swift
@@ -22,6 +21,7 @@ swift_compiler_sources(Optimizer
   LocalVariableUtils.swift
   OptUtils.swift
   OwnershipLiveness.swift
+  PhiUpdater.swift
   SSAUpdater.swift
   StaticInitCloner.swift
   Test.swift

SwiftCompilerSources/Sources/Optimizer/Utilities/GuaranteedPhiUpdater.swift renamed to SwiftCompilerSources/Sources/Optimizer/Utilities/PhiUpdater.swift

@@ -1,4 +1,4 @@
-//===--- GuaranteedPhiUpdater.swift ---------------------------------------===//
+//===--- PhiUpdater.swift -------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -237,8 +237,8 @@ func replacePhisWithIncomingValues(phis: [Phi], _ context: some MutatingContext)
   }
 }
 
-func registerGuaranteedPhiUpdater() {
-  BridgedUtilities.registerGuaranteedPhiUpdater(
+func registerPhiUpdater() {
+  BridgedUtilities.registerPhiUpdater(
     // updateAllGuaranteedPhis
     { (bridgedCtxt: BridgedPassContext, bridgedFunction: BridgedFunction) in
       let context = FunctionPassContext(_bridged: bridgedCtxt)

include/swift/SILOptimizer/OptimizerBridging.h

@@ -134,9 +134,9 @@ struct BridgedUtilities {
   typedef void (* _Nonnull UpdatePhisFn)(BridgedPassContext, BridgedArrayRef);
 
   static void registerVerifier(VerifyFunctionFn verifyFunctionFn);
-  static void registerGuaranteedPhiUpdater(UpdateFunctionFn updateBorrowedFromFn,
-                                           UpdatePhisFn updateBorrowedFromPhisFn,
-                                           UpdatePhisFn replacePhisWithIncomingValuesFn);
+  static void registerPhiUpdater(UpdateFunctionFn updateBorrowedFromFn,
+                                 UpdatePhisFn updateBorrowedFromPhisFn,
+                                 UpdatePhisFn replacePhisWithIncomingValuesFn);
 };
 
 struct BridgedBasicBlockSet {

lib/SILOptimizer/Utils/OwnershipOptUtils.cpp

@@ -1917,9 +1917,9 @@ static BridgedUtilities::UpdateFunctionFn updateAllGuaranteedPhisFunction;
 static BridgedUtilities::UpdatePhisFn updateGuaranteedPhisFunction;
 static BridgedUtilities::UpdatePhisFn replacePhisWithIncomingValuesFunction;
 
-void BridgedUtilities::registerGuaranteedPhiUpdater(UpdateFunctionFn updateAllGuaranteedPhisFn,
-                                                    UpdatePhisFn updateGuaranteedPhisFn,
-                                                    UpdatePhisFn replacePhisWithIncomingValuesFn) {
+void BridgedUtilities::registerPhiUpdater(UpdateFunctionFn updateAllGuaranteedPhisFn,
+                                          UpdatePhisFn updateGuaranteedPhisFn,
+                                          UpdatePhisFn replacePhisWithIncomingValuesFn) {
   updateAllGuaranteedPhisFunction = updateAllGuaranteedPhisFn;
   updateGuaranteedPhisFunction = updateGuaranteedPhisFn;
   replacePhisWithIncomingValuesFunction = replacePhisWithIncomingValuesFn;