CanonicalizeOSSALifetime: Distinguish destroys of the current def

jckarter · jckarter · commit 8753d4847acb · 2023-02-17T09:57:35.000-08:00
diff --git a/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp b/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp
@@ -903,7 +903,7 @@ void CanonicalizeOSSALifetime::rewriteCopies() {
       defUseWorklist.insert(copy);
       return true;
     }
-    if (auto *destroy = dyn_cast<DestroyValueInst>(user)) {
+    if (auto *destroy = dynCastToDestroyOf(user, getCurrentDef())) {
       // If this destroy was marked as a final destroy, ignore it; otherwise,
       // delete it.
       if (!consumes.claimConsume(destroy)) {

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ void CanonicalizeOSSALifetime::rewriteCopies() {`
`903`	`903`	`defUseWorklist.insert(copy);`
`904`	`904`	`return true;`
`905`	`905`	`}`
`906`		`- if (auto *destroy = dyn_cast<DestroyValueInst>(user)) {`
	`906`	`+ if (auto *destroy = dynCastToDestroyOf(user, getCurrentDef())) {`
`907`	`907`	`// If this destroy was marked as a final destroy, ignore it; otherwise,`
`908`	`908`	`// delete it.`
`909`	`909`	`if (!consumes.claimConsume(destroy)) {`