AST: Remove 'default argument resilience expansion'

slavapestov · slavapestov · commit 8292cbe3b3e5 · 2019-04-02T20:37:01.000-04:00
This was a Swift 3 mode holdover.
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -393,16 +393,11 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// Information about a symbolic default argument, like #file.
     defaultArgumentKind : NumDefaultArgumentKindBits
   );
-  
+
   SWIFT_INLINE_BITFIELD(SubscriptDecl, VarDecl, 2,
     StaticSpelling : 2
   );
 
-  SWIFT_INLINE_BITFIELD(EnumElementDecl, ValueDecl, 1,
-    /// The ResilienceExpansion to use for default arguments.
-    DefaultArgumentResilienceExpansion : 1
-  );
-  
   SWIFT_INLINE_BITFIELD(AbstractFunctionDecl, ValueDecl, 3+8+1+1+1+1+1+1+1,
     /// \see AbstractFunctionDecl::BodyKind
     BodyKind : 3,
@@ -425,9 +420,6 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// Whether NeedsNewVTableEntry is valid.
     HasComputedNeedsNewVTableEntry : 1,
 
-    /// The ResilienceExpansion to use for default arguments.
-    DefaultArgumentResilienceExpansion : 1,
-
     /// Whether this member was synthesized as part of a derived
     /// protocol conformance.
     Synthesized : 1
@@ -5307,8 +5299,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     Bits.AbstractFunctionDecl.Throws = Throws;
     Bits.AbstractFunctionDecl.NeedsNewVTableEntry = false;
     Bits.AbstractFunctionDecl.HasComputedNeedsNewVTableEntry = false;
-    Bits.AbstractFunctionDecl.DefaultArgumentResilienceExpansion =
-        unsigned(ResilienceExpansion::Maximal);
     Bits.AbstractFunctionDecl.Synthesized = false;
   }
 
@@ -5556,21 +5546,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   /// Resolved during type checking
   void setIsOverridden() { Bits.AbstractFunctionDecl.Overridden = true; }
 
-  /// The ResilienceExpansion for default arguments.
-  ///
-  /// In Swift 4 mode, default argument expressions are serialized, and must
-  /// obey the restrictions imposed upon inlinable function bodies.
-  ResilienceExpansion getDefaultArgumentResilienceExpansion() const {
-    return ResilienceExpansion(
-        Bits.AbstractFunctionDecl.DefaultArgumentResilienceExpansion);
-  }
-
-  /// Set the ResilienceExpansion for default arguments.
-  void setDefaultArgumentResilienceExpansion(ResilienceExpansion expansion) {
-    Bits.AbstractFunctionDecl.DefaultArgumentResilienceExpansion =
-        unsigned(expansion);
-  }
-
   /// Set information about the foreign error convention used by this
   /// declaration.
   void setForeignErrorConvention(const ForeignErrorConvention &convention);
