<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 9, 2015 at 1:08 PM, Mehdi Amini via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mehdi_amini<br>
Date: Wed Sep 9 15:08:51 2015<br>
New Revision: 247179<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=247179&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=247179&view=rev</a><br>
Log:<br>
EmitRecordWith* API change: takes an ArrayRef instead of a SmallVector (NFC)<br>
<br>
From: Mehdi Amini <<a href="mailto:mehdi.amini@apple.com">mehdi.amini@apple.com</a>><br>
<br>
Modified:<br>
  cfe/trunk/include/clang/Serialization/ASTWriter.h<br>
  cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp<br>
  cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
  cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Serialization/ASTWriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=247179&r1=247178&r2=247179&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=247179&r1=247178&r2=247179&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/ASTWriter.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/ASTWriter.h Wed Sep 9 15:08:51 2015<br>
@@ -84,6 +84,7 @@ class ASTWriter : public ASTDeserializat<br>
 public:<br>
  typedef SmallVector<uint64_t, 64> RecordData;<br>
  typedef SmallVectorImpl<uint64_t> RecordDataImpl;<br>
+Â typedef ArrayRef<uint64_t> RecordDataRef;<br>
<br>
  friend class ASTDeclWriter;<br>
  friend class ASTStmtWriter;<br>
@@ -756,7 +757,7 @@ public:<br>
  void AddPath(StringRef Path, RecordDataImpl &Record);<br>
<br>
  /// \brief Emit the current record with the given path as a blob.<br>
-Â void EmitRecordWithPath(unsigned Abbrev, RecordDataImpl &Record,<br>
+Â void EmitRecordWithPath(unsigned Abbrev, const RecordDataRef &Record,<br></blockquote><div><br></div><div>ArrayRefs are generally passed by value, like StringRefs.</div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
              StringRef Path);<br>
<br>
  /// \brief Add a version tuple to the given record<br>
<br>
Modified: cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp?rev=247179&r1=247178&r2=247179&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp?rev=247179&r1=247178&r2=247179&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp Wed Sep 9 15:08:51 2015<br>
@@ -51,6 +51,7 @@ public:<br>
<br>
 typedef SmallVector<uint64_t, 64> RecordData;<br>
 typedef SmallVectorImpl<uint64_t> RecordDataImpl;<br>
+typedef ArrayRef<uint64_t> RecordDataRef;<br>
<br>
 class SDiagsWriter;<br>
<br>
@@ -393,13 +394,9 @@ unsigned SDiagsWriter::getEmitFile(const<br>
<br>
  // Lazily generate the record for the file.<br>
  entry = State->Files.size();<br>
-Â RecordData Record;<br>
-Â Record.push_back(RECORD_FILENAME);<br>
-Â Record.push_back(entry);<br>
-Â Record.push_back(0); // For legacy.<br>
-Â Record.push_back(0); // For legacy.<br>
  StringRef Name(FileName);<br>
-Â Record.push_back(Name.size());<br>
+Â RecordDataRef Record = {RECORD_FILENAME, entry, 0 /* For legacy */,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â 0 /* For legacy */, Name.size()};<br></blockquote><div><br></div><div>I imagine this would produce a dangling reference, maybe? (the temporary initializer_list would go out-of-scope at the end of the full expression?) But I don't fully understand initializer_lists, to be fair.</div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
  State->Stream.EmitRecordWithBlob(State->Abbrevs.get(RECORD_FILENAME), Record,<br>
                  Name);<br>
<br>
@@ -412,7 +409,7 @@ void SDiagsWriter::EmitCharSourceRange(C<br>
  State->Record.push_back(RECORD_SOURCE_RANGE);<br>
  AddCharSourceRangeToRecord(R, State->Record, SM);<br>
  State->Stream.EmitRecordWithAbbrev(State->Abbrevs.get(RECORD_SOURCE_RANGE),<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â State->Record);<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â makeArrayRef(State->Record));<br></blockquote><div><br></div><div>What type is State->Record & why isn't it implicitly convertible to ArrayRef?</div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 }<br>
<br>
 /// \brief Emits the preamble of the diagnostics file.<br>
@@ -531,14 +528,11 @@ void SDiagsWriter::EmitBlockInfoBlock()<br>
<br>
 void SDiagsWriter::EmitMetaBlock() {<br>
  llvm::BitstreamWriter &Stream = State->Stream;<br>
-Â RecordData &Record = State->Record;<br>
  AbbreviationMap &Abbrevs = State->Abbrevs;<br>
<br>
  Stream.EnterSubblock(BLOCK_META, 3);<br>
-Â Record.clear();<br>
-Â Record.push_back(RECORD_VERSION);<br>
-Â Record.push_back(VersionNumber);<br>
-Â Stream.EmitRecordWithAbbrev(Abbrevs.get(RECORD_VERSION), Record);<br>
+Â RecordDataRef Record = {RECORD_VERSION, VersionNumber};<br></blockquote><div><br></div><div>Same (possible) lifetime issue here. (and several other cases through this change).<br><br>Even if there isn't a lifetime issue, I'd probably just pass these directly, rather than creating a named variable anyway. Probably.</div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+Â Stream.EmitRecordWithAbbrev(Abbrevs.get(RECORD_VERSION), Record);<br>
  Stream.ExitBlock();<br>
 }<br>
<br>
@@ -548,11 +542,8 @@ unsigned SDiagsWriter::getEmitCategory(u<br>
<br>
  // We use a local version of 'Record' so that we can be generating<br>
  // another record when we lazily generate one for the category entry.<br>
-Â RecordData Record;<br>
-Â Record.push_back(RECORD_CATEGORY);<br>
-Â Record.push_back(category);<br>
  StringRef catName = DiagnosticIDs::getCategoryNameFromID(category);<br>
-Â Record.push_back(catName.size());<br>
+Â RecordDataRef Record = {RECORD_CATEGORY, category, catName.size()};<br>
  State->Stream.EmitRecordWithBlob(State->Abbrevs.get(RECORD_CATEGORY), Record,<br>
                  catName);<br>
<br>
@@ -581,10 +572,7 @@ unsigned SDiagsWriter::getEmitDiagnostic<br>
   entry.second = FlagName;<br>
<br>
   // Lazily emit the string in a separate record.<br>
-Â Â RecordData Record;<br>
-Â Â Record.push_back(RECORD_DIAG_FLAG);<br>
-Â Â Record.push_back(entry.first);<br>
-Â Â Record.push_back(FlagName.size());<br>
+Â Â RecordDataRef Record = {RECORD_DIAG_FLAG, entry.first, FlagName.size()};<br>
   State->Stream.EmitRecordWithBlob(State->Abbrevs.get(RECORD_DIAG_FLAG),<br>
                   Record, FlagName);<br>
  }<br>
@@ -682,7 +670,8 @@ void SDiagsWriter::EmitDiagnosticMessage<br>
  }<br>
<br>
  Record.push_back(Message.size());<br>
-Â Stream.EmitRecordWithBlob(Abbrevs.get(RECORD_DIAG), Record, Message);<br>
+Â Stream.EmitRecordWithBlob(Abbrevs.get(RECORD_DIAG), makeArrayRef(Record),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Message);<br>
 }<br>
