refactor serializer

Author: vinniefalco

source/lib/ast/BitcodeIDs.hpp

@@ -36,7 +36,7 @@ struct BitCodeConstants
     static constexpr unsigned USRLengthSize = 6U;
     static constexpr unsigned USRBitLengthSize = 8U;
     static constexpr unsigned USRHashSize = 20;
-    static constexpr unsigned char Signature[4] = {'D', 'O', 'C', 'S'};
+    static constexpr unsigned char Signature[4] = {'M', 'R', 'D', 'X'};
 };
 
 /** List of block identifiers.

source/lib/ast/BitcodeWriter.cpp

@@ -345,8 +345,8 @@ dispatchInfoForWrite(Info const* I)
 
 // Validation and Overview Blocks
 
-/// Emits the magic number header to check that its the right format,
-/// in this case, 'DOCS'.
+/// Emits the magic number header to check
+/// that its the right format, in this case, 'DOCS'.
 void
 BitcodeWriter::
 emitHeader()

source/lib/ast/FrontendAction.cpp

@@ -116,22 +116,22 @@ mapDecl(T const* D)
     // VFALCO is this right?
     bool const IsFileInRootDir = true;
 
-    Serializer sr(
+    auto res = serialize(
+        D,
         getLine(D, D->getASTContext()),
         filePath,
         IsFileInRootDir,
         config_,
         R_);
-    auto I = sr.buildInfoPair(D);
-
-    // A null in place of I indicates that the
-    // serializer is skipping this decl for some
-    // reason (e.g. we're only reporting public decls).
-    if (I.first)
-        Corpus::reportResult(ex_, I.first->USR, serialize(*I.first));
-    if (I.second)
-        Corpus::reportResult(ex_, I.second->USR, serialize(*I.second));
 
+    // An empty serialized declaration means that
+    // the serializer is skipping this declaration
+    // for some reason. For example it is private,
+    // or the declaration is enclosed in the parent.
+    if(! res.first.empty())
+        Corpus::reportResult(ex_, res.first.id, std::move(res.first.bitcode));
+    if(! res.second.empty())
+        Corpus::reportResult(ex_, res.second.id, std::move(res.second.bitcode));
     return true;
 }