Merge pull request #41593 from rjmccall/serialization-improvements

Uniquely serialize conformances and make room for more protocol codes

Author: rjmccall

lib/Serialization/DeclTypeRecordNodes.def

@@ -127,7 +127,6 @@ DECL(OPAQUE_TYPE)
 DECL(PATTERN_BINDING)
 DECL(PROTOCOL)
 TRAILING_INFO(DEFAULT_WITNESS_TABLE)
-TRAILING_INFO(PROTOCOL_TYPEALIAS)
 TRAILING_INFO(ASSOCIATED_TYPE)
 DECL(PREFIX_OPERATOR)
 DECL(POSTFIX_OPERATOR)
@@ -141,68 +140,68 @@ DECL(DESTRUCTOR)
 DECL(PRECEDENCE_GROUP)
 DECL(ACCESSOR)
 
-#ifndef DECL_ATTR
-#define DECL_ATTR(NAME, CLASS, OPTIONS, CODE) RECORD_VAL(CLASS##_DECL_ATTR, 70+CODE)
-#endif
-#include "swift/AST/Attr.def"
-
-FIRST_PATTERN(PAREN, 200)
+FIRST_PATTERN(PAREN, 80)
 PATTERN(TUPLE)
 TRAILING_INFO(TUPLE_PATTERN_ELT)
 PATTERN(NAMED)
 PATTERN(ANY)
 PATTERN(TYPED)
 PATTERN(VAR)
 
-OTHER(PARAMETERLIST, 210)
+OTHER(PARAMETERLIST, 100)
 // 211 is unused
-OTHER(FOREIGN_ERROR_CONVENTION, 212)
-OTHER(FOREIGN_ASYNC_CONVENTION, 213)
-OTHER(XREF_TYPE_PATH_PIECE, 214)
-OTHER(XREF_VALUE_PATH_PIECE, 215)
-OTHER(XREF_EXTENSION_PATH_PIECE, 216)
-OTHER(XREF_OPERATOR_OR_ACCESSOR_PATH_PIECE, 217)
-OTHER(XREF_GENERIC_PARAM_PATH_PIECE, 218)
-OTHER(XREF_INITIALIZER_PATH_PIECE, 219)
-
-OTHER(ABSTRACT_CLOSURE_EXPR_CONTEXT, 220)
-OTHER(PATTERN_BINDING_INITIALIZER_CONTEXT, 221)
-OTHER(DEFAULT_ARGUMENT_INITIALIZER_CONTEXT, 222)
-OTHER(TOP_LEVEL_CODE_DECL_CONTEXT, 223)
-
-OTHER(GENERIC_PARAM_LIST, 230)
-OTHER(GENERIC_SIGNATURE, 231)
-TRAILING_INFO(GENERIC_REQUIREMENT)
-TRAILING_INFO(LAYOUT_REQUIREMENT)
-OTHER(BUILTIN_PROTOCOL_CONFORMANCE, 234)
-OTHER(SIL_GENERIC_SIGNATURE, 235)
-OTHER(SUBSTITUTION_MAP, 236)
-
-OTHER(LOCAL_DISCRIMINATOR, 237)
-OTHER(PRIVATE_DISCRIMINATOR, 238)
-OTHER(FILENAME_FOR_PRIVATE, 239)
-
-OTHER(ABSTRACT_PROTOCOL_CONFORMANCE, 240)
-OTHER(NORMAL_PROTOCOL_CONFORMANCE, 241)
-OTHER(SPECIALIZED_PROTOCOL_CONFORMANCE, 242)
-OTHER(INHERITED_PROTOCOL_CONFORMANCE, 243)
-OTHER(INVALID_PROTOCOL_CONFORMANCE, 244)
-
-OTHER(SIL_LAYOUT, 245)
-OTHER(NORMAL_PROTOCOL_CONFORMANCE_ID, 246)
-OTHER(PROTOCOL_CONFORMANCE_XREF, 247)
-OTHER(MEMBERS, 248)
-OTHER(XREF, 249)
-OTHER(INLINABLE_BODY_TEXT, 250)
-OTHER(SELF_PROTOCOL_CONFORMANCE, 251)
-
-OTHER(XREF_OPAQUE_RETURN_TYPE_PATH_PIECE, 252)
-
-OTHER(CLANG_TYPE, 253)
-
-OTHER(DERIVATIVE_FUNCTION_CONFIGURATION, 254)
-
-OTHER(ERROR_FLAG, 255)
+OTHER(FOREIGN_ERROR_CONVENTION, 101)
+OTHER(FOREIGN_ASYNC_CONVENTION, 102)
+OTHER(XREF_TYPE_PATH_PIECE, 103)
+OTHER(XREF_VALUE_PATH_PIECE, 104)
+OTHER(XREF_EXTENSION_PATH_PIECE, 105)
+OTHER(XREF_OPERATOR_OR_ACCESSOR_PATH_PIECE, 106)
+OTHER(XREF_GENERIC_PARAM_PATH_PIECE, 107)
+OTHER(XREF_INITIALIZER_PATH_PIECE, 108)
+
+OTHER(ABSTRACT_CLOSURE_EXPR_CONTEXT, 109)
+OTHER(PATTERN_BINDING_INITIALIZER_CONTEXT, 110)
+OTHER(DEFAULT_ARGUMENT_INITIALIZER_CONTEXT, 111)
+OTHER(TOP_LEVEL_CODE_DECL_CONTEXT, 112)
+
+OTHER(GENERIC_PARAM_LIST, 120)
+OTHER(GENERIC_SIGNATURE, 121)
+OTHER(REQUIREMENT_SIGNATURE, 122)
+// 123 is unused; was LAYOUT_REQUIREMENT
+OTHER(BUILTIN_PROTOCOL_CONFORMANCE, 124)
+OTHER(SIL_GENERIC_SIGNATURE, 125)
+OTHER(SUBSTITUTION_MAP, 126)
+
+OTHER(LOCAL_DISCRIMINATOR, 127)
+OTHER(PRIVATE_DISCRIMINATOR, 128)
+OTHER(FILENAME_FOR_PRIVATE, 129)
+
+// 140 is unused; was ABSTRACT_PROTOCOL_CONFORMANCE
+OTHER(NORMAL_PROTOCOL_CONFORMANCE, 141)
+OTHER(SPECIALIZED_PROTOCOL_CONFORMANCE, 142)
+OTHER(INHERITED_PROTOCOL_CONFORMANCE, 143)
+// 144 is unused; was INVALID_PROTOCOL_CONFORMANCE
+
+OTHER(SIL_LAYOUT, 145)
+// 146 is unused; was NORMAL_PROTOCOL_CONFORMANCE_ID
+OTHER(PROTOCOL_CONFORMANCE_XREF, 147)
+OTHER(MEMBERS, 148)
+OTHER(XREF, 149)
+OTHER(INLINABLE_BODY_TEXT, 150)
+OTHER(SELF_PROTOCOL_CONFORMANCE, 151)
+
+OTHER(XREF_OPAQUE_RETURN_TYPE_PATH_PIECE, 152)
+
+OTHER(CLANG_TYPE, 153)
+
+OTHER(DERIVATIVE_FUNCTION_CONFIGURATION, 154)
+
+OTHER(ERROR_FLAG, 155)
+
+#ifndef DECL_ATTR
+#define DECL_ATTR(NAME, CLASS, OPTIONS, CODE) RECORD_VAL(CLASS##_DECL_ATTR, 180+CODE)
+#endif
+#include "swift/AST/Attr.def"
 
 #undef RECORD
 #undef DECLTYPERECORDNODES_HAS_RECORD_VAL