Re-apply the series of commits to remove redundantly-serialized conformances.

I can't actually reproduce the buildbot failure that happened last night, so
hopefully it will (a) happen again, so I can investigate, or (b) not happen
again.

Swift SVN r22230
This commit is contained in:
Jordan Rose
2014-09-23 20:50:51 +00:00
parent a7c65273d5
commit 06986b7dca
8 changed files with 240 additions and 136 deletions

View File

@@ -48,7 +48,7 @@ const uint16_t VERSION_MAJOR = 0;
/// Serialized module format minor version number.
///
/// When the format changes IN ANY WAY, this number should be incremented.
const uint16_t VERSION_MINOR = 143;
const uint16_t VERSION_MINOR = 142;
using DeclID = Fixnum<31>;
using DeclIDField = BCFixed<31>;
@@ -862,7 +862,8 @@ namespace decls_block {
DeclIDField, // context decl
BCFixed<1>, // implicit?
BCFixed<1>, // objc?
TypeIDField // type (signature)
TypeIDField, // type (signature)
TypeIDField // interface type
// Trailed by a pattern for self.
>;