Merge pull request swiftlang#29075 from gottesmm/pr-d55400f45418e4362a9634920318153134a33ce7

gottesmm · web-flow · commit b980d0c73968 · 2020-01-09T10:04:19.000-08:00
[di] When emitting element addresses to destroy fields, use begin_access [deinit].
diff --git a/lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp b/lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp
@@ -212,11 +212,11 @@ SILType DIMemoryObjectInfo::getElementType(unsigned EltNo) const {
                            Module, MemorySILType, EltNo, isNonDelegatingInit());
 }
 
-/// computeTupleElementAddress - Given a tuple element number (in the flattened
-/// sense) return a pointer to a leaf element of the specified number.
-SILValue DIMemoryObjectInfo::emitElementAddress(
+/// Given a tuple element number (in the flattened sense) return a pointer to a
+/// leaf element of the specified number, so we can insert destroys for it.
+SILValue DIMemoryObjectInfo::emitElementAddressForDestroy(
     unsigned EltNo, SILLocation Loc, SILBuilder &B,
-    llvm::SmallVectorImpl<std::pair<SILValue, SILValue>> &EndBorrowList) const {
+    SmallVectorImpl<std::pair<SILValue, EndScopeKind>> &EndScopeList) const {
   SILValue Ptr = getUninitializedValue();
   bool IsSelf = isNonDelegatingInit();
   auto &Module = MemoryInst->getModule();
@@ -260,7 +260,7 @@ SILValue DIMemoryObjectInfo::emitElementAddress(
             if (isa<ClassDecl>(NTD) && Ptr->getType().isAddress()) {
               SILValue Original = Ptr;
               SILValue Borrowed = Ptr = B.createLoadBorrow(Loc, Ptr);
-              EndBorrowList.emplace_back(Borrowed, Original);
+              EndScopeList.emplace_back(Borrowed, EndScopeKind::Borrow);
             }
           }
           auto expansionContext = TypeExpansionContext(B.getFunction());
@@ -277,12 +277,13 @@ SILValue DIMemoryObjectInfo::emitElementAddress(
               if (Ptr.getOwnershipKind() != ValueOwnershipKind::Guaranteed) {
                 Original = Ptr;
                 Borrowed = Ptr = B.createBeginBorrow(Loc, Ptr);
+                EndScopeList.emplace_back(Borrowed, EndScopeKind::Borrow);
               }
               Ptr = B.createRefElementAddr(Loc, Ptr, VD);
-              if (Original) {
-                assert(Borrowed);
-                EndBorrowList.emplace_back(Borrowed, Original);
-              }
+              Ptr = B.createBeginAccess(
+                  Loc, Ptr, SILAccessKind::Deinit, SILAccessEnforcement::Static,
+                  false /*noNestedConflict*/, false /*fromBuiltin*/);
+              EndScopeList.emplace_back(Ptr, EndScopeKind::Access);
             }
 
             PointeeType = FieldType;
diff --git a/lib/SILOptimizer/Mandatory/DIMemoryUseCollector.h b/lib/SILOptimizer/Mandatory/DIMemoryUseCollector.h
@@ -212,11 +212,13 @@ class DIMemoryObjectInfo {
     return MemoryInst->isDelegatingSelfAllocated();
   }
 
+  enum class EndScopeKind { Borrow, Access };
+
   /// Given an element number (in the flattened sense) return a pointer to a
   /// leaf element of the specified number.
-  SILValue emitElementAddress(
+  SILValue emitElementAddressForDestroy(
       unsigned TupleEltNo, SILLocation Loc, SILBuilder &B,
-      SmallVectorImpl<std::pair<SILValue, SILValue>> &EndBorrowList) const;
+      SmallVectorImpl<std::pair<SILValue, EndScopeKind>> &EndScopeList) const;
 
   /// Return the swift type of the specified element.
   SILType getElementType(unsigned EltNo) const;
diff --git a/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp b/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
@@ -2303,14 +2303,26 @@ SILValue LifetimeChecker::handleConditionalInitAssign() {
       B.setInsertionPoint(TrueBB->begin());
       SILValue EltPtr;
       {
-        llvm::SmallVector<std::pair<SILValue, SILValue>, 4> EndBorrowList;
-        EltPtr = TheMemory.emitElementAddress(Elt, Loc, B, EndBorrowList);
+        using EndScopeKind = DIMemoryObjectInfo::EndScopeKind;
+        SmallVector<std::pair<SILValue, EndScopeKind>, 4> EndScopeList;
+        EltPtr =
+            TheMemory.emitElementAddressForDestroy(Elt, Loc, B, EndScopeList);
         if (auto *DA = B.emitDestroyAddrAndFold(Loc, EltPtr))
           Destroys.push_back(DA);
-        while (!EndBorrowList.empty()) {
-          SILValue Borrowed, Original;
-          std::tie(Borrowed, Original) = EndBorrowList.pop_back_val();
-          B.createEndBorrow(Loc, Borrowed, Original);
+        while (!EndScopeList.empty()) {
+          SILValue value;
+          EndScopeKind kind;
+          std::tie(value, kind) = EndScopeList.pop_back_val();
+
+          switch (kind) {
+          case EndScopeKind::Borrow:
+            B.createEndBorrow(Loc, value);
+            continue;
+          case EndScopeKind::Access:
+            B.createEndAccess(Loc, value, false /*can abort*/);
+            continue;
+          }
+          llvm_unreachable("Covered switch isn't covered!");
         }
       }
       B.setInsertionPoint(ContBB->begin());
@@ -2364,15 +2376,27 @@ handleConditionalDestroys(SILValue ControlVariableAddr) {
   // Utilities.
 
   auto destroyMemoryElement = [&](SILLocation Loc, unsigned Elt) {
-    llvm::SmallVector<std::pair<SILValue, SILValue>, 4> EndBorrowList;
+    using EndScopeKind = DIMemoryObjectInfo::EndScopeKind;
+    SmallVector<std::pair<SILValue, EndScopeKind>, 4> EndScopeList;
     SILValue EltPtr =
-        TheMemory.emitElementAddress(Elt, Loc, B, EndBorrowList);
+        TheMemory.emitElementAddressForDestroy(Elt, Loc, B, EndScopeList);
     if (auto *DA = B.emitDestroyAddrAndFold(Loc, EltPtr))
       Destroys.push_back(DA);
-    while (!EndBorrowList.empty()) {
-      SILValue Borrowed, Original;
-      std::tie(Borrowed, Original) = EndBorrowList.pop_back_val();
-      B.createEndBorrow(Loc, Borrowed, Original);
+
+    while (!EndScopeList.empty()) {
+      SILValue value;
+      EndScopeKind kind;
+      std::tie(value, kind) = EndScopeList.pop_back_val();
+
+      switch (kind) {
+      case EndScopeKind::Borrow:
+        B.createEndBorrow(Loc, value);
+        continue;
+      case EndScopeKind::Access:
+        B.createEndAccess(Loc, value, false /*can abort*/);
+        continue;
+      }
+      llvm_unreachable("Covered switch isn't covered!");
     }
   };
 
diff --git a/test/SILOptimizer/definite_init_failable_initializers_objc.swift b/test/SILOptimizer/definite_init_failable_initializers_objc.swift
@@ -49,7 +49,9 @@ class Cat : FakeNSObject {
 
   // CHECK: bb1:
     // CHECK-NEXT: [[FIELD_ADDR:%.*]] = ref_element_addr [[ARG2]] : $Cat, #Cat.x
-    // CHECK-NEXT: destroy_addr [[FIELD_ADDR]] : $*LifetimeTracked
+    // CHECK-NEXT: [[FIELD_ADDR_ACCESS:%.*]] = begin_access [deinit] [static] [[FIELD_ADDR]]
+    // CHECK-NEXT: destroy_addr [[FIELD_ADDR_ACCESS]] : $*LifetimeTracked
+    // CHECK-NEXT: end_access [[FIELD_ADDR_ACCESS]]
     // CHECK-NEXT: strong_release [[ARG2]]
     // CHECK-NEXT: [[RELOAD_FROM_BOX:%.*]] = load [[SELF_BOX]]
     // CHECK-NEXT: [[METATYPE:%.*]] = metatype $@thick Cat.Type
diff --git a/test/SILOptimizer/definite_init_markuninitialized_derivedself.sil b/test/SILOptimizer/definite_init_markuninitialized_derivedself.sil
@@ -195,7 +195,9 @@ bb0(%0 : @owned $DerivedClassWithNontrivialStoredProperties):
 // Now we destroy the stored value.
 // CHECK: [[SELF:%[0-9]+]] = load_borrow [[SELFBOX]]
 // CHECK: [[SELF_FIELD:%.*]] = ref_element_addr [[SELF]]
-// CHECK: destroy_addr [[SELF_FIELD]]
+// CHECK: [[SELF_FIELD_ACCESS:%.*]] = begin_access [deinit] [static] [[SELF_FIELD]]
+// CHECK: destroy_addr [[SELF_FIELD_ACCESS]]
+// CHECK: end_access [[SELF_FIELD_ACCESS]]
 // CHECK: end_borrow [[SELF]]
 //
 // And then perform dealloc_partial_ref.
diff --git a/test/SILOptimizer/definite_init_markuninitialized_rootself.sil b/test/SILOptimizer/definite_init_markuninitialized_rootself.sil
@@ -109,7 +109,9 @@ bb0(%0 : @owned $RootClassWithNontrivialStoredProperties):
 // CHECK: end_borrow [[BORROWED_SELF]]
 // CHECK: [[BORROWED_SELF:%.*]] = begin_borrow [[SELF]]
 // CHECK: [[SELF_FIELD:%.*]] = ref_element_addr [[BORROWED_SELF]]
-// CHECK: destroy_addr [[SELF_FIELD]]
+// CHECK: [[SELF_FIELD_ACCESS:%.*]] = begin_access [deinit] [static] [[SELF_FIELD]]
+// CHECK: destroy_addr [[SELF_FIELD_ACCESS]]
+// CHECK: end_access [[SELF_FIELD_ACCESS]]
 // CHECK: end_borrow [[BORROWED_SELF]]
 // CHECK: [[METATYPE:%[0-9]+]] = metatype $@thick RootClassWithNontrivialStoredProperties.Type
 // CHECK: dealloc_partial_ref [[SELF]] : $RootClassWithNontrivialStoredProperties, [[METATYPE]] : $@thick RootClassWithNontrivialStoredProperties.Type
diff --git a/test/SILOptimizer/di-conditional-destroy-scope.swift b/test/SILOptimizer/di-conditional-destroy-scope.swift
@@ -6,8 +6,9 @@
 // REQUIRES: objc_interop
 
 
-// CHECK: [[ADR:%.*]] = ref_element_addr %{{.*}} : $RecursibleDirectoryContentsGenerator, #RecursibleDirectoryContentsGenerator.fileSystem, loc {{.*}}:38:5, scope 2
-// CHECK:  destroy_addr [[ADR]] : $*FileSystem, loc {{.*}}:38:5, scope 2
+// CHECK: [[ADR:%.*]] = ref_element_addr %{{.*}} : $RecursibleDirectoryContentsGenerator, #RecursibleDirectoryContentsGenerator.fileSystem, loc {{.*}}:39:5, scope 2
+// CHECK: [[ADR_ACCESS:%.*]] = begin_access [deinit] [static] [[ADR]]
+// CHECK: destroy_addr [[ADR_ACCESS]] : $*FileSystem, loc {{.*}}:39:5, scope 2
 
 
 import Foundation
