LifetimeDependence: conditionallyAddressableParamIndices

Preserve conditionallyAddressableParamIndices independent of any
addressableParamIndices. The conditional dependencies are subject to change
based on type substitution.

Author: atrick

SwiftCompilerSources/Sources/SIL/FunctionConvention.swift

@@ -313,6 +313,7 @@ extension FunctionConvention {
       }
       if scope {
         let addressable = bridged.checkAddressable(bridgedIndex(parameterIndex: index))
+          || bridged.checkConditionallyAddressable(bridgedIndex(parameterIndex: index))
         return .scope(addressable: addressable)
       }
       return nil

include/swift/AST/LifetimeDependence.h

@@ -250,11 +250,10 @@ class LifetimeDependenceInfo {
     assert(!inheritLifetimeParamIndices ||
            !inheritLifetimeParamIndices->isEmpty());
     assert(!scopeLifetimeParamIndices || !scopeLifetimeParamIndices->isEmpty());
-    assert((!conditionallyAddressableParamIndices
-            || (addressableParamIndices
-                && conditionallyAddressableParamIndices
-                    ->isSubsetOf(addressableParamIndices)))
-     && "conditionally-addressable params not a subset of addressable params?");
+    assert((!addressableParamIndices
+            || !conditionallyAddressableParamIndices
+            || conditionallyAddressableParamIndices->isDisjointWith(
+              addressableParamIndices)));
   }
 
   operator bool() const { return !empty(); }

include/swift/SIL/SILBridging.h

@@ -159,6 +159,7 @@ struct BridgedLifetimeDependenceInfo {
   swift::IndexSubset *_Nullable inheritLifetimeParamIndices;
   swift::IndexSubset *_Nullable scopeLifetimeParamIndices;
   swift::IndexSubset *_Nullable addressableParamIndices;
+  swift::IndexSubset *_Nullable conditionallyAddressableParamIndices;
   SwiftUInt targetIndex;
   bool immortal;
 
@@ -168,6 +169,7 @@ struct BridgedLifetimeDependenceInfo {
   BRIDGED_INLINE bool checkInherit(SwiftInt index) const;
   BRIDGED_INLINE bool checkScope(SwiftInt index) const;
   BRIDGED_INLINE bool checkAddressable(SwiftInt index) const;
+  BRIDGED_INLINE bool checkConditionallyAddressable(SwiftInt index) const;
   BRIDGED_INLINE SwiftInt getTargetIndex() const;
 
   BRIDGED_INLINE BridgedOwnedString getDebugDescription() const;

include/swift/SIL/SILBridgingImpl.h

@@ -147,6 +147,8 @@ BridgedLifetimeDependenceInfo::BridgedLifetimeDependenceInfo(swift::LifetimeDepe
     : inheritLifetimeParamIndices(info.getInheritIndices()),
       scopeLifetimeParamIndices(info.getScopeIndices()),
       addressableParamIndices(info.getAddressableIndices()),
+      conditionallyAddressableParamIndices(
+        info.getConditionallyAddressableIndices()),
       targetIndex(info.getTargetIndex()), immortal(info.isImmortal()) {}
 
 SwiftInt BridgedLifetimeDependenceInfoArray::count() const {
@@ -177,6 +179,12 @@ bool BridgedLifetimeDependenceInfo::checkAddressable(SwiftInt index) const {
   return addressableParamIndices && addressableParamIndices->contains(index);
 }
 
+bool BridgedLifetimeDependenceInfo::
+checkConditionallyAddressable(SwiftInt index) const {
+  return conditionallyAddressableParamIndices
+    && conditionallyAddressableParamIndices->contains(index);
+}
+
 SwiftInt BridgedLifetimeDependenceInfo::getTargetIndex() const {
   return targetIndex;
 }

lib/AST/LifetimeDependence.cpp

@@ -63,11 +63,9 @@ std::string LifetimeDependenceInfo::getString() const {
         }
         result += kind;
         if (addressable && addressable->contains(i)) {
-          if (condAddressable && condAddressable->contains(i)) {
-            result += "address_for_deps ";
-          } else {
-            result += "address ";
-          }
+          result += "address ";
+        } else if (condAddressable && condAddressable->contains(i)) {
+          result += "address_for_deps ";
         }
         result += std::to_string(i);
         isFirstSetBit = false;
@@ -1136,7 +1134,6 @@ static std::optional<LifetimeDependenceInfo> checkSILTypeModifiers(
         break;
       case LifetimeDescriptor::IsConditionallyAddressable:
         conditionallyAddressableLifetimeParamIndices.set(index);
-        addressableLifetimeParamIndices.set(index);
         break;
       case LifetimeDescriptor::IsAddressable:
         addressableLifetimeParamIndices.set(index);

lib/SIL/IR/SILFunctionType.cpp

@@ -1823,14 +1823,12 @@ class DestructureInputs {
       // is addressable-for-dependencies, then lower it with maximal abstraction
       // as well.
       auto &initialSubstTL = TC.getTypeLowering(origType, substType, expansion);
-      if (initialSubstTL.getRecursiveProperties().isAddressableForDependencies()) {
+      if (initialSubstTL.getRecursiveProperties()
+          .isAddressableForDependencies()) {
         origType = AbstractionPattern::getOpaque();
 
-        // Remember that this lowered parameter is conditionally addressable in
-        // the addressable parameters vector.
-        AddressableLoweredParameters.resize(ParameterMap.size() + 1, false);
-        AddressableLoweredParameters[ParameterMap.size()] = true;
-
+        // Remember that this lowered parameter is conditionally
+        // addressable. Specialization may clear this flag.
         ConditionallyAddressableLoweredParameters
           .resize(ParameterMap.size() + 1, false);
         ConditionallyAddressableLoweredParameters[ParameterMap.size()] = true;