SwiftCompilerSources: bridge '@'_addressable dependencies

Author: atrick

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceInsertion.swift

@@ -130,15 +130,16 @@ extension LifetimeDependentApply {
     var info = LifetimeSourceInfo()
     let hasScopedYield = applySite.parameterOperands.contains {
       if let dep = applySite.resultDependence(on: $0) {
-        return dep == .scope
+        return dep.isScoped
       }
       return false
     }
     if hasScopedYield {
-      // for consistency, we you yieldAddress if any yielded value is an address.
+      // for consistency, we use yieldAddress if any yielded value is an address.
       let targetKind = beginApply.yieldedValues.contains(where: { $0.type.isAddress })
         ? TargetKind.yieldAddress : TargetKind.yield
-      info.sources.push(LifetimeSource(targetKind: targetKind, convention: .scope, value: beginApply.token))
+      info.sources.push(LifetimeSource(targetKind: targetKind, convention: .scope(addressable: false),
+                                       value: beginApply.token))
     }
     for operand in applySite.parameterOperands {
       guard let dep = applySite.resultDependence(on: operand) else {

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift

@@ -293,7 +293,7 @@ private extension LifetimeDependence.Scope {
       var extensions = SingleInlineArray<ScopeExtension>()
       let applySite = yieldedValue.definingInstruction as! BeginApplyInst
       for operand in applySite.parameterOperands {
-        guard let dep = applySite.resultDependence(on: operand), dep == .scope else {
+        guard let dep = applySite.resultDependence(on: operand), dep.isScoped else {
           continue
         }
         // Pass a copy of innerScopes without modifying this one.

SwiftCompilerSources/Sources/Optimizer/Utilities/LifetimeDependenceUtils.swift

@@ -905,7 +905,7 @@ extension LifetimeDependenceDefUseWalker {
       return leafUse(of: operand)
     }
     if let dep = apply.resultDependence(on: operand),
-       dep == .inherit {
+       !dep.isScoped {
       // Operand is nonescapable and passed as a call argument. If the
       // result inherits its lifetime, then consider any nonescapable
       // result value to be a dependent use.

SwiftCompilerSources/Sources/SIL/FunctionConvention.swift

@@ -237,7 +237,25 @@ extension FunctionConvention {
 
 public enum LifetimeDependenceConvention : CustomStringConvertible {
   case inherit
-  case scope
+  case scope(addressable: Bool)
+
+  public var isScoped: Bool {
+    switch self {
+    case .inherit:
+      return false
+    case .scope:
+      return true
+    }
+  }
+
+  public var isAddressable: Bool {
+    switch self {
+    case .inherit:
+      return false
+    case let .scope(addressable):
+      return addressable
+    }
+  }
 
   public var description: String {
     switch self {
@@ -294,7 +312,8 @@ extension FunctionConvention {
         return .inherit
       }
       if scope {
-        return .scope
+        let addressable = bridged.checkAddressable(bridgedIndex(parameterIndex: index))
+        return .scope(addressable: addressable)
       }
       return nil
     }

include/swift/AST/LifetimeDependence.h

@@ -300,6 +300,11 @@ class LifetimeDependenceInfo {
       && scopeLifetimeParamIndices->contains(index);
   }
 
+  bool checkAddressable(int index) const {
+    return hasAddressableParamIndices()
+      && getAddressableIndices()->contains(index);
+  }
+
   std::string getString() const;
   void Profile(llvm::FoldingSetNodeID &ID) const;
   void getConcatenatedData(SmallVectorImpl<bool> &concatenatedData) const;

include/swift/SIL/SILBridging.h

@@ -156,6 +156,7 @@ struct BridgedYieldInfoArray {
 struct BridgedLifetimeDependenceInfo {
   swift::IndexSubset *_Nullable inheritLifetimeParamIndices;
   swift::IndexSubset *_Nullable scopeLifetimeParamIndices;
+  swift::IndexSubset *_Nullable addressableParamIndices;
   SwiftUInt targetIndex;
   bool immortal;
 
@@ -164,6 +165,7 @@ struct BridgedLifetimeDependenceInfo {
   BRIDGED_INLINE bool empty() const;
   BRIDGED_INLINE bool checkInherit(SwiftInt index) const;
   BRIDGED_INLINE bool checkScope(SwiftInt index) const;
+  BRIDGED_INLINE bool checkAddressable(SwiftInt index) const;
   BRIDGED_INLINE SwiftInt getTargetIndex() const;
 
   BRIDGED_INLINE BridgedOwnedString getDebugDescription() const;

include/swift/SIL/SILBridgingImpl.h

@@ -146,6 +146,7 @@ BridgedParameterInfo BridgedParameterInfoArray::at(SwiftInt parameterIndex) cons
 BridgedLifetimeDependenceInfo::BridgedLifetimeDependenceInfo(swift::LifetimeDependenceInfo info)
     : inheritLifetimeParamIndices(info.getInheritIndices()),
       scopeLifetimeParamIndices(info.getScopeIndices()),
+      addressableParamIndices(info.getAddressableIndices()),
       targetIndex(info.getTargetIndex()), immortal(info.isImmortal()) {}
 
 SwiftInt BridgedLifetimeDependenceInfoArray::count() const {
@@ -172,6 +173,10 @@ bool BridgedLifetimeDependenceInfo::checkScope(SwiftInt index) const {
          scopeLifetimeParamIndices->contains(index);
 }
 
+bool BridgedLifetimeDependenceInfo::checkAddressable(SwiftInt index) const {
+  return addressableParamIndices && addressableParamIndices->contains(index);
+}
+
 SwiftInt BridgedLifetimeDependenceInfo::getTargetIndex() const {
   return targetIndex;
 }