Merge pull request swiftlang#71014 from xedin/inheritedentry-bitfields

[AST] NFC: Convert `InheritedEntry` flags to bitfields

Author: xedin

include/swift/AST/Decl.h

@@ -1599,21 +1599,27 @@ class ImportDecl final : public Decl,
 
 /// An entry in the "inherited" list of a type or extension.
 struct InheritedEntry : public TypeLoc {
+private:
   /// Whether there was an @unchecked attribute.
-  bool isUnchecked = false;
+  bool IsUnchecked : 1;
 
   /// Whether there was an @retroactive attribute.
-  bool isRetroactive = false;
+  bool IsRetroactive : 1;
 
   /// Whether there was an @preconcurrency attribute.
-  bool isPreconcurrency = false;
+  bool IsPreconcurrency : 1;
 
+public:
   InheritedEntry(const TypeLoc &typeLoc);
 
   InheritedEntry(const TypeLoc &typeLoc, bool isUnchecked, bool isRetroactive,
                  bool isPreconcurrency)
-      : TypeLoc(typeLoc), isUnchecked(isUnchecked),
-        isRetroactive(isRetroactive), isPreconcurrency(isPreconcurrency) {}
+      : TypeLoc(typeLoc), IsUnchecked(isUnchecked),
+        IsRetroactive(isRetroactive), IsPreconcurrency(isPreconcurrency) {}
+
+  bool isUnchecked() const { return IsUnchecked; }
+  bool isRetroactive() const { return IsRetroactive; }
+  bool isPreconcurrency() const { return IsPreconcurrency; }
 };
 
 /// A wrapper for the collection of inherited types for either a `TypeDecl` or

lib/AST/ASTPrinter.cpp

@@ -2727,12 +2727,12 @@ void PrintAST::printInherited(const Decl *decl) {
   Printer << ": ";
 
   interleave(TypesToPrint, [&](InheritedEntry inherited) {
-    if (inherited.isUnchecked)
+    if (inherited.isUnchecked())
       Printer << "@unchecked ";
-    if (inherited.isRetroactive &&
+    if (inherited.isRetroactive() &&
         !llvm::is_contained(Options.ExcludeAttrList, TAK_retroactive))
       Printer << "@retroactive ";
-    if (inherited.isPreconcurrency)
+    if (inherited.isPreconcurrency())
       Printer << "@preconcurrency ";
 
     printTypeLoc(inherited);
@@ -3221,11 +3221,9 @@ static bool usesFeatureRetroactiveAttribute(Decl *decl) {
   if (!ext)
     return false;
 
-  ArrayRef<InheritedEntry> entries = ext->getInherited().getEntries();
-  return std::find_if(entries.begin(), entries.end(), 
-    [](const InheritedEntry &entry) {
-      return entry.isRetroactive;
-    }) != entries.end();
+  return llvm::any_of(
+      ext->getInherited().getEntries(),
+      [](const InheritedEntry &entry) { return entry.isRetroactive(); });
 }
 
 static bool usesBuiltinType(Decl *decl, BuiltinTypeKind kind) {
@@ -3920,7 +3918,7 @@ static bool usesFeaturePreconcurrencyConformances(Decl *decl) {
   auto usesPreconcurrencyConformance = [&](const InheritedTypes &inherited) {
     return llvm::any_of(
         inherited.getEntries(),
-        [](const InheritedEntry &entry) { return entry.isPreconcurrency; });
+        [](const InheritedEntry &entry) { return entry.isPreconcurrency(); });
   };
 
   if (auto *T = dyn_cast<TypeDecl>(decl))

lib/AST/Decl.cpp

@@ -1588,11 +1588,12 @@ NominalTypeDecl::takeConformanceLoaderSlow() {
 }
 
 InheritedEntry::InheritedEntry(const TypeLoc &typeLoc)
-    : TypeLoc(typeLoc), isUnchecked(false) {
+    : InheritedEntry(typeLoc, /*isUnchecked=*/false, /*isRetroactive=*/false,
+                     /*isPreconcurrency=*/false) {
   if (auto typeRepr = typeLoc.getTypeRepr()) {
-    isUnchecked = typeRepr->findAttrLoc(TAK_unchecked).isValid();
-    isRetroactive = typeRepr->findAttrLoc(TAK_retroactive).isValid();
-    isPreconcurrency = typeRepr->findAttrLoc(TAK_preconcurrency).isValid();
+    IsUnchecked = typeRepr->findAttrLoc(TAK_unchecked).isValid();
+    IsRetroactive = typeRepr->findAttrLoc(TAK_retroactive).isValid();
+    IsPreconcurrency = typeRepr->findAttrLoc(TAK_preconcurrency).isValid();
   }
 }
 

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -507,7 +507,7 @@ class InheritedProtocolCollector {
         else
           ExtraProtocols.push_back(ProtocolAndAvailability(
               protoDecl, getAvailabilityAttrs(D, availableAttrs),
-              inherited.isUnchecked, getOriginallyDefinedInAttrList(D)));
+              inherited.isUnchecked(), getOriginallyDefinedInAttrList(D)));
       }
       // FIXME: This ignores layout constraints, but currently we don't support
       // any of those besides 'AnyObject'.

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -1673,7 +1673,7 @@ static void diagnoseRetroactiveConformances(
         // However, if this is the protocol in the inherited type entry,
         // check to make sure it's not erroneously marked @retroactive when it's
         // not actually retroactive.
-        if (decl == proto && entry.isRetroactive) {
+        if (decl == proto && entry.isRetroactive()) {
           auto loc = entry.getTypeRepr()->findAttrLoc(TAK_retroactive);
           bool typeIsSameModule =
               extTypeModule->isSameModuleLookingThroughOverlays(module);
@@ -1688,7 +1688,7 @@ static void diagnoseRetroactiveConformances(
       }
 
       // If it's marked @retroactive, no need to warn.
-      if (entry.isRetroactive) {
+      if (entry.isRetroactive()) {
         return TypeWalker::Action::Continue;
       }
 

lib/Serialization/Serialization.cpp

@@ -3821,9 +3821,9 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       TypeID typeRef = S.addTypeRef(inherited.getType());
 
       // Encode "unchecked" in the low bit.
-      typeRef = (typeRef << 1) | (inherited.isUnchecked ? 0x01 : 0x00);
+      typeRef = (typeRef << 1) | (inherited.isUnchecked() ? 0x01 : 0x00);
       // Encode "preconcurrency" in the low bit.
-      typeRef = (typeRef << 1) | (inherited.isPreconcurrency ? 0x01 : 0x00);
+      typeRef = (typeRef << 1) | (inherited.isPreconcurrency() ? 0x01 : 0x00);
 
       result.push_back(typeRef);
     }