Serialization: Move the distribution channel to the end of the control block enum

Author: xymus

lib/Serialization/ModuleFormat.h

@@ -58,7 +58,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 = 874; // SDKVersion
+const uint16_t SWIFTMODULE_VERSION_MINOR = 875; // Reorder control block enum
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -863,9 +863,9 @@ namespace control_block {
     SDK_NAME,
     SDK_VERSION,
     REVISION,
-    CHANNEL,
     IS_OSSA,
     ALLOWABLE_CLIENT_NAME,
+    CHANNEL,
   };
 
   using MetadataLayout = BCRecordLayout<
@@ -906,11 +906,6 @@ namespace control_block {
     BCBlob
   >;
 
-  using ChannelLayout = BCRecordLayout<
-    CHANNEL,
-    BCBlob
-  >;
-
   using IsOSSALayout = BCRecordLayout<
     IS_OSSA,
     BCFixed<1>
@@ -920,6 +915,11 @@ namespace control_block {
     ALLOWABLE_CLIENT_NAME,
     BCBlob
   >;
+
+  using ChannelLayout = BCRecordLayout<
+    CHANNEL,
+    BCBlob
+  >;
 }
 
 /// The record types within the options block (a sub-block of the control

lib/Serialization/Serialization.cpp

@@ -836,9 +836,9 @@ void Serializer::writeBlockInfoBlock() {
   BLOCK_RECORD(control_block, SDK_NAME);
   BLOCK_RECORD(control_block, SDK_VERSION);
   BLOCK_RECORD(control_block, REVISION);
-  BLOCK_RECORD(control_block, CHANNEL);
   BLOCK_RECORD(control_block, IS_OSSA);
   BLOCK_RECORD(control_block, ALLOWABLE_CLIENT_NAME);
+  BLOCK_RECORD(control_block, CHANNEL);
 
   BLOCK(OPTIONS_BLOCK);
   BLOCK_RECORD(options_block, SDK_PATH);