Merge pull request #14069 from dcci/lifetime-di

Author: swift-ci

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -2436,6 +2436,7 @@ handleConditionalDestroys(SILValue ControlVariableAddr) {
     auto &Availability = CDElt.Availability;
 
     B.setInsertionPoint(Release);
+    B.setCurrentDebugScope(Release->getDebugScope());
 
     // Value types and root classes don't require any fancy handling.
     // Just conditionally destroy each memory element, and for classes,
@@ -2507,10 +2508,12 @@ handleConditionalDestroys(SILValue ControlVariableAddr) {
 
         // If true, self.init or super.init was called and self was consumed.
         B.setInsertionPoint(ConsumedBlock->begin());
+        B.setCurrentDebugScope(ConsumedBlock->begin()->getDebugScope());
         processUninitializedRelease(Release, true, B.getInsertionPoint());
 
         // If false, self is uninitialized and must be freed.
         B.setInsertionPoint(DeallocBlock->begin());
+        B.setCurrentDebugScope(DeallocBlock->begin()->getDebugScope());
         destroyMemoryElements(Loc, Availability);
         processUninitializedRelease(Release, false, B.getInsertionPoint());
 
@@ -2541,11 +2544,13 @@ handleConditionalDestroys(SILValue ControlVariableAddr) {
 
         // If true, self was consumed or is fully initialized.
         B.setInsertionPoint(LiveBlock->begin());
+        B.setCurrentDebugScope(LiveBlock->begin()->getDebugScope());
         emitReleaseOfSelfWhenNotConsumed(Loc, Release);
         isDeadRelease = false;
 
         // If false, self is uninitialized and must be freed.
         B.setInsertionPoint(DeallocBlock->begin());
+        B.setCurrentDebugScope(DeallocBlock->begin()->getDebugScope());
         destroyMemoryElements(Loc, Availability);
         processUninitializedRelease(Release, false, B.getInsertionPoint());
 

test/SILOptimizer/di-conditional-destroy-scope.swift

@@ -0,0 +1,39 @@
+// RUN: %target-swift-frontend -emit-sil %s -Onone -Xllvm \
+// RUN:   -sil-print-after=definite-init -Xllvm \
+// RUN:   -sil-print-only-functions=$S2fs36RecursibleDirectoryContentsGeneratorC4path10fileSystemAcA12AbsolutePathV_AA04FileH0_ptKc33_F8B132991B28208F48606E87DC165393Llfc \
+// RUN:   -Xllvm -sil-print-debuginfo -o /dev/null 2>&1 | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+
+// CHECK: %49 = ref_element_addr %48 : $RecursibleDirectoryContentsGenerator, #RecursibleDirectoryContentsGenerator.fileSystem, loc {{.*}}:38:5, scope 2
+// CHECK:  destroy_addr %49 : $*FileSystem, loc {{.*}}:38:5, scope 2
+
+
+import Foundation
+
+public struct AbsolutePath {
+    public init(_ absStr: String) {}
+}
+
+public protocol FileSystem: class {
+    func getDirectoryContents(_ path: AbsolutePath) throws -> [String]
+}
+public extension FileSystem {
+}
+
+public var currentWorkingDirectory: AbsolutePath {
+    let cwdStr = FileManager.default.currentDirectoryPath
+    return AbsolutePath(cwdStr)
+}
+public class RecursibleDirectoryContentsGenerator {
+    private var current: (path: AbsolutePath, iterator: IndexingIterator<[String]>)
+    private let fileSystem: FileSystem
+    fileprivate init(
+        path: AbsolutePath,
+        fileSystem: FileSystem
+    ) throws {
+        self.fileSystem = fileSystem
+        current = (path, try fileSystem.getDirectoryContents(path).makeIterator())
+    }
+}