<br>
 void<br>
@@ -741,7 +730,7 @@ void SDiagsWriter::EmitCodeContext(Small<br>
   Record.push_back(RECORD_FIXIT);<br>
   AddCharSourceRangeToRecord(Fix.RemoveRange, Record, SM);<br>
   Record.push_back(Fix.CodeToInsert.size());<br>
-Â Â Stream.EmitRecordWithBlob(Abbrevs.get(RECORD_FIXIT), Record,<br>
+Â Â Stream.EmitRecordWithBlob(Abbrevs.get(RECORD_FIXIT), makeArrayRef(Record),<br>
                Fix.CodeToInsert);<br>
  }<br>
 }<br>
@@ -844,17 +833,9 @@ std::error_code SDiagsMerger::visitEndOf<br>
 std::error_code<br>
 SDiagsMerger::visitSourceRangeRecord(const serialized_diags::Location &Start,<br>
                   const serialized_diags::Location &End) {<br>
-Â RecordData Record;<br>
-Â Record.push_back(RECORD_SOURCE_RANGE);<br>
-Â Record.push_back(FileLookup[Start.FileID]);<br>
-Â Record.push_back(Start.Line);<br>
-Â Record.push_back(Start.Col);<br>
-Â Record.push_back(Start.Offset);<br>
-Â Record.push_back(FileLookup[End.FileID]);<br>
-Â Record.push_back(End.Line);<br>
-Â Record.push_back(End.Col);<br>
-Â Record.push_back(End.Offset);<br>
-<br>
+Â RecordDataRef Record = {<br>
+Â Â Â RECORD_SOURCE_RANGE, FileLookup[Start.FileID], Start.Line, Start.Col,<br>
+Â Â Â Start.Offset, FileLookup[End.FileID], End.Line, End.Col, End.Offset};<br>
  Writer.State->Stream.EmitRecordWithAbbrev(<br>
    Writer.State->Abbrevs.get(RECORD_SOURCE_RANGE), Record);<br>
  return std::error_code();<br>
@@ -863,19 +844,13 @@ SDiagsMerger::visitSourceRangeRecord(con<br>
 std::error_code SDiagsMerger::visitDiagnosticRecord(<br>
   unsigned Severity, const serialized_diags::Location &Location,<br>
   unsigned Category, unsigned Flag, StringRef Message) {<br>
-Â RecordData MergedRecord;<br>
-Â MergedRecord.push_back(RECORD_DIAG);<br>
-Â MergedRecord.push_back(Severity);<br>
-Â MergedRecord.push_back(FileLookup[Location.FileID]);<br>
-Â MergedRecord.push_back(Location.Line);<br>
-Â MergedRecord.push_back(Location.Col);<br>
-Â MergedRecord.push_back(Location.Offset);<br>
-Â MergedRecord.push_back(CategoryLookup[Category]);<br>
-Â MergedRecord.push_back(Flag ? DiagFlagLookup[Flag] : 0);<br>
-Â MergedRecord.push_back(Message.size());<br>
+Â RecordDataRef Record = {RECORD_DIAG, Severity, FileLookup[Location.FileID],<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Location.Line, Location.Col, Location.Offset,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â CategoryLookup[Category],<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Flag ? DiagFlagLookup[Flag] : 0, Message.size()};<br>
<br>
  Writer.State->Stream.EmitRecordWithBlob(<br>
-Â Â Â Writer.State->Abbrevs.get(RECORD_DIAG), MergedRecord, Message);<br>
+Â Â Â Writer.State->Abbrevs.get(RECORD_DIAG), Record, Message);<br>
  return std::error_code();<br>
 }<br>
<br>
@@ -883,17 +858,9 @@ std::error_code<br>
 SDiagsMerger::visitFixitRecord(const serialized_diags::Location &Start,<br>
                const serialized_diags::Location &End,<br>
                StringRef Text) {<br>
-Â RecordData Record;<br>
-Â Record.push_back(RECORD_FIXIT);<br>
-Â Record.push_back(FileLookup[Start.FileID]);<br>
-Â Record.push_back(Start.Line);<br>
-Â Record.push_back(Start.Col);<br>
-Â Record.push_back(Start.Offset);<br>
-Â Record.push_back(FileLookup[End.FileID]);<br>
-Â Record.push_back(End.Line);<br>
-Â Record.push_back(End.Col);<br>
-Â Record.push_back(End.Offset);<br>
-Â Record.push_back(Text.size());<br>
+Â RecordDataRef Record = {RECORD_FIXIT, FileLookup[Start.FileID], Start.Line,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Start.Col, Start.Offset, FileLookup[End.FileID],<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â End.Line, End.Col, End.Offset, Text.size()};<br>
<br>
  Writer.State->Stream.EmitRecordWithBlob(<br>
    Writer.State->Abbrevs.get(RECORD_FIXIT), Record, Text);<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=247179&r1=247178&r2=247179&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=247179&r1=247178&r2=247179&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Wed Sep 9 15:08:51 2015<br>
@@ -1171,8 +1171,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
                  const std::string &OutputFile) {<br>
  using namespace llvm;<br>
  Stream.EnterSubblock(CONTROL_BLOCK_ID, 5);<br>
-Â RecordData Record;<br>
-<br>
+<br>
  // Metadata<br>
  BitCodeAbbrev *MetadataAbbrev = new BitCodeAbbrev();<br>
  MetadataAbbrev->Add(BitCodeAbbrevOp(METADATA));<br>
@@ -1185,27 +1184,23 @@ void ASTWriter::WriteControlBlock(Prepro<br>
  MetadataAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // Errors<br>
  MetadataAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // SVN branch/tag<br>
  unsigned MetadataAbbrevCode = Stream.EmitAbbrev(MetadataAbbrev);<br>
-Â Record.push_back(METADATA);<br>
-Â Record.push_back(VERSION_MAJOR);<br>
-Â Record.push_back(VERSION_MINOR);<br>
-Â Record.push_back(CLANG_VERSION_MAJOR);<br>
-Â Record.push_back(CLANG_VERSION_MINOR);<br>
  assert((!WritingModule || isysroot.empty()) &&<br>
     "writing module as a relocatable PCH?");<br>
-Â Record.push_back(!isysroot.empty());<br>
-Â Record.push_back(IncludeTimestamps);<br>
-Â Record.push_back(ASTHasCompilerErrors);<br>
-Â Stream.EmitRecordWithBlob(MetadataAbbrevCode, Record,<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â getClangFullRepositoryVersion());<br>
-<br>
+Â {<br>
+Â Â RecordDataRef Record = {METADATA, VERSION_MAJOR, VERSION_MINOR,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â CLANG_VERSION_MAJOR, CLANG_VERSION_MINOR,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â !isysroot.empty(), IncludeTimestamps,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â ASTHasCompilerErrors};<br>
+Â Â Stream.EmitRecordWithBlob(MetadataAbbrevCode, Record,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â getClangFullRepositoryVersion());<br>
+Â }<br>
  if (WritingModule) {<br>
   // For implicit modules we output a signature that we can use to ensure<br>
   // duplicate module builds don't collide in the cache as their output order<br>
   // is non-deterministic.<br>
   // FIXME: Remove this when output is deterministic.<br>
   if (Context.getLangOpts().ImplicitModules) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(getSignature());<br>
+Â Â Â RecordData Record = {getSignature()};<br>
    Stream.EmitRecord(SIGNATURE, Record);<br>
   }<br>
<br>
@@ -1214,8 +1209,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
   Abbrev->Add(BitCodeAbbrevOp(MODULE_NAME));<br>
   Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // Name<br>
   unsigned AbbrevCode = Stream.EmitAbbrev(Abbrev);<br>
-Â Â RecordData Record;<br>
-Â Â Record.push_back(MODULE_NAME);<br>
+Â Â RecordDataRef Record = {MODULE_NAME};<br>
   Stream.EmitRecordWithBlob(AbbrevCode, Record, WritingModule->Name);<br>
  }<br>
<br>
@@ -1236,8 +1230,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
    Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // Directory<br>
    unsigned AbbrevCode = Stream.EmitAbbrev(Abbrev);<br>
<br>
-Â Â Â RecordData Record;<br>
-Â Â Â Record.push_back(MODULE_DIRECTORY);<br>
+Â Â Â RecordDataRef Record = {MODULE_DIRECTORY};<br>
    Stream.EmitRecordWithBlob(AbbrevCode, Record, BaseDir);<br>
   }<br>
<br>
@@ -1250,7 +1243,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
<br>
  // Module map file<br>
  if (WritingModule) {<br>
-Â Â Record.clear();<br>
+Â Â RecordData Record;<br>
<br>
   auto &Map = PP.getHeaderSearchInfo().getModuleMap();<br>
<br>
@@ -1273,7 +1266,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
  // Imports<br>
  if (Chain) {<br>
   serialization::ModuleManager &Mgr = Chain->getModuleManager();<br>
-Â Â Record.clear();<br>
+Â Â RecordData Record;<br>
<br>
   for (auto *M : Mgr) {<br>
    // Skip modules that weren't directly imported.<br>
@@ -1294,7 +1287,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
  Stream.EnterSubblock(OPTIONS_BLOCK_ID, 4);<br>
<br>
  // Language options.<br>
-Â Record.clear();<br>
+Â RecordData Record;<br>
  const LangOptions &LangOpts = Context.getLangOpts();<br>
 #define LANGOPT(Name, Bits, Default, Description) \<br>
  Record.push_back(LangOpts.Name);<br>
@@ -1466,8 +1459,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
   SM.getFileManager().makeAbsolutePath(OutputPath);<br>
   StringRef origDir = llvm::sys::path::parent_path(OutputPath);<br>
<br>
-Â Â RecordData Record;<br>
-Â Â Record.push_back(ORIGINAL_PCH_DIR);<br>
+Â Â RecordDataRef Record = {ORIGINAL_PCH_DIR};<br>
   Stream.EmitRecordWithBlob(AbbrevCode, Record, origDir);<br>
  }<br>
<br>
@@ -1491,8 +1483,7 @@ void ASTWriter::WriteInputFiles(SourceMa<br>
                 bool Modules) {<br>
  using namespace llvm;<br>
  Stream.EnterSubblock(INPUT_FILES_BLOCK_ID, 4);<br>
-Â RecordData Record;<br>
-<br>
+<br>
  // Create input-file abbreviation.<br>
  BitCodeAbbrev *IFAbbrev = new BitCodeAbbrev();<br>
  IFAbbrev->Add(BitCodeAbbrevOp(INPUT_FILE));<br>
@@ -1547,16 +1538,11 @@ void ASTWriter::WriteInputFiles(SourceMa<br>
   if (!Entry.IsSystemFile)<br>
    ++UserFilesNum;<br>
<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(INPUT_FILE);<br>
-Â Â Record.push_back(InputFileOffsets.size());<br>
-<br>
   // Emit size/modification time for this file.<br>
-Â Â Record.push_back(Entry.File->getSize());<br>
-Â Â Record.push_back(getTimestampForOutput(Entry.File));<br>
-<br>
-Â Â // Whether this file was overridden.<br>
-Â Â Record.push_back(Entry.BufferOverridden);<br>
+Â Â // And whether this file was overridden.<br>
+Â Â RecordDataRef Record = {<br>
+Â Â Â Â INPUT_FILE, InputFileOffsets.size(), (uint64_t)Entry.File->getSize(),<br>
+Â Â Â Â (uint64_t)getTimestampForOutput(Entry.File), Entry.BufferOverridden};<br>
<br>
   EmitRecordWithPath(IFAbbrevCode, Record, Entry.File->getName());<br>
  }<br>
@@ -1573,10 +1559,8 @@ void ASTWriter::WriteInputFiles(SourceMa<br>
  unsigned OffsetsAbbrevCode = Stream.EmitAbbrev(OffsetsAbbrev);<br>
<br>
  // Write input file offsets.<br>
-Â Record.clear();<br>
-Â Record.push_back(INPUT_FILE_OFFSETS);<br>
-Â Record.push_back(InputFileOffsets.size());<br>
-Â Record.push_back(UserFilesNum);<br>
+Â RecordDataRef Record = {INPUT_FILE_OFFSETS, InputFileOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â UserFilesNum};<br>
  Stream.EmitRecordWithBlob(OffsetsAbbrevCode, Record, bytes(InputFileOffsets));<br>
 }<br>
<br>
@@ -1818,11 +1802,8 @@ void ASTWriter::WriteHeaderSearch(const<br>
  unsigned TableAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
  // Write the header search table<br>
-Â RecordData Record;<br>
-Â Record.push_back(HEADER_SEARCH_TABLE);<br>
-Â Record.push_back(BucketOffset);<br>
-Â Record.push_back(NumHeaderSearchEntries);<br>
-Â Record.push_back(TableData.size());<br>
+Â RecordDataRef Record = {HEADER_SEARCH_TABLE, BucketOffset,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â NumHeaderSearchEntries, TableData.size()};<br>
  TableData.append(GeneratorTrait.strings_begin(),GeneratorTrait.strings_end());<br>
  Stream.EmitRecordWithBlob(TableAbbrev, Record, TableData);<br>
<br>
@@ -1907,12 +1888,11 @@ void ASTWriter::WriteSourceManagerBlock(<br>
      Record.push_back(0);<br>
      Record.push_back(0);<br>
     }<br>
-<br>
-Â Â Â Â Stream.EmitRecordWithAbbrev(SLocFileAbbrv, Record);<br>
-<br>
+<br>
+Â Â Â Â Stream.EmitRecordWithAbbrev(SLocFileAbbrv, makeArrayRef(Record));<br>
+<br>
     if (Content->BufferOverridden) {<br>
-Â Â Â Â Â Record.clear();<br>
-Â Â Â Â Â Record.push_back(SM_SLOC_BUFFER_BLOB);<br>
+Â Â Â Â Â RecordDataRef Record = {SM_SLOC_BUFFER_BLOB};<br>
      const llvm::MemoryBuffer *Buffer<br>
       = Content->getBuffer(PP.getDiagnostics(), PP.getSourceManager());<br>
      Stream.EmitRecordWithBlob(SLocBufferBlobAbbrv, Record,<br>
@@ -1929,10 +1909,9 @@ void ASTWriter::WriteSourceManagerBlock(<br>
     const llvm::MemoryBuffer *Buffer<br>
      = Content->getBuffer(PP.getDiagnostics(), PP.getSourceManager());<br>
     const char *Name = Buffer->getBufferIdentifier();<br>
-Â Â Â Â Stream.EmitRecordWithBlob(SLocBufferAbbrv, Record,<br>
+Â Â Â Â Stream.EmitRecordWithBlob(SLocBufferAbbrv, makeArrayRef(Record),<br>
                  StringRef(Name, strlen(Name) + 1));<br>
-Â Â Â Â Record.clear();<br>
-Â Â Â Â Record.push_back(SM_SLOC_BUFFER_BLOB);<br>
+Â Â Â Â RecordDataRef Record = {SM_SLOC_BUFFER_BLOB};<br>
     Stream.EmitRecordWithBlob(SLocBufferBlobAbbrv, Record,<br>
                  StringRef(Buffer->getBufferStart(),<br>
                          Buffer->getBufferSize() + 1));<br>
@@ -1954,7 +1933,7 @@ void ASTWriter::WriteSourceManagerBlock(<br>
    if (I + 1 != N)<br>
     NextOffset = SourceMgr.getLocalSLocEntry(I + 1).getOffset();<br>
    Record.push_back(NextOffset - SLoc->getOffset() - 1);<br>
-Â Â Â Stream.EmitRecordWithAbbrev(SLocExpansionAbbrv, Record);<br>
+Â Â Â Stream.EmitRecordWithAbbrev(SLocExpansionAbbrv, makeArrayRef(Record));<br>
   }<br>
  }<br>
<br>
@@ -1972,13 +1951,13 @@ void ASTWriter::WriteSourceManagerBlock(<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 16)); // total size<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // offsets<br>
  unsigned SLocOffsetsAbbrev = Stream.EmitAbbrev(Abbrev);<br>
-<br>
-Â Record.clear();<br>
-Â Record.push_back(SOURCE_LOCATION_OFFSETS);<br>
-Â Record.push_back(SLocEntryOffsets.size());<br>
-Â Record.push_back(SourceMgr.getNextLocalOffset() - 1); // skip dummy<br>
-Â Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record, bytes(SLocEntryOffsets));<br>
-<br>
+Â {<br>
+Â Â RecordDataRef Record = {SOURCE_LOCATION_OFFSETS, SLocEntryOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â SourceMgr.getNextLocalOffset() -<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 1 /* skip dummy */};<br>
+Â Â Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(SLocEntryOffsets));<br>
+Â }<br>
  // Write the source location entry preloads array, telling the AST<br>
  // reader which source locations entries it should load eagerly.<br>
  Stream.EmitRecord(SOURCE_LOCATION_PRELOADS, PreloadSLocs);<br>
@@ -2232,12 +2211,11 @@ void ASTWriter::WritePreprocessor(const<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob));<br>
<br>
  unsigned MacroOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
-Â Record.clear();<br>
-Â Record.push_back(MACRO_OFFSET);<br>
-Â Record.push_back(MacroOffsets.size());<br>
-Â Record.push_back(FirstMacroID - NUM_PREDEF_MACRO_IDS);<br>
-Â Stream.EmitRecordWithBlob(MacroOffsetAbbrev, Record,<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(MacroOffsets));<br>
+Â {<br>
+Â Â RecordDataRef Record = {MACRO_OFFSET, MacroOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â FirstMacroID - NUM_PREDEF_MACRO_IDS};<br>
+Â Â Stream.EmitRecordWithBlob(MacroOffsetAbbrev, Record, bytes(MacroOffsets));<br>
+Â }<br>
 }<br>
<br>
 void ASTWriter::WritePreprocessorDetail(PreprocessingRecord &PPRec) {<br>
@@ -2311,7 +2289,7 @@ void ASTWriter::WritePreprocessorDetail(<br>
    // we create a PCH even with compiler errors.<br>
    if (ID->getFile())<br>
     Buffer += ID->getFile()->getName();<br>
-Â Â Â Stream.EmitRecordWithBlob(InclusionAbbrev, Record, Buffer);<br>
+Â Â Â Stream.EmitRecordWithBlob(InclusionAbbrev, makeArrayRef(Record), Buffer);<br>
    continue;<br>
   }<br>
<br>
@@ -2331,9 +2309,8 @@ void ASTWriter::WritePreprocessorDetail(<br>
   Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob));<br>
   unsigned PPEOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(PPD_ENTITIES_OFFSETS);<br>
-Â Â Record.push_back(FirstPreprocessorEntityID - NUM_PREDEF_PP_ENTITY_IDS);<br>
+Â Â RecordDataRef Record = {PPD_ENTITIES_OFFSETS, FirstPreprocessorEntityID -<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â NUM_PREDEF_PP_ENTITY_IDS};<br>
   Stream.EmitRecordWithBlob(PPEOffsetAbbrev, Record,<br>
                bytes(PreprocessedEntityOffsets));<br>
  }<br>
@@ -2472,45 +2449,37 @@ void ASTWriter::WriteSubmodules(Module *<br>
   Module *Mod = Q.front();<br>
   Q.pop();<br>
   unsigned ID = getSubmoduleID(Mod);<br>
-<br>
-Â Â // Emit the definition of the block.<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(SUBMODULE_DEFINITION);<br>
-Â Â Record.push_back(ID);<br>
+<br>
+Â Â uint64_t ParentID = 0;<br>
   if (Mod->Parent) {<br>
    assert(SubmoduleIDs[Mod->Parent] && "Submodule parent not written?");<br>
-Â Â Â Record.push_back(SubmoduleIDs[Mod->Parent]);<br>
-Â Â } else {<br>
-Â Â Â Record.push_back(0);<br>
+Â Â Â ParentID = SubmoduleIDs[Mod->Parent];<br>
   }<br>
-Â Â Record.push_back(Mod->IsFramework);<br>
-Â Â Record.push_back(Mod->IsExplicit);<br>
-Â Â Record.push_back(Mod->IsSystem);<br>
-Â Â Record.push_back(Mod->IsExternC);<br>
-Â Â Record.push_back(Mod->InferSubmodules);<br>
-Â Â Record.push_back(Mod->InferExplicitSubmodules);<br>
-Â Â Record.push_back(Mod->InferExportWildcard);<br>
-Â Â Record.push_back(Mod->ConfigMacrosExhaustive);<br>
-Â Â Stream.EmitRecordWithBlob(DefinitionAbbrev, Record, Mod->Name);<br>
-<br>
+<br>
+Â Â // Emit the definition of the block.<br>
+Â Â {<br>
+Â Â Â RecordDataRef Record = {<br>
+Â Â Â Â Â SUBMODULE_DEFINITION, ID, ParentID, Mod->IsFramework, Mod->IsExplicit,<br>
+Â Â Â Â Â Mod->IsSystem, Mod->IsExternC, Mod->InferSubmodules,<br>
+Â Â Â Â Â Mod->InferExplicitSubmodules, Mod->InferExportWildcard,<br>
+Â Â Â Â Â Mod->ConfigMacrosExhaustive};<br>
+Â Â Â Stream.EmitRecordWithBlob(DefinitionAbbrev, Record, Mod->Name);<br>
+Â Â }<br>
+<br>
   // Emit the requirements.<br>
   for (const auto &R : Mod->Requirements) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_REQUIRES);<br>
-Â Â Â Record.push_back(R.second);<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_REQUIRES, R.second};<br>
    Stream.EmitRecordWithBlob(RequiresAbbrev, Record, R.first);<br>
   }<br>
