[CanonGuaranteedValue] Don't insert fwd destroy.

nate-chandler · nate-chandler · commit ea10281db6ef · 2023-05-04T20:12:16.000-07:00
When rewriting forwards, don't fix the lifetime which results in
spurious lifetime ends.
diff --git a/lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp b/lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp
@@ -601,7 +601,7 @@ class RewriteOuterBorrowUses {
     }
     // If it's not already dead, update this operand bypassing any copies.
     SILValue innerValue = use->get();
-    if (scope.getDeleter().deleteIfDead(user)) {
+    if (scope.getDeleter().deleteIfDead(user, /*fixLifetime=*/false)) {
       LLVM_DEBUG(llvm::dbgs() << "  Deleted " << *user);
     } else {
       use->set(scope.findDefInBorrowScope(use->get()));

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ class RewriteOuterBorrowUses {`
`601`	`601`	`}`
`602`	`602`	`// If it's not already dead, update this operand bypassing any copies.`
`603`	`603`	`SILValue innerValue = use->get();`
`604`		`- if (scope.getDeleter().deleteIfDead(user)) {`
	`604`	`+ if (scope.getDeleter().deleteIfDead(user, /fixLifetime=/false)) {`
`605`	`605`	`LLVM_DEBUG(llvm::dbgs() << " Deleted " << *user);`
`606`	`606`	`} else {`
`607`	`607`	`use->set(scope.findDefInBorrowScope(use->get()));`