Optimizer: make the hasOwnershipOperandsOrResults utility available in OwnershipOptUtils

Author: eeckstein

include/swift/SILOptimizer/Utils/OwnershipOptUtils.h

@@ -367,6 +367,8 @@ void updateGuaranteedPhis(SILPassManager *pm, ArrayRef<SILPhiArgument *> phis);
 /// Replaces phis with the unique incoming values if all incoming values are the same.
 void replacePhisWithIncomingValues(SILPassManager *pm, ArrayRef<SILPhiArgument *> phis);
 
+bool hasOwnershipOperandsOrResults(SILInstruction *inst);
+
 } // namespace swift
 
 #endif

lib/SILOptimizer/LoopTransforms/LICM.cpp

@@ -32,6 +32,7 @@
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/OwnershipOptUtils.h"
 #include "swift/SILOptimizer/Utils/SILSSAUpdater.h"
 
 #include "llvm/ADT/DepthFirstIterator.h"
@@ -849,21 +850,6 @@ static bool analyzeBeginAccess(BeginAccessInst *BI,
   return true;
 }
 
-static bool hasOwnershipOperandsOrResults(SILInstruction *inst) {
-  if (!inst->getFunction()->hasOwnership())
-    return false;
-
-  for (SILValue result : inst->getResults()) {
-    if (result->getOwnershipKind() != OwnershipKind::None)
-      return true;
-  }
-  for (Operand &op : inst->getAllOperands()) {
-    if (op.get()->getOwnershipKind() != OwnershipKind::None)
-      return true;
-  }
-  return false;
-}
-
 // Analyzes current loop for hosting/sinking potential:
 // Computes set of instructions we may be able to move out of the loop
 // Important Note:

lib/SILOptimizer/Utils/OwnershipOptUtils.cpp

@@ -1951,3 +1951,18 @@ void swift::replacePhisWithIncomingValues(SILPassManager *pm, ArrayRef<SILPhiArg
   }
   replacePhisWithIncomingValuesFunction({pm->getSwiftPassInvocation()}, ArrayRef(bridgedPhis));
 }
+
+bool swift::hasOwnershipOperandsOrResults(SILInstruction *inst) {
+  if (!inst->getFunction()->hasOwnership())
+    return false;
+
+  for (SILValue result : inst->getResults()) {
+    if (result->getOwnershipKind() != OwnershipKind::None)
+      return true;
+  }
+  for (Operand &op : inst->getAllOperands()) {
+    if (op.get()->getOwnershipKind() != OwnershipKind::None)
+      return true;
+  }
+  return false;
+}