[NFC] OSSACanonicalizeOwned: Renamed.

Author: nate-chandler

include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h

@@ -14,7 +14,7 @@
 /// to only the uses within the scope. To do this, it hoists forwarding
 /// operations out of the scope. This exposes many useless scopes that can be
 /// deleted, which in turn allows canonicalization of the outer owned values
-/// (via CanonicalizeOSSALifetime).
+/// (via OSSACanonicalizeOwned).
 ///
 /// This does not shrink borrow scopes; it does not rewrite end_borrows.  For
 /// that, see ShrinkBorrowScope.

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h renamed to include/swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h

@@ -1,4 +1,4 @@
-//===- CanonicalizeOSSALifetime.h - Canonicalize OSSA lifetimes -*- C++ -*-===//
+//===- OSSACanonicalizeOwned.h - Canonicalize OSSA lifetimes -*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -14,7 +14,7 @@
 ///
 /// This top-level API rewrites the extended OSSA lifetime of a SILValue:
 ///
-///     void canonicalizeValueLifetime(SILValue def, CanonicalizeOSSALifetime &)
+///     void canonicalizeValueLifetime(SILValue def, OSSACanonicalizeOwned &)
 ///
 /// The "extended lifetime" of the references defined by 'def' transitively
 /// includes the uses of 'def' itself along with the uses of any copies of
@@ -197,7 +197,7 @@ enum MaximizeLifetime_t : bool {
 ///
 /// TODO: Move all the private per-definition members into an implementation
 /// class in the .cpp file.
-class CanonicalizeOSSALifetime final {
+class OSSACanonicalizeOwned final {
 public:
   /// Find the original definition of a potentially copied value. \p copiedValue
   /// must be an owned value. It is usually a copy but may also be a destroy.
@@ -343,14 +343,14 @@ class CanonicalizeOSSALifetime final {
   struct LivenessState {
     BitfieldRef<SSAPrunedLiveness>::StackState state;
 
-    LivenessState(CanonicalizeOSSALifetime &parent, SILValue def,
+    LivenessState(OSSACanonicalizeOwned &parent, SILValue def,
                   ArrayRef<SILInstruction *> lexicalLifetimeEnds)
         : state(parent.liveness, def->getFunction()) {
       parent.initializeLiveness(def, lexicalLifetimeEnds);
     }
   };
 
-  CanonicalizeOSSALifetime(
+  OSSACanonicalizeOwned(
       PruneDebugInsts_t pruneDebugMode, MaximizeLifetime_t maximizeLifetime,
       SILFunction *function, NonLocalAccessBlockAnalysis *accessBlockAnalysis,
       DeadEndBlocksAnalysis *deadEndBlocksAnalysis, DominanceInfo *domTree,

include/swift/SILOptimizer/Utils/OwnershipOptUtils.h

@@ -48,7 +48,7 @@ inline bool requiresOSSACleanup(SILValue v) {
 ///
 /// Precondition: lifetimeBoundary is a superset of ownedValue's current
 /// lifetime (therefore, none of the safety checks done during
-/// CanonicalizeOSSALifetime are needed here).
+/// OSSACanonicalizeOwned are needed here).
 void extendOwnedLifetime(SILValue ownedValue,
                          PrunedLivenessBoundary &lifetimeBoundary,
                          InstructionDeleter &deleter);

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableAddressesChecker.cpp

@@ -163,8 +163,8 @@
 #include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
 #include "swift/SILOptimizer/Utils/SpecializationMangler.h"
 #include "llvm/ADT/PointerEmbeddedInt.h"

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableValuesChecker.cpp

@@ -33,7 +33,7 @@
 #include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 
 using namespace swift;
 
@@ -227,7 +227,7 @@ struct ConsumeOperatorCopyableValuesChecker {
   CheckerLivenessInfo livenessInfo;
   DominanceInfo *dominance;
   InstructionDeleter deleter;
-  CanonicalizeOSSALifetime canonicalizer;
+  OSSACanonicalizeOwned canonicalizer;
 
   ConsumeOperatorCopyableValuesChecker(
       SILFunction *fn, DominanceInfo *dominance,

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerTester.cpp

@@ -45,8 +45,8 @@
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/PointerIntPair.h"

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -259,8 +259,8 @@
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/PointerIntPair.h"
@@ -1472,7 +1472,7 @@ struct MoveOnlyAddressCheckerPImpl {
   /// The instruction deleter used by \p canonicalizer.
   InstructionDeleter deleter;
 
-  /// State to run CanonicalizeOSSALifetime.
+  /// State to run OSSACanonicalizeOwned.
   OSSACanonicalizer canonicalizer;
 
   /// Per mark must check address use state.

lib/SILOptimizer/Mandatory/MoveOnlyChecker.cpp

@@ -47,8 +47,8 @@
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/PointerIntPair.h"

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerTester.cpp

@@ -42,8 +42,8 @@
 #include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "swift/SILOptimizer/Utils/SILSSAUpdater.h"
 #include "clang/AST/DeclTemplate.h"
 #include "llvm/ADT/ArrayRef.h"

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerUtils.cpp

@@ -41,8 +41,8 @@
 #include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
+#include "swift/SILOptimizer/Utils/OSSACanonicalizeOwned.h"
 #include "swift/SILOptimizer/Utils/SILSSAUpdater.h"
 #include "clang/AST/DeclTemplate.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -102,7 +102,7 @@ void OSSACanonicalizer::computeBoundaryData(SILValue value) {
   // Then use that information to stash for our diagnostics the boundary
   // consuming/non-consuming users as well as enter the boundary consuming users
   // into the boundaryConsumignUserSet for quick set testing later.
-  using IsInterestingUser = CanonicalizeOSSALifetime::IsInterestingUser;
+  using IsInterestingUser = OSSACanonicalizeOwned::IsInterestingUser;
   InstructionSet boundaryConsumingUserSet(value->getFunction());
   for (auto *lastUser : originalBoundary.lastUsers) {
     LLVM_DEBUG(llvm::dbgs() << "Looking at boundary use: " << *lastUser);