SIL: add Type.selfOrAnyFieldHasValueDeinit

Implemented by adding a recursive property in TypeLowering

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -43,6 +43,10 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
     return bridged.isReferenceCounted(function.bridged)
   }
 
+  public func selfOrAnyFieldHasValueDeinit(in function: Function) -> Bool {
+    return bridged.selfOrAnyFieldHasValueDeinit(function.bridged)
+  }
+
   public var isUnownedStorageType: Bool {
     return bridged.isUnownedStorageType()
   }
@@ -207,7 +211,7 @@ extension BridgedType {
 
 // TODO: use an AST type for this once we have it
 public struct NominalTypeDecl : Equatable, Hashable {
-  private let bridged: BridgedNominalTypeDecl
+  public let bridged: BridgedNominalTypeDecl
 
   public init(_bridged: BridgedNominalTypeDecl) {
     self.bridged = _bridged
@@ -230,4 +234,8 @@ public struct NominalTypeDecl : Equatable, Hashable {
   public var isGlobalActor: Bool {
     return bridged.isGlobalActor()
   }
+
+  public var hasValueDeinit: Bool {
+    return bridged.hasValueDeinit()
+  }
 }

include/swift/AST/ASTBridging.h

@@ -543,6 +543,10 @@ SWIFT_NAME("BridgedNominalTypeDecl.isGlobalActor(self:)")
 BRIDGED_INLINE
 bool BridgedNominalTypeDecl_isGlobalActor(BridgedNominalTypeDecl decl);
 
+SWIFT_NAME("BridgedNominalTypeDecl.hasValueDeinit(self:)")
+BRIDGED_INLINE
+bool BridgedNominalTypeDecl_hasValueDeinit(BridgedNominalTypeDecl decl);
+
 SWIFT_NAME("BridgedNominalTypeDecl.setParsedMembers(self:_:)")
 void BridgedNominalTypeDecl_setParsedMembers(BridgedNominalTypeDecl decl,
                                              BridgedArrayRef members);

include/swift/AST/ASTBridgingImpl.h

@@ -41,6 +41,10 @@ bool BridgedNominalTypeDecl_isGlobalActor(BridgedNominalTypeDecl decl) {
   return decl.unbridged()->isGlobalActor();
 }
 
+bool BridgedNominalTypeDecl_hasValueDeinit(BridgedNominalTypeDecl decl) {
+  return decl.unbridged()->getValueTypeDestructor() != nullptr;
+}
+
 //===----------------------------------------------------------------------===//
 // MARK: BridgedVarDecl
 //===----------------------------------------------------------------------===//

include/swift/SIL/SILBridging.h

@@ -96,6 +96,7 @@ struct BridgedType {
   BRIDGED_INLINE bool isValueTypeWithDeinit() const;
   BRIDGED_INLINE bool isLoadable(BridgedFunction f) const;
   BRIDGED_INLINE bool isReferenceCounted(BridgedFunction f) const;
+  BRIDGED_INLINE bool selfOrAnyFieldHasValueDeinit(BridgedFunction f) const;
   BRIDGED_INLINE bool isUnownedStorageType() const;
   BRIDGED_INLINE bool hasArchetype() const;
   BRIDGED_INLINE bool isNominalOrBoundGenericNominal() const;

include/swift/SIL/SILBridgingImpl.h

@@ -84,6 +84,12 @@ bool BridgedType::isReferenceCounted(BridgedFunction f) const {
   return unbridged().isReferenceCounted(f.getFunction());
 }
 
+bool BridgedType::selfOrAnyFieldHasValueDeinit(BridgedFunction f) const {
+  swift::SILType contextType = unbridged().hasTypeParameter() ? f.getFunction()->mapTypeIntoContext(unbridged())
+                                                              : unbridged();
+  return f.getFunction()->getTypeLowering(contextType).selfOrAnyFieldHasValueDeinit();
+}
+
 bool BridgedType::isUnownedStorageType() const {
   return unbridged().isUnownedStorageType();
 }

include/swift/SIL/TypeLowering.h

@@ -192,10 +192,11 @@ class TypeLowering {
       InfiniteFlag               = 1 << 5,
       HasRawPointerFlag          = 1 << 6,
       LexicalFlag                = 1 << 7,
+      HasValueDeinitFlag         = 1 << 8,
     };
     // clang-format on
 
-    uint8_t Flags;
+    uint16_t Flags;
   public:
     /// Construct a default RecursiveProperties, which corresponds to
     /// a trivial, loadable, fixed-layout type.
@@ -272,6 +273,9 @@ class TypeLowering {
     IsLexical_t isLexical() const {
       return IsLexical_t((Flags & LexicalFlag) != 0);
     }
+    bool hasValueDeinit() const {
+      return (Flags & HasValueDeinitFlag) != 0;
+    }
 
     void setNonTrivial() { Flags |= NonTrivialFlag; }
     void setNonFixedABI() { Flags |= NonFixedABIFlag; }
@@ -285,6 +289,7 @@ class TypeLowering {
     void setLexical(IsLexical_t isLexical) {
       Flags = (Flags & ~LexicalFlag) | (isLexical ? LexicalFlag : 0);
     }
+    void setHasValueDeinit() { Flags |= HasValueDeinitFlag; }
   };
 
 private:
@@ -363,6 +368,10 @@ class TypeLowering {
     return Properties.isOrContainsRawPointer();
   }
 
+  bool selfOrAnyFieldHasValueDeinit() const {
+    return Properties.hasValueDeinit();
+  }
+
   /// Returns true if the type is a scalar reference-counted reference, which
   /// can be retained and released.
   bool isReferenceCounted() const {

lib/SIL/IR/TypeLowering.cpp

@@ -2369,6 +2369,9 @@ namespace {
         properties.setLexical(IsLexical);
         return handleMoveOnlyAddressOnly(structType, properties);
       }
+      if (D->getValueTypeDestructor()) {
+        properties.setHasValueDeinit();
+      }
 
       auto subMap = structType->getContextSubstitutionMap(&TC.M, D);
 
@@ -2451,6 +2454,9 @@ namespace {
         return new (TC) LoadableEnumTypeLowering(enumType, properties,
                                                  Expansion);
       }
+      if (D->getValueTypeDestructor()) {
+        properties.setHasValueDeinit();
+      }
 
       auto subMap = enumType->getContextSubstitutionMap(&TC.M, D);