Merge pull request #18648 from slavapestov/serialize-new-function-representation

Serialize new function type representation

Author: slavapestov

include/swift/Serialization/DeclTypeRecordNodes.def

@@ -86,8 +86,8 @@ TYPE(PAREN)
 TYPE(TUPLE)
 TRAILING_INFO(TUPLE_TYPE_ELT)
 TYPE(FUNCTION)
+TRAILING_INFO(FUNCTION_PARAM)
 TYPE(METATYPE)
-TYPE(INOUT)
 TYPE(ARCHETYPE)
 TYPE(PROTOCOL_COMPOSITION)
 TYPE(BOUND_GENERIC)
@@ -99,7 +99,6 @@ TYPE(REFERENCE_STORAGE)
 TYPE(UNBOUND_GENERIC)
 TYPE(OPTIONAL)
 TYPE(SIL_FUNCTION)
-TYPE(UNCHECKED_OPTIONAL)
 TYPE(DYNAMIC_SELF)
 TYPE(OPENED_EXISTENTIAL)
 TYPE(EXISTENTIAL_METATYPE)

include/swift/Serialization/ModuleFormat.h

@@ -55,7 +55,7 @@ const uint16_t 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 VERSION_MINOR = 433; // Last change: GenericTypeParamDecl doesn't need a DC
+const uint16_t VERSION_MINOR = 435; // Last change: serialize new-style function parameters
 
 using DeclIDField = BCFixed<31>;
 
@@ -706,11 +706,7 @@ namespace decls_block {
 
   using ParenTypeLayout = BCRecordLayout<
     PAREN_TYPE,
-    TypeIDField,        // inner type
-    BCFixed<1>,         // vararg?
-    BCFixed<1>,         // autoclosure?
-    BCFixed<1>,         // escaping?
-    ValueOwnershipField // inout, shared or owned?
+    TypeIDField         // inner type
   >;
 
   using TupleTypeLayout = BCRecordLayout<
@@ -720,21 +716,28 @@ namespace decls_block {
   using TupleTypeEltLayout = BCRecordLayout<
     TUPLE_TYPE_ELT,
     IdentifierIDField,  // name
-    TypeIDField,        // type
-    BCFixed<1>,         // vararg?
-    BCFixed<1>,         // autoclosure?
-    BCFixed<1>,         // escaping?
-    ValueOwnershipField // inout, shared or owned?
+    TypeIDField         // type
   >;
 
   using FunctionTypeLayout = BCRecordLayout<
     FUNCTION_TYPE,
-    TypeIDField, // input
     TypeIDField, // output
     FunctionTypeRepresentationField, // representation
     BCFixed<1>,  // auto-closure?
     BCFixed<1>,  // noescape?
     BCFixed<1>   // throws?
+
+    // trailed by parameters
+  >;
+
+  using FunctionParamLayout = BCRecordLayout<
+    FUNCTION_PARAM,
+    IdentifierIDField,  // name
+    TypeIDField,        // type
+    BCFixed<1>,         // vararg?
+    BCFixed<1>,         // autoclosure?
+    BCFixed<1>,         // escaping?
+    ValueOwnershipField // inout, shared or owned?
   >;
 
   using MetatypeTypeLayout = BCRecordLayout<
@@ -749,11 +752,6 @@ namespace decls_block {
     MetatypeRepresentationField        // representation
   >;
 
-  using InOutTypeLayout = BCRecordLayout<
-    INOUT_TYPE,
-    TypeIDField // object type
-  >;
-
   using ArchetypeTypeLayout = BCRecordLayout<
     ARCHETYPE_TYPE,
     GenericEnvironmentIDField, // generic environment
@@ -785,11 +783,12 @@ namespace decls_block {
 
   using GenericFunctionTypeLayout = BCRecordLayout<
     GENERIC_FUNCTION_TYPE,
-    TypeIDField,         // input
     TypeIDField,         // output
     FunctionTypeRepresentationField, // representation
     BCFixed<1>,          // throws?
     GenericSignatureIDField // generic signture
+
+    // trailed by parameters
   >;
 
   using SILFunctionTypeLayout = BCRecordLayout<
@@ -965,7 +964,6 @@ namespace decls_block {
     BCFixed<1>,  // throws?
     CtorInitializerKindField,  // initializer kind
     GenericEnvironmentIDField, // generic environment
-    TypeIDField, // interface type
     DeclIDField, // overridden decl
     AccessLevelField, // access level
     BCFixed<1>,   // requires a new vtable slot
@@ -1024,7 +1022,7 @@ namespace decls_block {
     BCFixed<1>,   // has forced static dispatch?
     BCFixed<1>,   // throws?
     GenericEnvironmentIDField, // generic environment
-    TypeIDField,  // interface type
+    TypeIDField,  // result interface type
     DeclIDField,  // operator decl
     DeclIDField,  // overridden function
     BCVBR<5>,     // 0 for a simple name, otherwise the number of parameter name
@@ -1053,7 +1051,7 @@ namespace decls_block {
     BCFixed<1>,   // has forced static dispatch?
     BCFixed<1>,   // throws?
     GenericEnvironmentIDField, // generic environment
-    TypeIDField,  // interface type
+    TypeIDField,  // result interface type
     DeclIDField,  // overridden function
     DeclIDField,  // AccessorStorageDecl
     AccessorKindField, // accessor kind
@@ -1110,7 +1108,6 @@ namespace decls_block {
   using EnumElementLayout = BCRecordLayout<
     ENUM_ELEMENT_DECL,
     DeclContextIDField,// context decl
-    TypeIDField, // interface type
     BCFixed<1>,  // implicit?
     BCFixed<1>,  // has payload?
     EnumElementRawValueKindField,  // raw value kind
@@ -1136,7 +1133,7 @@ namespace decls_block {
     ReadWriteImplKindField,   // read-write implementation
     AccessorCountField, // number of accessors
     GenericEnvironmentIDField, // generic environment
-    TypeIDField, // interface type
+    TypeIDField, // element interface type
     DeclIDField, // overridden decl
     AccessLevelField, // access level
     AccessLevelField, // setter access, if applicable
@@ -1167,9 +1164,7 @@ namespace decls_block {
     DeclContextIDField, // context decl
     BCFixed<1>,  // implicit?
     BCFixed<1>,  // objc?
-    GenericEnvironmentIDField, // generic environment
-    TypeIDField  // interface type
-    // Trailed by a pattern for self.
+    GenericEnvironmentIDField // generic environment
   >;
 
   using ParameterListLayout = BCRecordLayout<
@@ -1257,8 +1252,8 @@ namespace decls_block {
   using GenericRequirementLayout = BCRecordLayout<
     GENERIC_REQUIREMENT,
     GenericRequirementKindField, // requirement kind
-    TypeIDField,                 // types involved (two for conformance,
-    TypeIDField                  // same-type; one for value witness marker)
+    TypeIDField,                 // subject type
+    TypeIDField                  // constraint type
   >;
 
   using LayoutRequirementLayout = BCRecordLayout<