[sil] Move swift::replaceAllUsesAndErase from Analysis/SimplifyInstruction -> Utils/InstOptUtils

This is a low level API already being used in multiple places besides
InstSimplify (e.x.: Utils/OwnershipOptUtils), so it makes sense to move it into
InstOptUtil.

Author: gottesmm

include/swift/SILOptimizer/Analysis/SimplifyInstruction.h

@@ -52,14 +52,7 @@ replaceAllSimplifiedUsesAndErase(SILInstruction *I, SILValue result,
                                  InstModCallbacks &callbacks,
                                  DeadEndBlocks *deadEndBlocks = nullptr);
 
-/// This is a low level routine that makes all uses of \p svi uses of \p
-/// newValue (ignoring end scope markers) and then deletes \p svi and all end
-/// scope markers. Then returns the next inst to process.
-SILBasicBlock::iterator replaceAllUsesAndErase(SingleValueInstruction *svi,
-                                               SILValue newValue,
-                                               InstModCallbacks &callbacks);
-
-/// Simplify invocations of builtin operations that may overflow.
+// Simplify invocations of builtin operations that may overflow.
 /// All such operations return a tuple (result, overflow_flag).
 /// This function try to simplify such operations, but returns only a
 /// simplified first element of a tuple. The overflow flag is not returned

include/swift/SILOptimizer/Utils/InstOptUtils.h

@@ -666,6 +666,13 @@ FullApplySite cloneFullApplySiteReplacingCallee(FullApplySite applySite,
                                                 SILValue newCallee,
                                                 SILBuilderContext &builderCtx);
 
+/// This is a low level routine that makes all uses of \p svi uses of \p
+/// newValue (ignoring end scope markers) and then deletes \p svi and all end
+/// scope markers. Then returns the next inst to process.
+SILBasicBlock::iterator replaceAllUsesAndErase(SingleValueInstruction *svi,
+                                               SILValue newValue,
+                                               InstModCallbacks &callbacks);
+
 } // end namespace swift
 
 #endif

lib/SILOptimizer/Analysis/SimplifyInstruction.cpp

@@ -735,31 +735,6 @@ case BuiltinValueKind::id:
 //                           Top Level Entrypoints
 //===----------------------------------------------------------------------===//
 
-SILBasicBlock::iterator
-swift::replaceAllUsesAndErase(SingleValueInstruction *svi, SILValue newValue,
-                              InstModCallbacks &callbacks) {
-  assert(svi != newValue && "Cannot RAUW a value with itself");
-  SILBasicBlock::iterator nextii = std::next(svi->getIterator());
-
-  // Only SingleValueInstructions are currently simplified.
-  while (!svi->use_empty()) {
-    Operand *use = *svi->use_begin();
-    SILInstruction *user = use->getUser();
-    // Erase the end of scope marker.
-    if (isEndOfScopeMarker(user)) {
-      if (&*nextii == user)
-        ++nextii;
-      callbacks.deleteInst(user);
-      continue;
-    }
-    callbacks.setUseValue(use, newValue);
-  }
-
-  callbacks.deleteInst(svi);
-
-  return nextii;
-}
-
 /// Replace an instruction with a simplified result, including any debug uses,
 /// and erase the instruction. If the instruction initiates a scope, do not
 /// replace the end of its scope; it will be deleted along with its parent.

lib/SILOptimizer/Utils/InstOptUtils.cpp

@@ -1884,3 +1884,28 @@ swift::cloneFullApplySiteReplacingCallee(FullApplySite applySite,
   }
   llvm_unreachable("Unhandled case?!");
 }
+
+SILBasicBlock::iterator
+swift::replaceAllUsesAndErase(SingleValueInstruction *svi, SILValue newValue,
+                              InstModCallbacks &callbacks) {
+  assert(svi != newValue && "Cannot RAUW a value with itself");
+  SILBasicBlock::iterator nextii = std::next(svi->getIterator());
+
+  // Only SingleValueInstructions are currently simplified.
+  while (!svi->use_empty()) {
+    Operand *use = *svi->use_begin();
+    SILInstruction *user = use->getUser();
+    // Erase the end of scope marker.
+    if (isEndOfScopeMarker(user)) {
+      if (&*nextii == user)
+        ++nextii;
+      callbacks.deleteInst(user);
+      continue;
+    }
+    callbacks.setUseValue(use, newValue);
+  }
+
+  callbacks.deleteInst(svi);
+
+  return nextii;
+}