Merge pull request #5417 from gottesmm/ownership_model_eliminator_support_for_copyvalue_destroyvalue

Author: swift-ci

lib/SILOptimizer/Transforms/OwnershipModelEliminator.cpp

@@ -41,10 +41,17 @@ struct OwnershipModelEliminatorVisitor
   SILBuilder &B;
 
   OwnershipModelEliminatorVisitor(SILBuilder &B) : B(B) {}
+  void beforeVisit(ValueBase *V) {
+    auto *I = cast<SILInstruction>(V);
+    B.setInsertionPoint(I);
+    B.setCurrentDebugScope(I->getDebugScope());
+  }
 
   bool visitValueBase(ValueBase *V) { return false; }
   bool visitLoadInst(LoadInst *LI);
   bool visitStoreInst(StoreInst *SI);
+  bool visitCopyValueInst(CopyValueInst *CVI);
+  bool visitDestroyValueInst(DestroyValueInst *DVI);
   bool visitLoadBorrowInst(LoadBorrowInst *LBI);
   bool visitEndBorrowInst(EndBorrowInst *EBI) {
     EBI->eraseFromParent();
@@ -64,8 +71,6 @@ bool OwnershipModelEliminatorVisitor::visitLoadInst(LoadInst *LI) {
 
   // Otherwise, we need to break down the load inst into its unqualified
   // components.
-  B.setInsertionPoint(LI);
-  B.setCurrentDebugScope(LI->getDebugScope());
   auto *UnqualifiedLoad = B.createLoad(LI->getLoc(), LI->getOperand());
 
   // If we have a copy, insert a retain_value. All other copies do not require
@@ -91,9 +96,6 @@ bool OwnershipModelEliminatorVisitor::visitStoreInst(StoreInst *SI) {
     return false;
 
   // Otherwise, we need to break down the store.
-  B.setInsertionPoint(SI);
-  B.setCurrentDebugScope(SI->getDebugScope());
-
   if (Qualifier != StoreOwnershipQualifier::Assign) {
     // If the ownership qualifier is not an assign, we can just emit an
     // unqualified store.
@@ -118,8 +120,6 @@ bool OwnershipModelEliminatorVisitor::visitStoreInst(StoreInst *SI) {
 bool
 OwnershipModelEliminatorVisitor::visitLoadBorrowInst(LoadBorrowInst *LBI) {
   // Break down the load borrow into an unqualified load.
-  B.setInsertionPoint(LBI);
-  B.setCurrentDebugScope(LBI->getDebugScope());
   auto *UnqualifiedLoad = B.createLoad(LBI->getLoc(), LBI->getOperand());
 
   // Then remove the qualified load and use the unqualified load as the def of
@@ -129,6 +129,19 @@ OwnershipModelEliminatorVisitor::visitLoadBorrowInst(LoadBorrowInst *LBI) {
   return true;
 }
 
+bool OwnershipModelEliminatorVisitor::visitCopyValueInst(CopyValueInst *CVI) {
+  B.createRetainValue(CVI->getLoc(), CVI->getOperand(), Atomicity::Atomic);
+  CVI->replaceAllUsesWith(CVI->getOperand());
+  CVI->eraseFromParent();
+  return true;
+}
+
+bool OwnershipModelEliminatorVisitor::visitDestroyValueInst(DestroyValueInst *DVI) {
+  B.createReleaseValue(DVI->getLoc(), DVI->getOperand(), Atomicity::Atomic);
+  DVI->eraseFromParent();
+  return true;
+}
+
 //===----------------------------------------------------------------------===//
 //                           Top Level Entry Point
 //===----------------------------------------------------------------------===//

test/SILOptimizer/ownership_model_eliminator.sil

@@ -63,3 +63,15 @@ bb0(%0 : $*Builtin.NativeObject):
   %3 = tuple()
   return %3 : $()
 }
+
+// CHECK-LABEL: sil @copy_value_destroy_value : $@convention(thin) (@owned Builtin.NativeObject) -> @owned Builtin.NativeObject {
+// CHECK: bb0([[ARG1:%.*]] : $Builtin.NativeObject):
+// CHECK: retain_value [[ARG1]]
+// CHECK: release_value [[ARG1]]
+// CHECK: return [[ARG1]]
+sil @copy_value_destroy_value : $@convention(thin) (@owned Builtin.NativeObject) -> @owned Builtin.NativeObject {
+bb0(%0 : $Builtin.NativeObject):
+  %1 = copy_value %0 : $Builtin.NativeObject
+  destroy_value %0 : $Builtin.NativeObject
+  return %1 : $Builtin.NativeObject
+}