Surface addressableForDeps in SILType and FunctionConventions

With this approach, you cannot tell whether a parameter is addressable only
from the function type. Instead you need the SILValue that will be passed to the
call site.

Author: atrick

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceInsertion.swift

@@ -138,7 +138,8 @@ extension LifetimeDependentApply {
       // 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(addressable: false),
+      info.sources.push(LifetimeSource(targetKind: targetKind,
+                                       convention: .scope(addressable: false, addressableForDeps: false),
                                        value: beginApply.token))
     }
     for operand in applySite.parameterOperands {
@@ -218,7 +219,7 @@ private extension LifetimeDependentApply.LifetimeSourceInfo {
       bases.append(source.value)
     case .result, .inParameter, .inoutParameter:
       // addressable dependencies directly depend on the incoming address.
-      if context.options.enableAddressDependencies() && source.convention.isAddressable {
+      if context.options.enableAddressDependencies() && source.convention.isAddressable(for: source.value) {
         bases.append(source.value)
         return
       }

SwiftCompilerSources/Sources/SIL/FunctionConvention.swift

@@ -237,7 +237,7 @@ extension FunctionConvention {
 
 public enum LifetimeDependenceConvention : CustomStringConvertible {
   case inherit
-  case scope(addressable: Bool)
+  case scope(addressable: Bool, addressableForDeps: Bool)
 
   public var isScoped: Bool {
     switch self {
@@ -248,12 +248,12 @@ public enum LifetimeDependenceConvention : CustomStringConvertible {
     }
   }
 
-  public var isAddressable: Bool {
+  public func isAddressable(for value: Value) -> Bool {
     switch self {
     case .inherit:
       return false
-    case let .scope(addressable):
-      return addressable
+    case let .scope(addressable, addressableForDeps):
+      return addressable || (addressableForDeps && value.type.isAddressableForDeps(in: value.parentFunction))
     }
   }
 
@@ -313,8 +313,8 @@ extension FunctionConvention {
       }
       if scope {
         let addressable = bridged.checkAddressable(bridgedIndex(parameterIndex: index))
-          || bridged.checkConditionallyAddressable(bridgedIndex(parameterIndex: index))
-        return .scope(addressable: addressable)
+        let addressableForDeps = bridged.checkConditionallyAddressable(bridgedIndex(parameterIndex: index))
+        return .scope(addressable: addressable, addressableForDeps: addressableForDeps)
       }
       return nil
     }

include/swift/SIL/SILBridgingImpl.h

@@ -393,7 +393,7 @@ bool BridgedType::isMarkedAsImmortal() const {
 }
 
 bool BridgedType::isAddressableForDeps(BridgedFunction f) const {
-  return unbridged().isAddressableForDeps();
+  return unbridged().isAddressableForDeps(*f.getFunction());
 }
 
 SwiftInt BridgedType::getCaseIdxOfEnumType(BridgedStringRef name) const {