Make room in the serialization decl block for more attributes.

Author: rjmccall

lib/Serialization/DeclTypeRecordNodes.def

@@ -140,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)
-OTHER(REQUIREMENT_SIGNATURE, 232)
-// 233 is unused; was 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)
-
-// 240 is unused; was ABSTRACT_PROTOCOL_CONFORMANCE
-OTHER(NORMAL_PROTOCOL_CONFORMANCE, 241)
-OTHER(SPECIALIZED_PROTOCOL_CONFORMANCE, 242)
-OTHER(INHERITED_PROTOCOL_CONFORMANCE, 243)
-// 244 is unused; was INVALID_PROTOCOL_CONFORMANCE
-
-OTHER(SIL_LAYOUT, 245)
-// 246 is unused; was NORMAL_PROTOCOL_CONFORMANCE_ID
-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

lib/Serialization/ModuleFormat.h

@@ -56,7 +56,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 = 673; // new schema for conformances
+const uint16_t SWIFTMODULE_VERSION_MINOR = 674; // decl block renumbering
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -959,7 +959,7 @@ namespace input_block {
 ///
 /// \sa DECLS_AND_TYPES_BLOCK_ID
 namespace decls_block {
-  enum RecordKind : uint8_t {
+  enum RecordKind : uint16_t {
 #define RECORD(Id) Id,
 #define RECORD_VAL(Id, Value) Id = Value,
 #include "DeclTypeRecordNodes.def"

lib/Serialization/Serialization.cpp

@@ -782,20 +782,34 @@ void SerializerBase::emitBlockID(unsigned ID, StringRef name,
 }
 
 void SerializerBase::emitRecordID(unsigned ID, StringRef name,
-                                  SmallVectorImpl<unsigned char> &nameBuffer) {
-  assert(ID < 256 && "can't fit record ID in next to name");
-  nameBuffer.resize(name.size()+1);
-  nameBuffer[0] = ID;
-  memcpy(nameBuffer.data()+1, name.data(), name.size());
-  Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETRECORDNAME, nameBuffer);
+                                  SmallVectorImpl<unsigned char> &nameBuffer,
+                                  SmallVectorImpl<unsigned> *wideNameBuffer) {
+  // Use the byte-based buffer if the ID is in range.
+  if (ID < 256) {
+    nameBuffer.resize(name.size()+1);
+    nameBuffer[0] = ID;
+    memcpy(nameBuffer.data()+1, name.data(), name.size());
+    Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETRECORDNAME, nameBuffer);
+
+  // Otherwise, we have to use the wide name buffer.
+  } else {
+    assert(wideNameBuffer && "too many IDs to use narrow name buffer");
+    auto &buffer = *wideNameBuffer;
+    buffer.resize(name.size()+1);
+    buffer[0] = ID;
+    for (unsigned i = 0, e = name.size(); i != e; ++i)
+      buffer[i+1] = name[i];
+    Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETRECORDNAME, buffer);
+  }
 }
 
 void Serializer::writeBlockInfoBlock() {
   BCBlockRAII restoreBlock(Out, llvm::bitc::BLOCKINFO_BLOCK_ID, 2);
 
   SmallVector<unsigned char, 64> nameBuffer;
+  SmallVector<unsigned, 32> wideNameBuffer;
 #define BLOCK(X) emitBlockID(X ## _ID, #X, nameBuffer)
-#define BLOCK_RECORD(K, X) emitRecordID(K::X, #X, nameBuffer)
+#define BLOCK_RECORD(K, X) emitRecordID(K::X, #X, nameBuffer, &wideNameBuffer)
 
   BLOCK(MODULE_BLOCK);
 

lib/Serialization/Serialization.h

@@ -66,7 +66,8 @@ class SerializerBase {
 
   /// Record the name of a record within a block.
   void emitRecordID(unsigned ID, StringRef name,
-                    SmallVectorImpl<unsigned char> &nameBuffer);
+                    SmallVectorImpl<unsigned char> &nameBuffer,
+                    SmallVectorImpl<unsigned> *wideNameBuffer = nullptr);
 
   void writeToStream(raw_ostream &os);