Rename PrunedLiveness.clear() to invalidate()

Because SILBitfield cannot be cleared.

Author: atrick

include/swift/SIL/PrunedLiveness.h

@@ -488,8 +488,8 @@ class PrunedLiveness {
     return liveBlocks.empty();
   }
 
-  void clear() {
-    liveBlocks.clear();
+  void invalidate() {
+    liveBlocks.invalidate();
     users.clear();
   }
 
@@ -752,10 +752,10 @@ class SSAPrunedLiveness : public PrunedLiveRange<SSAPrunedLiveness> {
 
   SILValue getDef() const { return def; }
 
-  void clear() {
+  void invalidate() {
     def = SILValue();
     defInst = nullptr;
-    PrunedLiveRange::clear();
+    PrunedLiveRange::invalidate();
   }
 
   void initializeDef(SILValue def) {
@@ -820,8 +820,10 @@ class MultiDefPrunedLiveness : public PrunedLiveRange<MultiDefPrunedLiveness> {
       : PrunedLiveRange(function, discoveredBlocks), defs(function),
         defBlocks(function) {}
 
-  void clear() {
-    llvm_unreachable("multi-def liveness cannot be reused");
+  void invalidate() {
+    defs.invalidate();
+    defBlocks.invalidate();
+    PrunedLiveRange::invalidate();
   }
 
   void initializeDef(SILInstruction *defInst) {
@@ -895,8 +897,8 @@ class DiagnosticPrunedLiveness : public SSAPrunedLiveness {
       : SSAPrunedLiveness(function, discoveredBlocks),
         nonLifetimeEndingUsesInLiveOut(nonLifetimeEndingUsesInLiveOut) {}
 
-  void clear() {
-    SSAPrunedLiveness::clear();
+  void invalidate() {
+    SSAPrunedLiveness::invalidate();
     if (nonLifetimeEndingUsesInLiveOut)
       nonLifetimeEndingUsesInLiveOut->clear();
   }

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

@@ -302,10 +302,10 @@ class CanonicalizeOSSALifetime final {
     liveness.initializeDef(def);
   }
 
-  void clearLiveness() {
+  void invalidateLiveness() {
     consumingBlocks.clear();
     debugValues.clear();
-    liveness.clear();
+    liveness.invalidate();
     discoveredBlocks.clear();
   }
 

include/swift/SILOptimizer/Utils/OwnershipOptUtils.h

@@ -115,9 +115,9 @@ class GuaranteedOwnershipExtension {
     : deleter(deleter), deBlocks(deBlocks),
       guaranteedLiveness(function), ownedLifetime(function) {}
 
-  void clear() {
-    guaranteedLiveness.clear();
-    ownedLifetime.clear();
+  void invalidate() {
+    guaranteedLiveness.invalidate();
+    ownedLifetime.invalidate();
     ownedConsumeBlocks.clear();
     beginBorrow = nullptr;
   }

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableValuesChecker.cpp

@@ -78,7 +78,7 @@ struct CheckerLivenessInfo {
 
   void clear() {
     defUseWorklist.clear();
-    liveness.clear();
+    liveness.invalidate();
     consumingUse.clear();
     interiorPointerTransitiveUses.clear();
     nonLifetimeEndingUsesInLiveOut.clear();

lib/SILOptimizer/Mandatory/DiagnoseLifetimeIssues.cpp

@@ -326,7 +326,7 @@ static bool isOutOfLifetime(SILInstruction *inst, SSAPrunedLiveness &liveness) {
 /// Reports a warning if the stored object \p storedObj is never loaded within
 /// the lifetime of the stored object.
 void DiagnoseLifetimeIssues::reportDeadStore(SILInstruction *allocationInst) {
-  liveness.clear();
+  liveness.invalidate();
   weakStores.clear();
 
   SILValue storedDef = cast<SingleValueInstruction>(allocationInst);

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1292,7 +1292,7 @@ struct GatherUsesVisitor : public AccessUseVisitor {
 
   /// Returns true if we emitted an error.
   bool checkForExclusivityHazards(LoadInst *li) {
-    SWIFT_DEFER { liveness.clear(); };
+    SWIFT_DEFER { liveness.invalidate(); };
 
     LLVM_DEBUG(llvm::dbgs() << "Checking for exclusivity hazards for: " << *li);
 

lib/SILOptimizer/Mandatory/MoveOnlyBorrowToDestructureUtils.cpp

@@ -1516,7 +1516,7 @@ void Implementation::cleanup() {
       if (result->getType().isTrivial(*fn))
         continue;
       SWIFT_DEFER {
-        liveness.clear();
+        liveness.invalidate();
         discoveredBlocks.clear();
         boundary.clear();
       };
@@ -1534,7 +1534,7 @@ void Implementation::cleanup() {
       continue;
 
     SWIFT_DEFER {
-      liveness.clear();
+      liveness.invalidate();
       discoveredBlocks.clear();
       boundary.clear();
     };
@@ -1888,7 +1888,7 @@ bool BorrowToDestructureTransform::transform() {
             // If we have a copyable type, we need to insert compensating
             // destroys.
             SWIFT_DEFER {
-              liveness.clear();
+              liveness.invalidate();
               discoveredBlocks.clear();
               boundary.clear();
             };

lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp

@@ -822,7 +822,7 @@ bool CanonicalizeBorrowScope::canonicalizeFunctionArgument(
 
   LLVM_DEBUG(llvm::dbgs() << "*** Canonicalize Borrow: " << borrowedValue);
 
-  SWIFT_DEFER { liveness.clear(); };
+  SWIFT_DEFER { liveness.invalidate(); };
 
   RewriteInnerBorrowUses innerRewriter(*this);
   beginVisitBorrowScopeUses(); // reset the def/use worklist
@@ -841,7 +841,7 @@ canonicalizeBorrowScope(BorrowedValue borrowedValue) {
 
   initBorrow(borrowedValue);
 
-  SWIFT_DEFER { liveness.clear(); };
+  SWIFT_DEFER { liveness.invalidate(); };
 
   if (!computeBorrowLiveness())
     return false;

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

@@ -1017,7 +1017,7 @@ bool CanonicalizeOSSALifetime::computeLiveness(SILValue def) {
   // Step 1: compute liveness
   if (!computeCanonicalLiveness()) {
     LLVM_DEBUG(llvm::errs() << "Failed to compute canonical liveness?!\n");
-    clearLiveness();
+    invalidateLiveness();
     return false;
   }
   if (accessBlockAnalysis) {
@@ -1051,7 +1051,7 @@ void CanonicalizeOSSALifetime::rewriteLifetimes() {
   // Step 6: rewrite copies and delete extra destroys
   rewriteCopies();
 
-  clearLiveness();
+  invalidateLiveness();
   consumes.clear();
 }