Merge pull request swiftlang#21607 from gottesmm/pr-93a87b0bbeffbd8b1ff7b960dc07b6951293e534

Author: swift-ci

lib/SILOptimizer/Mandatory/PMOMemoryUseCollector.cpp

@@ -260,13 +260,12 @@ bool ElementUseCollector::collectFrom() {
     return false;
 
   // Collect information about the retain count result as well.
-  for (auto UI : TheMemory.MemoryInst->getUses()) {
-    auto *User = UI->getUser();
+  for (auto *op : TheMemory.MemoryInst->getUses()) {
+    auto *user = op->getUser();
 
-    // If this is a release or dealloc_stack, then remember it as such.
-    if (isa<StrongReleaseInst>(User) || isa<DeallocStackInst>(User) ||
-        isa<DeallocBoxInst>(User)) {
-      Releases.push_back(User);
+    // If this is a strong_release, stash it.
+    if (isa<StrongReleaseInst>(user)) {
+      Releases.push_back(user);
     }
   }
 

lib/SILOptimizer/Mandatory/PredictableMemOpt.cpp

@@ -1282,7 +1282,7 @@ bool AllocOptimize::tryToRemoveDeadAllocation() {
   if (!MemoryType.isTrivial(Module)) {
     for (auto P : llvm::enumerate(Releases)) {
       auto *R = P.value();
-      if (R == nullptr || isa<DeallocStackInst>(R) || isa<DeallocBoxInst>(R))
+      if (R == nullptr)
         continue;
 
       // We stash all of the destroy_addr that we see.