<br>
   // Emit the umbrella header, if there is one.<br>
   if (auto UmbrellaHeader = Mod->getUmbrellaHeader()) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_UMBRELLA_HEADER);<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_UMBRELLA_HEADER};<br>
    Stream.EmitRecordWithBlob(UmbrellaAbbrev, Record,<br>
                 UmbrellaHeader.NameAsWritten);<br>
   } else if (auto UmbrellaDir = Mod->getUmbrellaDir()) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_UMBRELLA_DIR);<br>
-Â Â Â Stream.EmitRecordWithBlob(UmbrellaDirAbbrev, Record,<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_UMBRELLA_DIR};<br>
+Â Â Â Stream.EmitRecordWithBlob(UmbrellaDirAbbrev, Record,<br>
                 UmbrellaDir.NameAsWritten);<br>
   }<br>
<br>
@@ -2528,8 +2497,7 @@ void ASTWriter::WriteSubmodules(Module *<br>
    {SUBMODULE_EXCLUDED_HEADER, ExcludedHeaderAbbrev, Module::HK_Excluded}<br>
   };<br>
   for (auto &HL : HeaderLists) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(HL.RecordKind);<br>
+Â Â Â RecordDataRef Record = {HL.RecordKind};<br>
    for (auto &H : Mod->Headers[HL.HeaderKind])<br>
     Stream.EmitRecordWithBlob(HL.Abbrev, Record, H.NameAsWritten);<br>
   }<br>