@@ -6025,10 +6000,7 @@ class EnumElementDecl : public DeclContext, public ValueDecl {
     Params(Params),
     EqualsLoc(EqualsLoc),
     RawValueExpr(RawValueExpr)
-  {
-    Bits.EnumElementDecl.DefaultArgumentResilienceExpansion =
-        static_cast<unsigned>(ResilienceExpansion::Maximal);
-  }
+  {}
 
   Identifier getName() const { return getFullName().getBaseIdentifier(); }
 
@@ -6057,21 +6029,6 @@ class EnumElementDecl : public DeclContext, public ValueDecl {
     TypeCheckedRawValueExpr = e;
   }
 
-  /// The ResilienceExpansion for default arguments.
-  ///
-  /// In Swift 4 mode, default argument expressions are serialized, and must
-  /// obey the restrictions imposed upon inlinable function bodies.
-  ResilienceExpansion getDefaultArgumentResilienceExpansion() const {
-    return ResilienceExpansion(
-        Bits.EnumElementDecl.DefaultArgumentResilienceExpansion);
-  }
-
-  /// Set the ResilienceExpansion for default arguments.
-  void setDefaultArgumentResilienceExpansion(ResilienceExpansion expansion) {
-    Bits.EnumElementDecl.DefaultArgumentResilienceExpansion =
-        unsigned(expansion);
-  }
-  
   /// Return the containing EnumDecl.
   EnumDecl *getParentEnum() const {
     return cast<EnumDecl>(getDeclContext());
diff --git a/include/swift/Serialization/ModuleFormat.h b/include/swift/Serialization/ModuleFormat.h
@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 482; // static subscripts
+const uint16_t SWIFTMODULE_VERSION_MINOR = 483; // Remove default arg expansion
 
 using DeclIDField = BCFixed<31>;
 
@@ -1002,7 +1002,6 @@ namespace decls_block {
     DeclIDField, // overridden decl
     AccessLevelField, // access level
     BCFixed<1>,   // requires a new vtable slot
-    BCFixed<1>,   // default argument resilience expansion
     BCFixed<1>,   // 'required' but overridden is not (used for recovery)
     BCVBR<5>,     // number of parameter name components
     BCArray<IdentifierIDField> // name components,
@@ -1069,7 +1068,6 @@ namespace decls_block {
                   // components plus one
     AccessLevelField, // access level
     BCFixed<1>,   // requires a new vtable slot
-    BCFixed<1>,   // default argument resilience expansion
     BCArray<IdentifierIDField> // name components,
                                // followed by TypeID dependencies
     // The record is trailed by:
@@ -1099,7 +1097,6 @@ namespace decls_block {
     AccessorKindField, // accessor kind
     AccessLevelField, // access level
     BCFixed<1>,   // requires a new vtable slot
-    BCFixed<1>,   // default argument resilience expansion
     BCArray<IdentifierIDField> // name components,
                                // followed by TypeID dependencies
     // The record is trailed by:
@@ -1158,7 +1155,6 @@ namespace decls_block {
     EnumElementRawValueKindField,  // raw value kind
     BCFixed<1>,  // negative raw value?
     IdentifierIDField, // raw value
-    BCFixed<1>,   // default argument resilience expansion
     BCVBR<5>, // number of parameter name components
     BCArray<IdentifierIDField> // name components,
 
diff --git a/lib/AST/DeclContext.cpp b/lib/AST/DeclContext.cpp
@@ -313,11 +313,23 @@ ResilienceExpansion DeclContext::getResilienceExpansion() const {
     // Default argument initializer contexts have their resilience expansion
     // set when they're type checked.
     if (isa<DefaultArgumentInitializer>(dc)) {
-      if (auto *EED = dyn_cast<EnumElementDecl>(dc->getParent())) {
-        return EED->getDefaultArgumentResilienceExpansion();
+      dc = dc->getParent();
+
+      const ValueDecl *VD;
+      if (auto *FD = dyn_cast<AbstractFunctionDecl>(dc)) {
+        VD = FD;
+      } else {
+        VD = cast<EnumElementDecl>(dc);
       }
-      return cast<AbstractFunctionDecl>(dc->getParent())
-          ->getDefaultArgumentResilienceExpansion();
+
+      auto access =
+        VD->getFormalAccessScope(/*useDC=*/nullptr,
+                                 /*treatUsableFromInlineAsPublic=*/true);
+
+      if (access.isPublic())
+        return ResilienceExpansion::Minimal;
+
+      return ResilienceExpansion::Maximal;
     }
 
     // Stored property initializer contexts use minimal resilience expansion
diff --git a/lib/SIL/SILDeclRef.cpp b/lib/SIL/SILDeclRef.cpp
@@ -476,19 +476,13 @@ IsSerialized_t SILDeclRef::isSerialized() const {
   // Default argument generators are serialized if the containing
   // declaration is public.
   if (isDefaultArgGenerator()) {
-    ResilienceExpansion expansion;
-    if (auto *EED = dyn_cast<EnumElementDecl>(d)) {
-      expansion = EED->getDefaultArgumentResilienceExpansion();
-    } else {
-      expansion = cast<AbstractFunctionDecl>(d)
-                    ->getDefaultArgumentResilienceExpansion();
-    }
-    switch (expansion) {
-    case ResilienceExpansion::Minimal:
+    auto scope =
+      d->getFormalAccessScope(/*useDC=*/nullptr,
+                              /*treatUsableFromInlineAsPublic=*/true);
+
+    if (scope.isPublic())
       return IsSerialized;
-    case ResilienceExpansion::Maximal:
-      return IsNotSerialized;
-    }
+    return IsNotSerialized;
   }
 
   // Stored property initializers are inlinable if the type is explicitly
diff --git a/lib/Sema/TypeCheckStmt.cpp b/lib/Sema/TypeCheckStmt.cpp
@@ -1744,27 +1744,6 @@ Stmt *StmtChecker::visitBraceStmt(BraceStmt *BS) {
 /// Check the default arguments that occur within this pattern.
 void TypeChecker::checkDefaultArguments(ParameterList *params,
                                         ValueDecl *VD) {
-  auto access =
-    VD->getFormalAccessScope(/*useDC=*/nullptr,
-                             /*treatUsableFromInlineAsPublic=*/true);
-
-  // In Swift 4 mode, default argument bodies are inlined into the
-  // caller.
-  if (auto *func = dyn_cast<AbstractFunctionDecl>(VD)) {
-    auto expansion = func->getResilienceExpansion();
-    if (access.isPublic())
-      expansion = ResilienceExpansion::Minimal;
-
-    func->setDefaultArgumentResilienceExpansion(expansion);
-  } else {
-    auto *EED = cast<EnumElementDecl>(VD);
-    auto expansion = ResilienceExpansion::Maximal;
-    if (access.isPublic())
-      expansion = ResilienceExpansion::Minimal;
-
-    EED->setDefaultArgumentResilienceExpansion(expansion);
-  }
-
   for (auto *param : *params) {
     if (!param->getDefaultValue() ||
         !param->hasInterfaceType() ||
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -2064,17 +2064,6 @@ getActualSelfAccessKind(uint8_t raw) {
   return None;
 }
 
-static
-Optional<swift::ResilienceExpansion> getActualResilienceExpansion(uint8_t raw) {
-  switch (serialization::ResilienceExpansion(raw)) {
-  case serialization::ResilienceExpansion::Minimal:
-    return swift::ResilienceExpansion::Minimal;
-  case serialization::ResilienceExpansion::Maximal:
-    return swift::ResilienceExpansion::Maximal;
-  }
-  return None;
-}
-
 /// Translate from the serialization VarDeclSpecifier enumerators, which are
 /// guaranteed to be stable, to the AST ones.
 static Optional<swift::VarDecl::Specifier>
@@ -2512,7 +2501,6 @@ class swift::DeclDeserializer {
     uint8_t storedInitKind, rawAccessLevel;
     DeclID overriddenID;
     bool needsNewVTableEntry, firstTimeRequired;
-    uint8_t rawDefaultArgumentResilienceExpansion;
     unsigned numArgNames;
     ArrayRef<uint64_t> argNameAndDependencyIDs;
 
@@ -2524,7 +2512,6 @@ class swift::DeclDeserializer {
                                                overriddenID,
                                                rawAccessLevel,
                                                needsNewVTableEntry,
-                                               rawDefaultArgumentResilienceExpansion,
                                                firstTimeRequired,
                                                numArgNames,
                                                argNameAndDependencyIDs);
@@ -2617,15 +2604,6 @@ class swift::DeclDeserializer {
       }
     }
 
-    if (auto defaultArgumentResilienceExpansion = getActualResilienceExpansion(
-            rawDefaultArgumentResilienceExpansion)) {
-      ctor->setDefaultArgumentResilienceExpansion(
-          *defaultArgumentResilienceExpansion);
-    } else {
-      MF.error();
-      return nullptr;
-    }
-
     ctor->computeType();
 
     return ctor;
@@ -2831,7 +2809,6 @@ class swift::DeclDeserializer {
     DeclID overriddenID;
     DeclID accessorStorageDeclID;
     bool needsNewVTableEntry;
-    uint8_t rawDefaultArgumentResilienceExpansion;
     ArrayRef<uint64_t> nameAndDependencyIDs;
 
     if (!isAccessor) {
@@ -2845,7 +2822,6 @@ class swift::DeclDeserializer {
                                           numNameComponentsBiased,
                                           rawAccessLevel,
                                           needsNewVTableEntry,
-                                          rawDefaultArgumentResilienceExpansion,
                                           nameAndDependencyIDs);
     } else {
       decls_block::AccessorLayout::readRecord(scratch, contextID, isImplicit,
@@ -2859,7 +2835,6 @@ class swift::DeclDeserializer {
                                           rawAccessorKind,
                                           rawAccessLevel,
                                           needsNewVTableEntry,
-                                          rawDefaultArgumentResilienceExpansion,
                                           nameAndDependencyIDs);
     }
 
@@ -3021,15 +2996,6 @@ class swift::DeclDeserializer {
     fn->setForcedStaticDispatch(hasForcedStaticDispatch);
     fn->setNeedsNewVTableEntry(needsNewVTableEntry);
 
-    if (auto defaultArgumentResilienceExpansion = getActualResilienceExpansion(
-            rawDefaultArgumentResilienceExpansion)) {
-      fn->setDefaultArgumentResilienceExpansion(
-          *defaultArgumentResilienceExpansion);
-    } else {
-      MF.error();
-      return nullptr;
-    }
-    
     // Set the interface type.
     fn->computeType();
 
@@ -3451,15 +3417,13 @@ class swift::DeclDeserializer {
     bool isImplicit; bool hasPayload; bool isNegative;
     unsigned rawValueKindID;
     IdentifierID rawValueData;
-    uint8_t rawResilienceExpansion;
     unsigned numArgNames;
     ArrayRef<uint64_t> argNameAndDependencyIDs;
 
     decls_block::EnumElementLayout::readRecord(scratch, contextID,
                                                isImplicit, hasPayload,
                                                rawValueKindID, isNegative,
                                                rawValueData,
-                                               rawResilienceExpansion,
                                                numArgNames,
                                                argNameAndDependencyIDs);
 
@@ -3518,13 +3482,6 @@ class swift::DeclDeserializer {
     elem->setAccess(std::max(cast<EnumDecl>(DC)->getFormalAccess(),
                              AccessLevel::Internal));
 
-    if (auto resilienceExpansion = getActualResilienceExpansion(
-                                       rawResilienceExpansion)) {
-      elem->setDefaultArgumentResilienceExpansion(*resilienceExpansion);
-    } else {
-      MF.error();
-      return nullptr;
-    }
     return elem;
   }
 
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
