[CanonicalizeOSSALifetime] Renamed file.

Matched to the name of the utility.

Author: nate-chandler

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

@@ -1,4 +1,4 @@
-//===--- CanonicalOSSALifetime.h - Canonicalize OSSA lifetimes --*- C++ -*-===//
+//===- CanonicalizeOSSALifetime.h - Canonicalize OSSA lifetimes -*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILOptimizer/Mandatory/MoveKillsCopyableAddressesChecker.cpp

@@ -161,7 +161,7 @@
 #include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
 #include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
 #include "swift/SILOptimizer/Utils/SpecializationMangler.h"

lib/SILOptimizer/Mandatory/MoveKillsCopyableValuesChecker.cpp

@@ -30,7 +30,7 @@
 #include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 
 using namespace swift;
 

lib/SILOptimizer/Mandatory/MoveOnlyAddressChecker.cpp

@@ -141,7 +141,7 @@
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PointerIntPair.h"

lib/SILOptimizer/Mandatory/MoveOnlyObjectChecker.cpp

@@ -31,7 +31,7 @@
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/PointerUnion.h"

lib/SILOptimizer/Mandatory/MoveOnlyWrappedTypeEliminator.cpp

@@ -39,7 +39,7 @@
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 
 using namespace swift;
 

lib/SILOptimizer/SILCombiner/SILCombine.cpp

@@ -33,9 +33,9 @@
 #include "swift/SILOptimizer/Analysis/SimplifyInstruction.h"
 #include "swift/SILOptimizer/PassManager/PassManager.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h"
 #include "swift/SILOptimizer/Utils/CanonicalizeInstruction.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/DebugOptUtils.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
 #include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"

lib/SILOptimizer/Transforms/CopyPropagation.cpp

@@ -46,8 +46,8 @@
 #include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
 #include "llvm/ADT/SetVector.h"
 
@@ -306,7 +306,7 @@ static void findPreheadersOnControlEquivalentPath(
 /// Sink \p ownedForward to its uses.
 ///
 /// Owned forwarding instructions are identified by
-/// CanonicalOSSALifetime::isRewritableOSSAForward().
+/// CanonicalizeOSSALifetime::isRewritableOSSAForward().
 ///
 /// Assumes that the uses of ownedForward jointly postdominate it (valid OSSA).
 ///

lib/SILOptimizer/Utils/CMakeLists.txt

@@ -2,7 +2,7 @@ target_sources(swiftSILOptimizer PRIVATE
   BasicBlockOptUtils.cpp
   CFGOptUtils.cpp
   CanonicalizeInstruction.cpp
-  CanonicalOSSALifetime.cpp
+  CanonicalizeOSSALifetime.cpp
   CanonicalizeBorrowScope.cpp
   CastOptimizer.cpp
   CheckedCastBrJumpThreading.cpp

lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp

@@ -27,7 +27,7 @@
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/OwnershipUtils.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/DebugOptUtils.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
 #include "swift/SILOptimizer/Utils/ValueLifetime.h"

lib/SILOptimizer/Utils/CanonicalOSSALifetime.cpp renamed to lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

@@ -1,4 +1,4 @@
-//===--- CanonicalOSSALifetime.cpp - Canonicalize OSSA value lifetimes ----===//
+//===-- CanonicalizeOSSALifetime.cpp - Canonicalize OSSA value lifetimes --===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -29,7 +29,7 @@
 /// 4. Rewrite `def`s original copies and destroys, inserting new copies where
 ///    needed. Deletes original copies and destroys and inserts new copies.
 ///
-/// See CanonicalOSSALifetime.h for examples.
+/// See CanonicalizeOSSALifetime.h for examples.
 ///
 /// TODO: Canonicalization currently bails out if any uses of the def has
 /// OperandOwnership::PointerEscape. Once project_box is protected by a borrow
@@ -56,7 +56,7 @@
 
 #define DEBUG_TYPE "copy-propagation"
 
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/NodeDatastructures.h"
 #include "swift/SIL/OwnershipUtils.h"

lib/SILOptimizer/Utils/LexicalDestroyFolding.cpp

@@ -9,9 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-/// After ShrinkBorrowScope and CanonicalOSSALifetime both run, when a final use
-/// of the extended simple lifetime of a begin_borrow [lexical] is as an owned
-/// argument, we will have the following pattern:
+/// After ShrinkBorrowScope and CanonicalizeOSSALifetime both run, when a final
+/// use of the extended simple lifetime of a begin_borrow [lexical] is as an
+/// owned argument, we will have the following pattern:
 ///
 /// %result = apply %fn(..., %copy, ...) : $... (..., @owned Ty, ...)
 /// end_borrow %lifetime : $Ty
@@ -86,8 +86,8 @@
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILNode.h"
 #include "swift/SILOptimizer/Analysis/Reachability.h"
-#include "swift/SILOptimizer/Utils/CanonicalOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h"
+#include "swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
 #include "swift/SILOptimizer/Utils/SILSSAUpdater.h"
 #include "llvm/ADT/SmallVector.h"
@@ -685,9 +685,9 @@ DestroyValueInst *
 FindCandidates::findNextBorroweeDestroy(SILInstruction *from) const {
   for (auto *inst = from; inst; inst = inst->getNextInstruction()) {
     if (!CanonicalizeOSSALifetime::ignoredByDestroyHoisting(inst->getKind())) {
-      // This is not an instruction that CanonicalOSSALifetime would not hoist a
-      // destroy above.  In other words, CanonicalOSSALifetime would have
-      // hoisted
+      // This is not an instruction that CanonicalizeOSSALifetime would not
+      // hoist a destroy above.  In other words, CanonicalizeOSSALifetime would
+      // have hoisted
       //     destroy_value %borrowee
       // over this instruction if it could have.  Stop looking.
       return nullptr;

lib/SILOptimizer/Utils/ShrinkBorrowScope.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 /// Shrink borrow scopes by hoisting end_borrows up to deinit barriers.  After
-/// this is done, CanonicalOSSALifetime is free to hoist the destroys of the
+/// this is done, CanonicalizeOSSALifetime is free to hoist the destroys of the
 /// owned value up to the end_borrow.  In this way, the lexical lifetime of
 /// guaranteed values is preserved.
 //===----------------------------------------------------------------------===//