@@ -2537,15 +2505,14 @@ void ASTWriter::WriteSubmodules(Module *<br>
   // Emit the top headers.<br>
   {<br>
    auto TopHeaders = Mod->getTopHeaders(PP->getFileManager());<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_TOPHEADER);<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_TOPHEADER};<br>
    for (auto *H : TopHeaders)<br>
     Stream.EmitRecordWithBlob(TopHeaderAbbrev, Record, H->getName());<br>
   }<br>
<br>
   // Emit the imports.<br>
   if (!Mod->Imports.empty()) {<br>
-Â Â Â Record.clear();<br>
+Â Â Â RecordData Record;<br>
    for (auto *I : Mod->Imports)<br>
     Record.push_back(getSubmoduleID(I));<br>
    Stream.EmitRecord(SUBMODULE_IMPORTS, Record);<br>
@@ -2553,7 +2520,7 @@ void ASTWriter::WriteSubmodules(Module *<br>
<br>
   // Emit the exports.<br>
   if (!Mod->Exports.empty()) {<br>
-Â Â Â Record.clear();<br>
+Â Â Â RecordData Record;<br>
    for (const auto &E : Mod->Exports) {<br>
     // FIXME: This may fail; we don't require that all exported modules<br>
     // are local or imported.<br>
@@ -2569,26 +2536,21 @@ void ASTWriter::WriteSubmodules(Module *<br>
<br>
   // Emit the link libraries.<br>
   for (const auto &LL : Mod->LinkLibraries) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_LINK_LIBRARY);<br>
-Â Â Â Record.push_back(LL.IsFramework);<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_LINK_LIBRARY, LL.IsFramework};<br>
    Stream.EmitRecordWithBlob(LinkLibraryAbbrev, Record, LL.Library);<br>
   }<br>
<br>
   // Emit the conflicts.<br>
   for (const auto &C : Mod->Conflicts) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_CONFLICT);<br>
    // FIXME: This may fail; we don't require that all conflicting modules<br>
    // are local or imported.<br>
-Â Â Â Record.push_back(getSubmoduleID(C.Other));<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_CONFLICT, getSubmoduleID(C.Other)};<br>
    Stream.EmitRecordWithBlob(ConflictAbbrev, Record, C.Message);<br>
   }<br>
