Enable ArrayPropertyOpt on OSSA

Author: meg-gupta

lib/SIL/Utils/BasicBlockUtils.cpp

@@ -197,7 +197,8 @@ void swift::getEdgeArgs(TermInst *T, unsigned edgeIdx, SILBasicBlock *newEdgeBB,
     if (!succBB->getNumArguments())
       return;
     args.push_back(newEdgeBB->createPhiArgument(
-        succBB->getArgument(0)->getType(), OwnershipKind::Owned));
+        succBB->getArgument(0)->getType(),
+        succBB->getArgument(0)->getOwnershipKind()));
     return;
   }
   case SILInstructionKind::CheckedCastAddrBranchInst: {
@@ -206,7 +207,8 @@ void swift::getEdgeArgs(TermInst *T, unsigned edgeIdx, SILBasicBlock *newEdgeBB,
     if (!succBB->getNumArguments())
       return;
     args.push_back(newEdgeBB->createPhiArgument(
-        succBB->getArgument(0)->getType(), OwnershipKind::Owned));
+        succBB->getArgument(0)->getType(),
+        succBB->getArgument(0)->getOwnershipKind()));
     return;
   }
   case SILInstructionKind::CheckedCastValueBranchInst: {
@@ -215,7 +217,8 @@ void swift::getEdgeArgs(TermInst *T, unsigned edgeIdx, SILBasicBlock *newEdgeBB,
     if (!succBB->getNumArguments())
       return;
     args.push_back(newEdgeBB->createPhiArgument(
-        succBB->getArgument(0)->getType(), OwnershipKind::Owned));
+        succBB->getArgument(0)->getType(),
+        succBB->getArgument(0)->getOwnershipKind()));
     return;
   }
 
@@ -225,7 +228,8 @@ void swift::getEdgeArgs(TermInst *T, unsigned edgeIdx, SILBasicBlock *newEdgeBB,
     if (!succBB->getNumArguments())
       return;
     args.push_back(newEdgeBB->createPhiArgument(
-        succBB->getArgument(0)->getType(), OwnershipKind::Owned));
+        succBB->getArgument(0)->getType(),
+        succBB->getArgument(0)->getOwnershipKind()));
     return;
   }
 

lib/SILOptimizer/LoopTransforms/ArrayPropertyOpt.cpp

@@ -223,7 +223,7 @@ class ArrayPropertiesAnalysis {
   /// Strip the struct load and the address projection to the location
   /// holding the array struct.
   SILValue stripArrayStructLoad(SILValue V) {
-    if (auto LI = dyn_cast<LoadInst>(V)) {
+    if (auto LI = dyn_cast<LoadInst>(lookThroughCopyValueInsts(V))) {
       auto Val = LI->getOperand();
       // We could have two arrays in a surrounding container so we can only
       // strip off the 'array struct' project.
@@ -752,10 +752,6 @@ class SwiftArrayPropertyOptPass : public SILFunctionTransform {
   void run() override {
     auto *Fn = getFunction();
 
-    // FIXME: Add support for ownership.
-    if (Fn->hasOwnership())
-      return;
-
     // Don't hoist array property calls at Osize.
     if (Fn->optimizeForSize())
       return;
@@ -789,7 +785,6 @@ class SwiftArrayPropertyOptPass : public SILFunctionTransform {
 
     // Specialize the identified loop nest based on the 'array.props' calls.
     if (HasChanged) {
-      LLVM_DEBUG(getFunction()->viewCFG());
       DominanceInfo *DT = DA->get(getFunction());
 
       // Process specialized loop-nests in loop-tree post-order (bottom-up).
@@ -802,8 +797,6 @@ class SwiftArrayPropertyOptPass : public SILFunctionTransform {
       // Verify that no illegal critical edges were created.
       getFunction()->verifyCriticalEdges();
 
-      LLVM_DEBUG(getFunction()->viewCFG());
-
       // We preserve the dominator tree. Let's invalidate everything
       // else.
       DA->lockInvalidation();