[AST] Remove SerializedDefaultArgumentInitializer

This stores the same state as
DefaultArgumentInitializer, use that instead.

Author: hamishknight

include/swift/AST/DeclContext.h

@@ -79,7 +79,6 @@ namespace swift {
   class Initializer;
   class ClassDecl;
   class SerializedAbstractClosureExpr;
-  class SerializedDefaultArgumentInitializer;
   class SerializedTopLevelCodeDecl;
   class StructDecl;
   class AccessorDecl;
@@ -114,7 +113,6 @@ enum class DeclContextKind : unsigned {
 /// \see SerializedLocalDeclContext.
 enum class LocalDeclContextKind : uint8_t {
   AbstractClosure,
-  DefaultArgumentInitializer,
   TopLevelCodeDecl
 };
 

include/swift/AST/Initializer.h

@@ -151,29 +151,6 @@ class DefaultArgumentInitializer : public Initializer {
   }
 };
 
-/// SerializedDefaultArgumentInitializer - This represents what was originally a
-/// DefaultArgumentInitializer during serialization. It is preserved only to
-/// maintain the correct AST structure and remangling after deserialization.
-class SerializedDefaultArgumentInitializer : public SerializedLocalDeclContext {
-  const unsigned Index;
-public:
-  SerializedDefaultArgumentInitializer(unsigned Index, DeclContext *Parent)
-    : SerializedLocalDeclContext(LocalDeclContextKind::DefaultArgumentInitializer,
-                                 Parent),
-      Index(Index) {}
-
-  unsigned getIndex() const {
-    return Index;
-  }
-
-  static bool classof(const DeclContext *DC) {
-    if (auto LDC = dyn_cast<SerializedLocalDeclContext>(DC))
-      return LDC->getLocalDeclContextKind() ==
-        LocalDeclContextKind::DefaultArgumentInitializer;
-    return false;
-  }
-};
-
 /// A property wrapper initialization expression.  The parent context is the
 /// function or closure which owns the property wrapper.
 class PropertyWrapperInitializer : public Initializer {

lib/AST/ASTMangler.cpp

@@ -2323,11 +2323,6 @@ void ASTMangler::appendContext(const DeclContext *ctx, StringRef useModuleName)
     case LocalDeclContextKind::AbstractClosure:
       appendClosureEntity(cast<SerializedAbstractClosureExpr>(local));
       return;
-    case LocalDeclContextKind::DefaultArgumentInitializer: {
-      auto argInit = cast<SerializedDefaultArgumentInitializer>(local);
-      appendDefaultArgumentEntity(ctx->getParent(), argInit->getIndex());
-      return;
-    }
     case LocalDeclContextKind::TopLevelCodeDecl:
       return appendContext(local->getParent(), useModuleName);
     }

lib/AST/DeclContext.cpp

@@ -824,11 +824,6 @@ unsigned DeclContext::printContext(raw_ostream &OS, const unsigned indent,
       OS << " closure : " << serializedClosure->getType();
       break;
     }
-    case LocalDeclContextKind::DefaultArgumentInitializer: {
-      auto init = cast<SerializedDefaultArgumentInitializer>(local);
-      OS << "DefaultArgument index=" << init->getIndex();
-      break;
-    }
     case LocalDeclContextKind::TopLevelCodeDecl:
       OS << " TopLevelCode";
       break;

lib/Serialization/Deserialization.cpp

@@ -2672,8 +2672,7 @@ Expected<DeclContext *>ModuleFile::getLocalDeclContext(LocalDeclContextID DCID)
                                                               index);
     DeclContext *parent = getDeclContext(parentID);
 
-    declContextOrOffset = new (ctx)
-      SerializedDefaultArgumentInitializer(index, parent);
+    declContextOrOffset = new (ctx) DefaultArgumentInitializer(parent, index);
     break;
   }
 

lib/Serialization/Serialization.cpp

@@ -2490,11 +2490,6 @@ void Serializer::writeASTBlockEntity(const DeclContext *DC) {
                                SACE->isImplicit(), SACE->getDiscriminator());
       return;
     }
-    case LocalDeclContextKind::DefaultArgumentInitializer: {
-      auto DAI = cast<SerializedDefaultArgumentInitializer>(local);
-      writeDefaultArgumentInitializer(DAI->getParent(), DAI->getIndex());
-      return;
-    }
     case LocalDeclContextKind::TopLevelCodeDecl: {
       auto abbrCode = DeclTypeAbbrCodes[TopLevelCodeDeclContextLayout::Code];
       TopLevelCodeDeclContextLayout::emitRecord(Out, ScratchRecord,

test/TypeDecoder/generic_local_types.swift

@@ -186,7 +186,7 @@ class Generic<T> {
 // CHECK-DECL: generic_local_types.(file).Generic.<anonymous>.Alias9
 // CHECK-DECL: generic_local_types.(file).Generic.<anonymous>.Alias10
 // CHECK-DECL: generic_local_types.(file).Generic.<anonymous>.Alias11
-// CHECK-DECL: generic_local_types.(file).Generic.method(_:).local context.local context.Alias12
+// CHECK-DECL: generic_local_types.(file).Generic.method(_:).default argument initializer.local context.Alias12
 // CHECK-DECL: generic_local_types.(file).Generic.method(_:).Alias13
 // CHECK-DECL: generic_local_types.(file).Generic.init().Alias14
 // CHECK-DECL: generic_local_types.(file).Generic.deinit.Alias15