<br>
   // Emit the configuration macros.<br>
   for (const auto &CM : Mod->ConfigMacros) {<br>
-Â Â Â Record.clear();<br>
-Â Â Â Record.push_back(SUBMODULE_CONFIG_MACRO);<br>
+Â Â Â RecordDataRef Record = {SUBMODULE_CONFIG_MACRO};<br>
    Stream.EmitRecordWithBlob(ConfigMacroAbbrev, Record, CM);<br>
   }<br>
<br>
@@ -2670,8 +2632,6 @@ void ASTWriter::WriteCXXCtorInitializers<br>
  if (CXXCtorInitializersOffsets.empty())<br>
   return;<br>
<br>
-Â RecordData Record;<br>
-<br>
  // Create a blob abbreviation for the C++ ctor initializer offsets.<br>
  using namespace llvm;<br>
<br>
@@ -2682,9 +2642,8 @@ void ASTWriter::WriteCXXCtorInitializers<br>
  unsigned CtorInitializersOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
  // Write the base specifier offsets table.<br>
-Â Record.clear();<br>
-Â Record.push_back(CXX_CTOR_INITIALIZERS_OFFSETS);<br>
-Â Record.push_back(CXXCtorInitializersOffsets.size());<br>
+Â RecordDataRef Record = {CXX_CTOR_INITIALIZERS_OFFSETS,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â CXXCtorInitializersOffsets.size()};<br>
  Stream.EmitRecordWithBlob(CtorInitializersOffsetAbbrev, Record,<br>
               bytes(CXXCtorInitializersOffsets));<br>
 }<br>
@@ -2693,8 +2652,6 @@ void ASTWriter::WriteCXXBaseSpecifiersOf<br>
  if (CXXBaseSpecifiersOffsets.empty())<br>
   return;<br>
<br>
-Â RecordData Record;<br>
-<br>
  // Create a blob abbreviation for the C++ base specifiers offsets.<br>
  using namespace llvm;<br>
<br>
@@ -2705,9 +2662,8 @@ void ASTWriter::WriteCXXBaseSpecifiersOf<br>
  unsigned BaseSpecifierOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
  // Write the base specifier offsets table.<br>
-Â Record.clear();<br>
-Â Record.push_back(CXX_BASE_SPECIFIER_OFFSETS);<br>
-Â Record.push_back(CXXBaseSpecifiersOffsets.size());<br>
+Â RecordDataRef Record = {CXX_BASE_SPECIFIER_OFFSETS,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â CXXBaseSpecifiersOffsets.size()};<br>
  Stream.EmitRecordWithBlob(BaseSpecifierOffsetAbbrev, Record,<br>
               bytes(CXXBaseSpecifiersOffsets));<br>
 }<br>
@@ -2778,8 +2734,6 @@ uint64_t ASTWriter::WriteDeclContextLexi<br>
   return 0;<br>
<br>
  uint64_t Offset = Stream.GetCurrentBitNo();<br>
-Â RecordData Record;<br>
-Â Record.push_back(DECL_CONTEXT_LEXICAL);<br>
  SmallVector<uint32_t, 128> KindDeclPairs;<br>
  for (const auto *D : DC->decls()) {<br>
   KindDeclPairs.push_back(D->getKind());<br>
@@ -2787,6 +2741,7 @@ uint64_t ASTWriter::WriteDeclContextLexi<br>
  }<br>
<br>
  ++NumLexicalDeclContexts;<br>
+Â RecordDataRef Record = {DECL_CONTEXT_LEXICAL};<br>
  Stream.EmitRecordWithBlob(DeclContextLexicalAbbrev, Record,<br>
               bytes(KindDeclPairs));<br>
  return Offset;<br>
@@ -2794,7 +2749,6 @@ uint64_t ASTWriter::WriteDeclContextLexi<br>
<br>
 void ASTWriter::WriteTypeDeclOffsets() {<br>
  using namespace llvm;<br>
-Â RecordData Record;<br>
<br>
  // Write the type offsets array<br>
  BitCodeAbbrev *Abbrev = new BitCodeAbbrev();<br>
@@ -2803,11 +2757,11 @@ void ASTWriter::WriteTypeDeclOffsets() {<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // base type index<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // types block<br>
  unsigned TypeOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
-Â Record.clear();<br>
-Â Record.push_back(TYPE_OFFSET);<br>
-Â Record.push_back(TypeOffsets.size());<br>
-Â Record.push_back(FirstTypeID - NUM_PREDEF_TYPE_IDS);<br>
-Â Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, bytes(TypeOffsets));<br>
+Â {<br>
+Â Â RecordDataRef Record = {TYPE_OFFSET, TypeOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â FirstTypeID - NUM_PREDEF_TYPE_IDS};<br>
+Â Â Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, bytes(TypeOffsets));<br>
+Â }<br>
<br>
  // Write the declaration offsets array<br>
  Abbrev = new BitCodeAbbrev();<br>
@@ -2816,16 +2770,15 @@ void ASTWriter::WriteTypeDeclOffsets() {<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // base decl ID<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // declarations block<br>
  unsigned DeclOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
-Â Record.clear();<br>
-Â Record.push_back(DECL_OFFSET);<br>
-Â Record.push_back(DeclOffsets.size());<br>
-Â Record.push_back(FirstDeclID - NUM_PREDEF_DECL_IDS);<br>
-Â Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, bytes(DeclOffsets));<br>
+Â {<br>
+Â Â RecordDataRef Record = {DECL_OFFSET, DeclOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â FirstDeclID - NUM_PREDEF_DECL_IDS};<br>
+Â Â Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, bytes(DeclOffsets));<br>
+Â }<br>
 }<br>
<br>
 void ASTWriter::WriteFileDeclIDsMap() {<br>
  using namespace llvm;<br>
-Â RecordData Record;<br>
<br>
  SmallVector<std::pair<FileID, DeclIDInFileInfo *>, 64> SortedFileDeclIDs(<br>
    FileDeclIDs.begin(), FileDeclIDs.end());<br>
@@ -2846,8 +2799,7 @@ void ASTWriter::WriteFileDeclIDsMap() {<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32));<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob));<br>
  unsigned AbbrevCode = Stream.EmitAbbrev(Abbrev);<br>
-Â Record.push_back(FILE_SORTED_DECLS);<br>
-Â Record.push_back(FileGroupedDeclIDs.size());<br>
+Â RecordDataRef Record = {FILE_SORTED_DECLS, FileGroupedDeclIDs.size()};<br>
  Stream.EmitRecordWithBlob(AbbrevCode, Record, bytes(FileGroupedDeclIDs));<br>
 }<br>
<br>
@@ -3057,11 +3009,10 @@ void ASTWriter::WriteSelectors(Sema &Sem<br>
   unsigned MethodPoolAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
   // Write the method pool<br>
-Â Â RecordData Record;<br>
-Â Â Record.push_back(METHOD_POOL);<br>
-Â Â Record.push_back(BucketOffset);<br>
-Â Â Record.push_back(NumTableEntries);<br>
-Â Â Stream.EmitRecordWithBlob(MethodPoolAbbrev, Record, MethodPool);<br>
+Â Â {<br>
+Â Â Â RecordDataRef Record = {METHOD_POOL, BucketOffset, NumTableEntries};<br>
+Â Â Â Stream.EmitRecordWithBlob(MethodPoolAbbrev, Record, MethodPool);<br>
+Â Â }<br>
<br>
   // Create a blob abbreviation for the selector table offsets.<br>
   Abbrev = new BitCodeAbbrev();<br>
@@ -3072,12 +3023,12 @@ void ASTWriter::WriteSelectors(Sema &Sem<br>
   unsigned SelectorOffsetAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
   // Write the selector offsets table.<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(SELECTOR_OFFSETS);<br>
-Â Â Record.push_back(SelectorOffsets.size());<br>
-Â Â Record.push_back(FirstSelectorID - NUM_PREDEF_SELECTOR_IDS);<br>
-Â Â Stream.EmitRecordWithBlob(SelectorOffsetAbbrev, Record,<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(SelectorOffsets));<br>
+Â Â {<br>
+Â Â Â RecordDataRef Record = {SELECTOR_OFFSETS, SelectorOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â FirstSelectorID - NUM_PREDEF_SELECTOR_IDS};<br>
+Â Â Â Stream.EmitRecordWithBlob(SelectorOffsetAbbrev, Record,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(SelectorOffsets));<br>
+Â Â }<br>
  }<br>
 }<br>
<br>
@@ -3347,9 +3298,7 @@ void ASTWriter::WriteIdentifierTable(Pre<br>
   unsigned IDTableAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
   // Write the identifier table<br>
-Â Â RecordData Record;<br>
-Â Â Record.push_back(IDENTIFIER_TABLE);<br>
-Â Â Record.push_back(BucketOffset);<br>
+Â Â RecordDataRef Record = {IDENTIFIER_TABLE, BucketOffset};<br>
   Stream.EmitRecordWithBlob(IDTableAbbrev, Record, IdentifierTable);<br>
  }<br>
<br>
@@ -3365,11 +3314,9 @@ void ASTWriter::WriteIdentifierTable(Pre<br>
  for (unsigned I = 0, N = IdentifierOffsets.size(); I != N; ++I)<br>
   assert(IdentifierOffsets[I] && "Missing identifier offset?");<br>
 #endif<br>
-<br>
-Â RecordData Record;<br>
-Â Record.push_back(IDENTIFIER_OFFSET);<br>
-Â Record.push_back(IdentifierOffsets.size());<br>
-Â Record.push_back(FirstIdentID - NUM_PREDEF_IDENT_IDS);<br>
+<br>
+Â RecordDataRef Record = {IDENTIFIER_OFFSET, IdentifierOffsets.size(),<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â FirstIdentID - NUM_PREDEF_IDENT_IDS};<br>
  Stream.EmitRecordWithBlob(IdentifierOffsetAbbrev, Record,<br>
               bytes(IdentifierOffsets));<br>
<br>
@@ -3785,8 +3732,7 @@ uint64_t ASTWriter::WriteDeclContextVisi<br>
  GenerateNameLookupTable(DC, LookupTable);<br>
<br>
  // Write the lookup table<br>
-Â RecordData Record;<br>
-Â Record.push_back(DECL_CONTEXT_VISIBLE);<br>
+Â RecordDataRef Record = {DECL_CONTEXT_VISIBLE};<br>
  Stream.EmitRecordWithBlob(DeclContextVisibleLookupAbbrev, Record,<br>
               LookupTable);<br>
  ++NumVisibleDeclContexts;<br>
@@ -3817,9 +3763,7 @@ void ASTWriter::WriteDeclContextVisibleU<br>
   DC = cast<DeclContext>(Chain->getKeyDeclaration(cast<Decl>(DC)));<br>
<br>
  // Write the lookup table<br>
-Â RecordData Record;<br>
-Â Record.push_back(UPDATE_VISIBLE);<br>
-Â Record.push_back(getDeclID(cast<Decl>(DC)));<br>
+Â RecordDataRef Record = {UPDATE_VISIBLE, getDeclID(cast<Decl>(DC))};<br>
  Stream.EmitRecordWithBlob(UpdateVisibleAbbrev, Record, LookupTable);<br>
 }<br>
<br>
@@ -3883,14 +3827,12 @@ void ASTWriter::WriteObjCCategories() {<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // # of entries<br>
  Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob));<br>
  unsigned AbbrevID = Stream.EmitAbbrev(Abbrev);<br>
-<br>
-Â RecordData Record;<br>
-Â Record.push_back(OBJC_CATEGORIES_MAP);<br>
-Â Record.push_back(CategoriesMap.size());<br>
-Â Stream.EmitRecordWithBlob(AbbrevID, Record,<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â reinterpret_cast<char*>(CategoriesMap.data()),<br>
+<br>
+Â RecordDataRef Record = {OBJC_CATEGORIES_MAP, CategoriesMap.size()};<br>
+Â Stream.EmitRecordWithBlob(AbbrevID, Record,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â reinterpret_cast<char *>(CategoriesMap.data()),<br>
               CategoriesMap.size() * sizeof(ObjCCategoriesInfo));<br>
-<br>
+<br>
  // Emit the category lists.<br>
  Stream.EmitRecord(OBJC_CATEGORIES, Categories);<br>
 }<br>
@@ -3987,7 +3929,7 @@ void ASTWriter::AddPath(StringRef Path,<br>
  AddString(FilePath, Record);<br>
 }<br>
<br>
-void ASTWriter::EmitRecordWithPath(unsigned Abbrev, RecordDataImpl &Record,<br>
+void ASTWriter::EmitRecordWithPath(unsigned Abbrev, const RecordDataRef &Record,<br>
                  StringRef Path) {<br>
  SmallString<128> FilePath(Path);<br>
  PreparePathForOutput(FilePath);<br>
@@ -4250,14 +4192,14 @@ void ASTWriter::WriteASTCore(Sema &SemaR<br>
  WriteControlBlock(PP, Context, isysroot, OutputFile);<br>
<br>
  // Write the remaining AST contents.<br>
-Â RecordData Record;<br>
  Stream.EnterSubblock(AST_BLOCK_ID, 5);<br>
<br>
  // This is so that older clang versions, before the introduction<br>
  // of the control block, can read and reject the newer PCH format.<br>
-Â Record.clear();<br>
-Â Record.push_back(VERSION_MAJOR);<br>
-Â Stream.EmitRecord(METADATA_OLD_FORMAT, Record);<br>
+Â {<br>
+Â Â RecordData Record = {VERSION_MAJOR};<br>
+Â Â Stream.EmitRecord(METADATA_OLD_FORMAT, Record);<br>
+Â }<br>
<br>
  // Create a lexical update block containing all of the declarations in the<br>
  // translation unit that do not come from other AST files.<br>
@@ -4274,11 +4216,12 @@ void ASTWriter::WriteASTCore(Sema &SemaR<br>
  Abv->Add(llvm::BitCodeAbbrevOp(TU_UPDATE_LEXICAL));<br>
  Abv->Add(llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Blob));<br>
  unsigned TuUpdateLexicalAbbrev = Stream.EmitAbbrev(Abv);<br>
-Â Record.clear();<br>
-Â Record.push_back(TU_UPDATE_LEXICAL);<br>
-Â Stream.EmitRecordWithBlob(TuUpdateLexicalAbbrev, Record,<br>
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(NewGlobalKindDeclPairs));<br>
-<br>
+Â {<br>
+Â Â RecordDataRef Record = {TU_UPDATE_LEXICAL};<br>
+Â Â Stream.EmitRecordWithBlob(TuUpdateLexicalAbbrev, Record,<br>
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â bytes(NewGlobalKindDeclPairs));<br>
+Â }<br>
+<br>
  // And a visible updates block for the translation unit.<br>
  Abv = new llvm::BitCodeAbbrev();<br>
  Abv->Add(llvm::BitCodeAbbrevOp(UPDATE_VISIBLE));<br>
@@ -4408,8 +4351,7 @@ void ASTWriter::WriteASTCore(Sema &SemaR<br>
     writeBaseIDOrNone(M->BaseTypeIndex, M->LocalNumTypes);<br>
    }<br>
   }<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(MODULE_OFFSET_MAP);<br>
+Â Â RecordDataRef Record = {MODULE_OFFSET_MAP};<br>
   Stream.EmitRecordWithBlob(ModuleOffsetMapAbbrev, Record,<br>
                Buffer.data(), Buffer.size());<br>
  }<br>
@@ -4573,7 +4515,7 @@ void ASTWriter::WriteASTCore(Sema &SemaR<br>
   WriteOptimizePragmaOptions(SemaRef);<br>
<br>
  // Some simple statistics<br>
-Â Record.clear();<br>
+Â RecordData Record;<br>
  Record.push_back(NumStatements);<br>
  Record.push_back(NumMacros);<br>
  Record.push_back(NumLexicalDeclContexts);<br>
<br>
Modified: cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp?rev=247179&r1=247178&r2=247179&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp?rev=247179&r1=247178&r2=247179&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/GlobalModuleIndex.cpp Wed Sep 9 15:08:51 2015<br>
@@ -757,9 +757,7 @@ void GlobalModuleIndexBuilder::writeInde<br>
   unsigned IDTableAbbrev = Stream.EmitAbbrev(Abbrev);<br>
<br>
   // Write the identifier table<br>
-Â Â Record.clear();<br>
-Â Â Record.push_back(IDENTIFIER_INDEX);<br>
-Â Â Record.push_back(BucketOffset);<br>
+Â Â ArrayRef<uint64_t> Record = {IDENTIFIER_INDEX, BucketOffset};<br>
   Stream.EmitRecordWithBlob(IDTableAbbrev, Record, IdentifierTable);<br>
  }<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>