Index: clang-tools-extra/clang-doc/BitcodeReader.h
===================================================================
--- clang-tools-extra/clang-doc/BitcodeReader.h
+++ clang-tools-extra/clang-doc/BitcodeReader.h
@@ -19,6 +19,7 @@
 #include "BitcodeWriter.h"
 #include "Representation.h"
 #include "clang/AST/AST.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Bitcode/BitstreamReader.h"
 
@@ -31,7 +32,7 @@
   ClangDocBitcodeReader(llvm::BitstreamCursor &Stream) : Stream(Stream) {}
 
   // Main entry point, calls readBlock to read each block in the given stream.
-  std::vector<std::unique_ptr<Info>> readBitcode();
+  llvm::Expected<std::vector<std::unique_ptr<Info>>> readBitcode();
 
 private:
   enum class Cursor { BadBlock = 1, Record, BlockEnd, BlockBegin };
Index: clang-tools-extra/clang-doc/BitcodeReader.cpp
===================================================================
--- clang-tools-extra/clang-doc/BitcodeReader.cpp
+++ clang-tools-extra/clang-doc/BitcodeReader.cpp
@@ -100,6 +100,8 @@
   case FieldId::F_parent:
   case FieldId::F_vparent:
   case FieldId::F_type:
+  case FieldId::F_child_namespace:
+  case FieldId::F_child_record:
   case FieldId::F_default:
     Field = F;
     return true;
@@ -372,6 +374,12 @@
   case FieldId::F_namespace:
     I->Namespace.emplace_back(std::move(R));
     break;
+  case FieldId::F_child_namespace:
+    I->ChildNamespaces.emplace_back(std::move(R));
+    break;
+  case FieldId::F_child_record:
+    I->ChildRecords.emplace_back(std::move(R));
+    break;
   default:
     llvm::errs() << "Invalid field type for info.\n";
     exit(1);
@@ -403,12 +411,40 @@
   case FieldId::F_vparent:
     I->VirtualParents.emplace_back(std::move(R));
     break;
+  case FieldId::F_child_namespace:
+    I->ChildNamespaces.emplace_back(std::move(R));
+    break;
+  case FieldId::F_child_record:
+    I->ChildRecords.emplace_back(std::move(R));
+    break;
   default:
     llvm::errs() << "Invalid field type for info.\n";
     exit(1);
   }
 }
 
+template <typename T, typename ChildInfoType>
+void addChild(T I, ChildInfoType &&R) {
+  llvm::errs() << "Invalid child type for info.\n";
+  exit(1);
+}
+
+template <> void addChild(NamespaceInfo *I, FunctionInfo &&R) {
+  I->ChildFunctions.emplace_back(std::move(R));
+}
+
+template <> void addChild(NamespaceInfo *I, EnumInfo &&R) {
+  I->ChildEnums.emplace_back(std::move(R));
+}
+
+template <> void addChild(RecordInfo *I, FunctionInfo &&R) {
+  I->ChildFunctions.emplace_back(std::move(R));
+}
+
+template <> void addChild(RecordInfo *I, EnumInfo &&R) {
+  I->ChildEnums.emplace_back(std::move(R));
+}
+
 // Read records from bitcode into a given info.
 template <typename T> bool ClangDocBitcodeReader::readRecord(unsigned ID, T I) {
   Record R;
@@ -455,7 +491,8 @@
 template <typename T>
 bool ClangDocBitcodeReader::readSubBlock(unsigned ID, T I) {
   switch (ID) {
-  // Blocks can only have Comment, Reference, or TypeInfo subblocks
+  // Blocks can only have Comment, Reference, TypeInfo, FunctionInfo, or
+  // EnumInfo subblocks
   case BI_COMMENT_BLOCK_ID:
     if (readBlock(ID, getCommentInfo(I)))
       return true;
@@ -492,6 +529,22 @@
     }
     return false;
   }
+  case BI_FUNCTION_BLOCK_ID: {
+    FunctionInfo F;
+    if (readBlock(ID, &F)) {
+      addChild(I, std::move(F));
+      return true;
+    }
+    return false;
+  }
+  case BI_ENUM_BLOCK_ID: {
+    EnumInfo E;
+    if (readBlock(ID, &E)) {
+      addChild(I, std::move(E));
+      return true;
+    }
+    return false;
+  }
   default:
     llvm::errs() << "Invalid subblock type.\n";
     return false;
@@ -573,16 +626,21 @@
 }
 
 // Entry point
-std::vector<std::unique_ptr<Info>> ClangDocBitcodeReader::readBitcode() {
+llvm::Expected<std::vector<std::unique_ptr<Info>>>
+ClangDocBitcodeReader::readBitcode() {
   std::vector<std::unique_ptr<Info>> Infos;
   if (!validateStream())
-    return Infos;
+    return llvm::make_error<llvm::StringError>("Invalid bitcode stream.\n",
+                                               llvm::inconvertibleErrorCode());
+  ;
 
   // Read the top level blocks.
   while (!Stream.AtEndOfStream()) {
     unsigned Code = Stream.ReadCode();
     if (Code != llvm::bitc::ENTER_SUBBLOCK)
-      return Infos;
+      return llvm::make_error<llvm::StringError>(
+          "Missing subblock in bitcode.\n", llvm::inconvertibleErrorCode());
+    ;
 
     unsigned ID = Stream.ReadSubBlockID();
     switch (ID) {
@@ -592,24 +650,30 @@
     case BI_MEMBER_TYPE_BLOCK_ID:
     case BI_COMMENT_BLOCK_ID:
     case BI_REFERENCE_BLOCK_ID:
-      llvm::errs() << "Invalid top level block.\n";
-      return Infos;
+      return llvm::make_error<llvm::StringError>(
+          "Invalid top level block in bitcode.\n",
+          llvm::inconvertibleErrorCode());
+      ;
     case BI_NAMESPACE_BLOCK_ID:
     case BI_RECORD_BLOCK_ID:
     case BI_ENUM_BLOCK_ID:
     case BI_FUNCTION_BLOCK_ID:
-      if (std::unique_ptr<Info> I = readBlockToInfo(ID)) {
+      if (std::unique_ptr<Info> I = readBlockToInfo(ID))
         Infos.emplace_back(std::move(I));
-      }
       return Infos;
     case BI_VERSION_BLOCK_ID:
       if (readBlock(ID, VersionNumber))
         continue;
-      return Infos;
+      return llvm::make_error<llvm::StringError>(
+          "Invalid bitcode version in bitcode.\n",
+          llvm::inconvertibleErrorCode());
+      ;
     case llvm::bitc::BLOCKINFO_BLOCK_ID:
       if (readBlockInfoBlock())
         continue;
-      return Infos;
+      return llvm::make_error<llvm::StringError>(
+          "Invalid BlockInfo in bitcode.\n", llvm::inconvertibleErrorCode());
+      ;
     default:
       if (!Stream.SkipBlock())
         continue;
Index: clang-tools-extra/clang-doc/BitcodeWriter.h
===================================================================
--- clang-tools-extra/clang-doc/BitcodeWriter.h
+++ clang-tools-extra/clang-doc/BitcodeWriter.h
@@ -68,11 +68,10 @@
 
 // New Ids need to be added to the enum here, and to the relevant IdNameMap and
 // initialization list in the implementation file.
-#define INFORECORDS(X) X##_USR, X##_NAME
-
 enum RecordId {
   VERSION = 1,
-  INFORECORDS(FUNCTION),
+  FUNCTION_USR,
+  FUNCTION_NAME,
   FUNCTION_DEFLOCATION,
   FUNCTION_LOCATION,
   FUNCTION_ACCESS,
@@ -91,13 +90,16 @@
   FIELD_TYPE_NAME,
   MEMBER_TYPE_NAME,
   MEMBER_TYPE_ACCESS,
-  INFORECORDS(NAMESPACE),
-  INFORECORDS(ENUM),
+  NAMESPACE_USR,
+  NAMESPACE_NAME,
+  ENUM_USR,
+  ENUM_NAME,
   ENUM_DEFLOCATION,
   ENUM_LOCATION,
   ENUM_MEMBER,
   ENUM_SCOPED,
-  INFORECORDS(RECORD),
+  RECORD_USR,
+  RECORD_NAME,
   RECORD_DEFLOCATION,
   RECORD_LOCATION,
   RECORD_TAG_TYPE,
@@ -112,10 +114,16 @@
 static constexpr unsigned BlockIdCount = BI_LAST - BI_FIRST;
 static constexpr unsigned RecordIdCount = RI_LAST - RI_FIRST;
 
-#undef INFORECORDS
-
 // Identifiers for differentiating between subblocks
-enum class FieldId { F_default, F_namespace, F_parent, F_vparent, F_type };
+enum class FieldId {
+  F_default,
+  F_namespace,
+  F_parent,
+  F_vparent,
+  F_type,
+  F_child_namespace,
+  F_child_record
+};
 
 class ClangDocBitcodeWriter {
 public:
Index: clang-tools-extra/clang-doc/BitcodeWriter.cpp
===================================================================
--- clang-tools-extra/clang-doc/BitcodeWriter.cpp
+++ clang-tools-extra/clang-doc/BitcodeWriter.cpp
@@ -434,6 +434,14 @@
     emitBlock(N, FieldId::F_namespace);
   for (const auto &CI : I.Description)
     emitBlock(CI);
+  for (const auto &C : I.ChildNamespaces)
+    emitBlock(C, FieldId::F_child_namespace);
+  for (const auto &C : I.ChildRecords)
+    emitBlock(C, FieldId::F_child_record);
+  for (const auto &C : I.ChildFunctions)
+    emitBlock(C);
+  for (const auto &C : I.ChildEnums)
+    emitBlock(C);
 }
 
 void ClangDocBitcodeWriter::emitBlock(const EnumInfo &I) {
@@ -472,6 +480,14 @@
     emitBlock(P, FieldId::F_parent);
   for (const auto &P : I.VirtualParents)
     emitBlock(P, FieldId::F_vparent);
+  for (const auto &C : I.ChildNamespaces)
+    emitBlock(C, FieldId::F_child_namespace);
+  for (const auto &C : I.ChildRecords)
+    emitBlock(C, FieldId::F_child_record);
+  for (const auto &C : I.ChildFunctions)
+    emitBlock(C);
+  for (const auto &C : I.ChildEnums)
+    emitBlock(C);
 }
 
 void ClangDocBitcodeWriter::emitBlock(const FunctionInfo &I) {
Index: clang-tools-extra/clang-doc/Mapper.cpp
===================================================================
--- clang-tools-extra/clang-doc/Mapper.cpp
+++ clang-tools-extra/clang-doc/Mapper.cpp
@@ -33,10 +33,11 @@
   if (index::generateUSRForDecl(D, USR))
     return true;
 
-  ECtx->reportResult(llvm::toHex(llvm::toStringRef(serialize::hashUSR(USR))),
-                     serialize::emitInfo(D, getComment(D, D->getASTContext()),
-                                         getLine(D, D->getASTContext()),
-                                         getFile(D, D->getASTContext())));
+  std::unique_ptr<Info> I = serialize::emitInfo(
+      D, getComment(D, D->getASTContext()), getLine(D, D->getASTContext()),
+      getFile(D, D->getASTContext()));
+  ECtx->reportResult(llvm::toHex(llvm::toStringRef(I->USR)),
+                     serialize::serialize(I));
   return true;
 }
 
Index: clang-tools-extra/clang-doc/Representation.h
===================================================================
--- clang-tools-extra/clang-doc/Representation.h
+++ clang-tools-extra/clang-doc/Representation.h
@@ -30,6 +30,9 @@
 using SymbolID = std::array<uint8_t, 20>;
 
 struct Info;
+struct FunctionInfo;
+struct EnumInfo;
+
 enum class InfoType {
   IT_default,
   IT_namespace,
@@ -152,6 +155,9 @@
 struct Info {
   Info() = default;
   Info(InfoType IT) : IT(IT) {}
+  Info(InfoType IT, SymbolID USR) : USR(USR), IT(IT) {}
+  Info(InfoType IT, SymbolID USR, StringRef Name)
+      : USR(USR), IT(IT), Name(Name) {}
   Info(const Info &Other) = delete;
   Info(Info &&Other) = default;
 
@@ -165,18 +171,32 @@
 
   void mergeBase(Info &&I);
   bool mergeable(const Info &Other);
+
+  // Returns a reference to the parent scope (that is, the immediate parent
+  // namespace or class in which this decl resides).
+  llvm::Expected<Reference> getEnclosingScope();
 };
 
 // Info for namespaces.
 struct NamespaceInfo : public Info {
   NamespaceInfo() : Info(InfoType::IT_namespace) {}
+  NamespaceInfo(SymbolID USR) : Info(InfoType::IT_namespace, USR) {}
+  NamespaceInfo(SymbolID USR, StringRef Name)
+      : Info(InfoType::IT_namespace, USR, Name) {}
 
   void merge(NamespaceInfo &&I);
+
+  std::vector<Reference> ChildNamespaces;
+  std::vector<Reference> ChildRecords;
+  std::vector<FunctionInfo> ChildFunctions;
+  std::vector<EnumInfo> ChildEnums;
 };
 
 // Info for symbols.
 struct SymbolInfo : public Info {
   SymbolInfo(InfoType IT) : Info(IT) {}
+  SymbolInfo(InfoType IT, SymbolID USR) : Info(IT, USR) {}
+  SymbolInfo(InfoType IT, SymbolID USR, StringRef Name) : Info(IT, USR, Name) {}
 
   void merge(SymbolInfo &&I);
 
@@ -188,6 +208,7 @@
 // Info for functions.
 struct FunctionInfo : public SymbolInfo {
   FunctionInfo() : SymbolInfo(InfoType::IT_function) {}
+  FunctionInfo(SymbolID USR) : SymbolInfo(InfoType::IT_function, USR) {}
 
   void merge(FunctionInfo &&I);
 
@@ -204,6 +225,9 @@
 // Info for types.
 struct RecordInfo : public SymbolInfo {
   RecordInfo() : SymbolInfo(InfoType::IT_record) {}
+  RecordInfo(SymbolID USR) : SymbolInfo(InfoType::IT_record, USR) {}
+  RecordInfo(SymbolID USR, StringRef Name)
+      : SymbolInfo(InfoType::IT_record, USR, Name) {}
 
   void merge(RecordInfo &&I);
 
@@ -217,12 +241,18 @@
                                            // parents).
   llvm::SmallVector<Reference, 4>
       VirtualParents; // List of virtual base/parent records.
+
+  std::vector<Reference> ChildNamespaces;
+  std::vector<Reference> ChildRecords;
+  std::vector<FunctionInfo> ChildFunctions;
+  std::vector<EnumInfo> ChildEnums;
 };
 
 // TODO: Expand to allow for documenting templating.
 // Info for types.
 struct EnumInfo : public SymbolInfo {
   EnumInfo() : SymbolInfo(InfoType::IT_enum) {}
+  EnumInfo(SymbolID USR) : SymbolInfo(InfoType::IT_enum, USR) {}
 
   void merge(EnumInfo &&I);
 
Index: clang-tools-extra/clang-doc/Representation.cpp
===================================================================
--- clang-tools-extra/clang-doc/Representation.cpp
+++ clang-tools-extra/clang-doc/Representation.cpp
@@ -26,23 +26,76 @@
 namespace clang {
 namespace doc {
 
-static const SymbolID EmptySID = SymbolID();
+namespace {
+
+const SymbolID EmptySID = SymbolID();
 
 template <typename T>
-std::unique_ptr<Info> reduce(std::vector<std::unique_ptr<Info>> &Values) {
-  std::unique_ptr<Info> Merged = llvm::make_unique<T>();
+llvm::Expected<std::unique_ptr<Info>>
+reduce(std::vector<std::unique_ptr<Info>> &Values) {
+  if (Values.empty())
+    return llvm::make_error<llvm::StringError>(" No values to reduce.\n",
+                                               llvm::inconvertibleErrorCode());
+  std::unique_ptr<Info> Merged = llvm::make_unique<T>(Values[0]->USR);
   T *Tmp = static_cast<T *>(Merged.get());
   for (auto &I : Values)
     Tmp->merge(std::move(*static_cast<T *>(I.get())));
   return Merged;
 }
 
+// Return the index of the matching child in the vector, or -1 if merge is not
+// necessary.
+template <typename T>
+int isChildMergeNecessary(std::vector<T> &Children, T &ChildToMerge) {
+  for (unsigned long I = 0; I < Children.size(); I++) {
+    if (ChildToMerge.USR == Children[I].USR)
+      return I;
+  }
+  return -1;
+}
+
+// For References, we don't need to actually merge them, we just don't want
+// duplicates.
+void reduceChildren(std::vector<Reference> &Children,
+                    std::vector<Reference> &&ChildrenToMerge) {
+  for (auto &ChildToMerge : ChildrenToMerge) {
+    if (isChildMergeNecessary(Children, ChildToMerge) == -1)
+      Children.push_back(std::move(ChildToMerge));
+  }
+}
+
+void reduceChildren(std::vector<FunctionInfo> &Children,
+                    std::vector<FunctionInfo> &&ChildrenToMerge) {
+  for (auto &ChildToMerge : ChildrenToMerge) {
+    int mergeIdx = isChildMergeNecessary(Children, ChildToMerge);
+    if (mergeIdx == -1) {
+      Children.push_back(std::move(ChildToMerge));
+      continue;
+    }
+    Children[mergeIdx].merge(std::move(ChildToMerge));
+  }
+}
+
+void reduceChildren(std::vector<EnumInfo> &Children,
+                    std::vector<EnumInfo> &&ChildrenToMerge) {
+  for (auto &ChildToMerge : ChildrenToMerge) {
+    int mergeIdx = isChildMergeNecessary(Children, ChildToMerge);
+    if (mergeIdx == -1) {
+      Children.push_back(std::move(ChildToMerge));
+      continue;
+    }
+    Children[mergeIdx].merge(std::move(ChildToMerge));
+  }
+}
+
+} // namespace
+
 // Dispatch function.
 llvm::Expected<std::unique_ptr<Info>>
 mergeInfos(std::vector<std::unique_ptr<Info>> &Values) {
   if (Values.empty())
     return llvm::make_error<llvm::StringError>("No info values to merge.\n",
-                                             llvm::inconvertibleErrorCode());
+                                               llvm::inconvertibleErrorCode());
 
   switch (Values[0]->IT) {
   case InfoType::IT_namespace:
@@ -73,7 +126,7 @@
 }
 
 bool Info::mergeable(const Info &Other) {
-  return IT == Other.IT && (USR == EmptySID || USR == Other.USR);
+  return IT == Other.IT && USR == Other.USR;
 }
 
 void SymbolInfo::merge(SymbolInfo &&Other) {
@@ -87,6 +140,11 @@
 
 void NamespaceInfo::merge(NamespaceInfo &&Other) {
   assert(mergeable(Other));
+  // Reduce children if necessary
+  reduceChildren(ChildNamespaces, std::move(Other.ChildNamespaces));
+  reduceChildren(ChildRecords, std::move(Other.ChildRecords));
+  reduceChildren(ChildFunctions, std::move(Other.ChildFunctions));
+  reduceChildren(ChildEnums, std::move(Other.ChildEnums));
   mergeBase(std::move(Other));
 }
 
@@ -100,6 +158,13 @@
     Parents = std::move(Other.Parents);
   if (VirtualParents.empty())
     VirtualParents = std::move(Other.VirtualParents);
+  // Unconditionally extend the children, since they're added after the
+  // initial reduce and therefore there can only be one.
+  // Reduce children if necessary
+  reduceChildren(ChildNamespaces, std::move(Other.ChildNamespaces));
+  reduceChildren(ChildRecords, std::move(Other.ChildRecords));
+  reduceChildren(ChildFunctions, std::move(Other.ChildFunctions));
+  reduceChildren(ChildEnums, std::move(Other.ChildEnums));
   SymbolInfo::merge(std::move(Other));
 }
 
Index: clang-tools-extra/clang-doc/Serialize.h
===================================================================
--- clang-tools-extra/clang-doc/Serialize.h
+++ clang-tools-extra/clang-doc/Serialize.h
@@ -28,16 +28,16 @@
 namespace doc {
 namespace serialize {
 
-std::string emitInfo(const NamespaceDecl *D, const FullComment *FC,
-                     int LineNumber, StringRef File);
-std::string emitInfo(const RecordDecl *D, const FullComment *FC, int LineNumber,
-                     StringRef File);
-std::string emitInfo(const EnumDecl *D, const FullComment *FC, int LineNumber,
-                     StringRef File);
-std::string emitInfo(const FunctionDecl *D, const FullComment *FC,
-                     int LineNumber, StringRef File);
-std::string emitInfo(const CXXMethodDecl *D, const FullComment *FC,
-                     int LineNumber, StringRef File);
+std::unique_ptr<Info> emitInfo(const NamespaceDecl *D, const FullComment *FC,
+                               int LineNumber, StringRef File);
+std::unique_ptr<Info> emitInfo(const RecordDecl *D, const FullComment *FC,
+                               int LineNumber, StringRef File);
+std::unique_ptr<Info> emitInfo(const EnumDecl *D, const FullComment *FC,
+                               int LineNumber, StringRef File);
+std::unique_ptr<Info> emitInfo(const FunctionDecl *D, const FullComment *FC,
+                               int LineNumber, StringRef File);
+std::unique_ptr<Info> emitInfo(const CXXMethodDecl *D, const FullComment *FC,
+                               int LineNumber, StringRef File);
 
 // Function to hash a given USR value for storage.
 // As USRs (Unified Symbol Resolution) could be large, especially for functions
@@ -46,6 +46,8 @@
 // memory (vs storing USRs directly).
 SymbolID hashUSR(llvm::StringRef USR);
 
+std::string serialize(std::unique_ptr<Info> &I);
+
 } // namespace serialize
 } // namespace doc
 } // namespace clang
Index: clang-tools-extra/clang-doc/Serialize.cpp
===================================================================
--- clang-tools-extra/clang-doc/Serialize.cpp
+++ clang-tools-extra/clang-doc/Serialize.cpp
@@ -152,6 +152,21 @@
   return Buffer.str().str();
 }
 
+std::string serialize(std::unique_ptr<Info> &I) {
+  switch (I->IT) {
+  case InfoType::IT_namespace:
+    return serialize(*static_cast<NamespaceInfo *>(I.get()));
+  case InfoType::IT_record:
+    return serialize(*static_cast<RecordInfo *>(I.get()));
+  case InfoType::IT_enum:
+    return serialize(*static_cast<EnumInfo *>(I.get()));
+  case InfoType::IT_function:
+    return serialize(*static_cast<FunctionInfo *>(I.get()));
+  default:
+    return "";
+  }
+}
+
 static void parseFullComment(const FullComment *C, CommentInfo &CI) {
   ClangDocCommentVisitor Visitor(CI);
   Visitor.parseComment(C);
@@ -294,50 +309,97 @@
   parseParameters(I, D);
 }
 
-std::string emitInfo(const NamespaceDecl *D, const FullComment *FC,
-                     int LineNumber, llvm::StringRef File) {
-  NamespaceInfo I;
-  populateInfo(I, D, FC);
-  return serialize(I);
+std::unique_ptr<Info> emitInfo(const NamespaceDecl *D, const FullComment *FC,
+                               int LineNumber, llvm::StringRef File) {
+  std::unique_ptr<Info> IPtr = llvm::make_unique<NamespaceInfo>();
+  NamespaceInfo *I = static_cast<NamespaceInfo *>(IPtr.get());
+  populateInfo(*I, D, FC);
+  return IPtr;
 }
 
-std::string emitInfo(const RecordDecl *D, const FullComment *FC, int LineNumber,
-                     llvm::StringRef File) {
-  RecordInfo I;
-  populateSymbolInfo(I, D, FC, LineNumber, File);
-  I.TagType = D->getTagKind();
-  parseFields(I, D);
+std::unique_ptr<Info> emitInfo(const RecordDecl *D, const FullComment *FC,
+                               int LineNumber, llvm::StringRef File) {
+  std::unique_ptr<Info> IPtr = llvm::make_unique<RecordInfo>();
+  RecordInfo *I = static_cast<RecordInfo *>(IPtr.get());
+  populateSymbolInfo(*I, D, FC, LineNumber, File);
+  I->TagType = D->getTagKind();
+  parseFields(*I, D);
   if (const auto *C = dyn_cast<CXXRecordDecl>(D))
-    parseBases(I, C);
-  return serialize(I);
-}
-
-std::string emitInfo(const FunctionDecl *D, const FullComment *FC,
-                     int LineNumber, llvm::StringRef File) {
-  FunctionInfo I;
-  populateFunctionInfo(I, D, FC, LineNumber, File);
-  I.Access = clang::AccessSpecifier::AS_none;
-  return serialize(I);
-}
-
-std::string emitInfo(const CXXMethodDecl *D, const FullComment *FC,
-                     int LineNumber, llvm::StringRef File) {
-  FunctionInfo I;
-  populateFunctionInfo(I, D, FC, LineNumber, File);
-  I.IsMethod = true;
-  I.Parent = Reference{getUSRForDecl(D->getParent()),
-                       D->getParent()->getNameAsString(), InfoType::IT_record};
-  I.Access = D->getAccess();
-  return serialize(I);
-}
-
-std::string emitInfo(const EnumDecl *D, const FullComment *FC, int LineNumber,
-                     llvm::StringRef File) {
-  EnumInfo I;
-  populateSymbolInfo(I, D, FC, LineNumber, File);
-  I.Scoped = D->isScoped();
-  parseEnumerators(I, D);
-  return serialize(I);
+    parseBases(*I, C);
+  return IPtr;
+}
+
+std::unique_ptr<Info> emitInfo(const FunctionDecl *D, const FullComment *FC,
+                               int LineNumber, llvm::StringRef File) {
+  FunctionInfo Func;
+  populateFunctionInfo(Func, D, FC, LineNumber, File);
+  Func.Access = clang::AccessSpecifier::AS_none;
+
+  // Wrap in enclosing scope
+  std::unique_ptr<Info> IPtr = llvm::make_unique<NamespaceInfo>();
+  NamespaceInfo *I = static_cast<NamespaceInfo *>(IPtr.get());
+  if (!Func.Namespace.empty())
+    I->USR = Func.Namespace[0].USR;
+  else
+    I->USR = SymbolID();
+  I->ChildFunctions.push_back(std::move(Func));
+  return IPtr;
+}
+
+std::unique_ptr<Info> emitInfo(const CXXMethodDecl *D, const FullComment *FC,
+                               int LineNumber, llvm::StringRef File) {
+  FunctionInfo Func;
+  populateFunctionInfo(Func, D, FC, LineNumber, File);
+  Func.IsMethod = true;
+
+  SymbolID ParentUSR = getUSRForDecl(D->getParent());
+  Func.Parent = Reference{ParentUSR, D->getParent()->getNameAsString(),
+                          InfoType::IT_record};
+  Func.Access = D->getAccess();
+
+  // Wrap in enclosing scope
+  std::unique_ptr<Info> IPtr = llvm::make_unique<RecordInfo>();
+  RecordInfo *I = static_cast<RecordInfo *>(IPtr.get());
+  I->USR = ParentUSR;
+  I->ChildFunctions.push_back(std::move(Func));
+  return IPtr;
+}
+
+std::unique_ptr<Info> emitInfo(const EnumDecl *D, const FullComment *FC,
+                               int LineNumber, llvm::StringRef File) {
+  EnumInfo Enum;
+  populateSymbolInfo(Enum, D, FC, LineNumber, File);
+  Enum.Scoped = D->isScoped();
+  parseEnumerators(Enum, D);
+
+  // Wrap in enclosing scope
+  if (!Enum.Namespace.empty()) {
+    switch (Enum.Namespace[0].RefType) {
+    case InfoType::IT_namespace: {
+      std::unique_ptr<Info> IPtr = llvm::make_unique<NamespaceInfo>();
+      NamespaceInfo *I = static_cast<NamespaceInfo *>(IPtr.get());
+      I->USR = Enum.Namespace[0].USR;
+      I->ChildEnums.push_back(std::move(Enum));
+      return IPtr;
+    }
+    case InfoType::IT_record: {
+      std::unique_ptr<Info> IPtr = llvm::make_unique<RecordInfo>();
+      RecordInfo *I = static_cast<RecordInfo *>(IPtr.get());
+      I->USR = Enum.Namespace[0].USR;
+      I->ChildEnums.push_back(std::move(Enum));
+      return IPtr;
+    }
+    default:
+      break;
+    }
+  }
+
+  // Put in global namespace
+  std::unique_ptr<Info> IPtr = llvm::make_unique<NamespaceInfo>();
+  NamespaceInfo *I = static_cast<NamespaceInfo *>(IPtr.get());
+  I->USR = SymbolID();
+  I->ChildEnums.push_back(std::move(Enum));
+  return IPtr;
 }
 
 } // namespace serialize
Index: clang-tools-extra/clang-doc/YAMLGenerator.cpp
===================================================================
--- clang-tools-extra/clang-doc/YAMLGenerator.cpp
+++ clang-tools-extra/clang-doc/YAMLGenerator.cpp
@@ -20,6 +20,8 @@
 LLVM_YAML_IS_SEQUENCE_VECTOR(Reference)
 LLVM_YAML_IS_SEQUENCE_VECTOR(Location)
 LLVM_YAML_IS_SEQUENCE_VECTOR(CommentInfo)
+LLVM_YAML_IS_SEQUENCE_VECTOR(FunctionInfo)
+LLVM_YAML_IS_SEQUENCE_VECTOR(EnumInfo)
 LLVM_YAML_IS_SEQUENCE_VECTOR(std::unique_ptr<CommentInfo>)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::SmallString<16>)
 
@@ -175,7 +177,14 @@
 };
 
 template <> struct MappingTraits<NamespaceInfo> {
-  static void mapping(IO &IO, NamespaceInfo &I) { InfoMapping(IO, I); }
+  static void mapping(IO &IO, NamespaceInfo &I) {
+    InfoMapping(IO, I);
+    IO.mapOptional("ChildNamespaces", I.ChildNamespaces,
+                   std::vector<Reference>());
+    IO.mapOptional("ChildRecords", I.ChildRecords, std::vector<Reference>());
+    IO.mapOptional("ChildFunctions", I.ChildFunctions);
+    IO.mapOptional("ChildEnums", I.ChildEnums);
+  }
 };
 
 template <> struct MappingTraits<RecordInfo> {
@@ -186,6 +195,11 @@
     IO.mapOptional("Parents", I.Parents, llvm::SmallVector<Reference, 4>());
     IO.mapOptional("VirtualParents", I.VirtualParents,
                    llvm::SmallVector<Reference, 4>());
+    IO.mapOptional("ChildNamespaces", I.ChildNamespaces,
+                   std::vector<Reference>());
+    IO.mapOptional("ChildRecords", I.ChildRecords, std::vector<Reference>());
+    IO.mapOptional("ChildFunctions", I.ChildFunctions);
+    IO.mapOptional("ChildEnums", I.ChildEnums);
   }
 };
 
Index: clang-tools-extra/clang-doc/tool/ClangDocMain.cpp
===================================================================
--- clang-tools-extra/clang-doc/tool/ClangDocMain.cpp
+++ clang-tools-extra/clang-doc/tool/ClangDocMain.cpp
@@ -117,9 +117,24 @@
   return false;
 }
 
+// A function to extract the appropriate path name for a given info's
+// documentation. The path returned is a composite of the parent namespaces as
+// directories plus the decl name as the filename.
+//
+// Example: Given the below, the <ext> path for class C will be <
+// root>/A/B/C.<ext>
+//
+// namespace A {
+// namesapce B {
+//
+// class C {};
+//
+// }
+// }
 llvm::Expected<llvm::SmallString<128>>
-getPath(StringRef Root, StringRef Ext, StringRef Name,
-        llvm::SmallVectorImpl<doc::Reference> &Namespaces) {
+getInfoOutputFile(StringRef Root,
+                  llvm::SmallVectorImpl<doc::Reference> &Namespaces,
+                  StringRef Name, StringRef Ext) {
   std::error_code OK;
   llvm::SmallString<128> Path;
   llvm::sys::path::native(Root, Path);
@@ -130,6 +145,8 @@
     return llvm::make_error<llvm::StringError>("Unable to create directory.\n",
                                                llvm::inconvertibleErrorCode());
 
+  if (Name.empty())
+    Name = "GlobalNamespace";
   llvm::sys::path::append(Path, Name + Ext);
   return Path;
 }
@@ -142,6 +159,30 @@
   llvm_unreachable("Unknown OutputFormatTy");
 }
 
+// Iterate through tool results and build string map of info vectors from the
+// encoded bitstreams.
+bool bitcodeResultsToInfos(
+    tooling::ToolResults &Results,
+    llvm::StringMap<std::vector<std::unique_ptr<doc::Info>>> &Output) {
+  bool Err = false;
+  Results.forEachResult([&](StringRef Key, StringRef Value) {
+    llvm::BitstreamCursor Stream(Value);
+    doc::ClangDocBitcodeReader Reader(Stream);
+    auto Infos = Reader.readBitcode();
+    if (!Infos) {
+      llvm::errs() << toString(Infos.takeError()) << "\n";
+      Err = true;
+      return;
+    }
+    for (auto &I : Infos.get()) {
+      auto R =
+          Output.try_emplace(Key, std::vector<std::unique_ptr<doc::Info>>());
+      R.first->second.emplace_back(std::move(I));
+    }
+  });
+  return Err;
+}
+
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
   std::error_code OK;
@@ -191,30 +232,21 @@
   }
 
   // Collect values into output by key.
-  llvm::outs() << "Collecting infos...\n";
-  llvm::StringMap<std::vector<std::unique_ptr<doc::Info>>> MapOutput;
-
   // In ToolResults, the Key is the hashed USR and the value is the
   // bitcode-encoded representation of the Info object.
-  Exec->get()->getToolResults()->forEachResult([&](StringRef Key,
-                                                   StringRef Value) {
-    llvm::BitstreamCursor Stream(Value);
-    doc::ClangDocBitcodeReader Reader(Stream);
-    auto Infos = Reader.readBitcode();
-    for (auto &I : Infos) {
-      auto R =
-          MapOutput.try_emplace(Key, std::vector<std::unique_ptr<doc::Info>>());
-      R.first->second.emplace_back(std::move(I));
-    }
-  });
+  llvm::outs() << "Collecting infos...\n";
+  llvm::StringMap<std::vector<std::unique_ptr<doc::Info>>> USRToInfos;
+  if (bitcodeResultsToInfos(*Exec->get()->getToolResults(), USRToInfos))
+    return 1;
 
-  // Reducing and generation phases
-  llvm::outs() << "Reducing " << MapOutput.size() << " infos...\n";
-  llvm::StringMap<std::unique_ptr<doc::Info>> ReduceOutput;
-  for (auto &Group : MapOutput) {
+  // First reducing phase (reduce all decls into one info per decl).
+  llvm::outs() << "Reducing " << USRToInfos.size() << " infos...\n";
+  for (auto &Group : USRToInfos) {
     auto Reduced = doc::mergeInfos(Group.getValue());
-    if (!Reduced)
+    if (!Reduced) {
       llvm::errs() << llvm::toString(Reduced.takeError());
+      continue;
+    }
 
     if (DumpIntermediateResult) {
       SmallString<4096> Buffer;
@@ -225,10 +257,10 @@
         llvm::errs() << "Error dumping to bitcode.\n";
       continue;
     }
-
-    // Create the relevant ostream and emit the documentation for this decl.
     doc::Info *I = Reduced.get().get();
-    auto InfoPath = getPath(OutDirectory, "." + Format, I->Name, I->Namespace);
+
+    auto InfoPath =
+        getInfoOutputFile(OutDirectory, I->Namespace, I->Name, "." + Format);
     if (!InfoPath) {
       llvm::errs() << toString(InfoPath.takeError()) << "\n";
       continue;
@@ -236,7 +268,7 @@
     std::error_code FileErr;
     llvm::raw_fd_ostream InfoOS(InfoPath.get(), FileErr, llvm::sys::fs::F_None);
     if (FileErr != OK) {
-      llvm::errs() << "Error opening index file: " << FileErr.message() << "\n";
+      llvm::errs() << "Error opening info file: " << FileErr.message() << "\n";
       continue;
     }
 
Index: clang-tools-extra/test/clang-doc/bc-comment.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/bc-comment.cpp
+++ clang-tools-extra/test/clang-doc/bc-comment.cpp
@@ -2,9 +2,7 @@
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-intermediate -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/7574630614A535710E5A6ABCFFF98BCA2D06A4CA.bc --dump | FileCheck %s
- 
+
 /// \brief Brief description.
 ///
 /// Extended description that
@@ -26,172 +24,178 @@
 /// Bonus comment on definition
 void F(int I, int J) {}
 
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=117 op2=116 op3=99 op4=6 op5=20 op6=165 op7=53 op8=113 op9=14 op10=90 op11=106 op12=188 op13=255 op14=249 op15=139 op16=202 op17=45 op18=6 op19=164 op20=202/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'F'
-  // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=5/> blob data = 'brief'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=19/> blob data = ' Brief description.'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=26/> blob data = ' Extended description that'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=30/> blob data = ' continues onto the next line.'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'ul'
-        // CHECK-NEXT: <AttrKey abbrevid=12 op0=5/> blob data = 'class'
-        // CHECK-NEXT: <AttrVal abbrevid=13 op0=4/> blob data = 'test'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'li'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=9/> blob data = ' Testing.'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=17/> blob data = 'HTMLEndTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'ul'
-        // CHECK-NEXT: <SelfClosing abbrevid=10 op0=1/>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=20/> blob data = 'VerbatimBlockComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=8/> blob data = 'verbatim'
-      // CHECK-NEXT: <CloseName abbrevid=9 op0=11/> blob data = 'endverbatim'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=24/> blob data = 'VerbatimBlockLineComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=27/> blob data = ' The description continues.'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=3/> blob data = ' --'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
-      // CHECK-NEXT: <Direction abbrevid=7 op0=5/> blob data = '[out]'
-      // CHECK-NEXT: <ParamName abbrevid=8 op0=1/> blob data = 'I'
-      // CHECK-NEXT: <Explicit abbrevid=11 op0=1/>
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
-        // CHECK-NEXT: </CommentBlock>
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
-      // CHECK-NEXT: <Direction abbrevid=7 op0=4/> blob data = '[in]'
-      // CHECK-NEXT: <ParamName abbrevid=8 op0=1/> blob data = 'J'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
-        // CHECK-NEXT: </CommentBlock>
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=6/> blob data = 'return'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=5/> blob data = ' void'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
-    // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=28/> blob data = ' Bonus comment on definition'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: <DefLocation abbrevid=6 op0=27 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <Location abbrevid=7 op0=24 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-  // CHECK-NEXT: </TypeBlock>
-  // CHECK-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'I'
-  // CHECK-NEXT: </FieldTypeBlock>
-  // CHECK-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'J'
-  // CHECK-NEXT: </FieldTypeBlock>
-// CHECK-NEXT: </FunctionBlock>
+// RUN: clang-doc --dump-intermediate --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0000000000000000000000000000000000000000.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <NamespaceBlock NumWords=432 BlockCodeSize=4>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=429 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=117 op2=116 op3=99 op4=6 op5=20 op6=165 op7=53 op8=113 op9=14 op10=90 op11=106 op12=188 op13=255 op14=249 op15=139 op16=202 op17=45 op18=6 op19=164 op20=202/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'F'
+// CHECK-0-NEXT:     <CommentBlock NumWords=354 BlockCodeSize=4>
+// CHECK-0-NEXT:       <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
+// CHECK-0-NEXT:       <CommentBlock NumWords=13 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=31 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
+// CHECK-0-NEXT:         <Name abbrevid=6 op0=5/> blob data = 'brief'
+// CHECK-0-NEXT:         <CommentBlock NumWords=19 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:           <CommentBlock NumWords=11 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:             <Text abbrevid=5 op0=19/> blob data = ' Brief description.'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=37 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=13 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=26/> blob data = ' Extended description that'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=14 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=30/> blob data = ' continues onto the next line.'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=76 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=14 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
+// CHECK-0-NEXT:           <Name abbrevid=6 op0=2/> blob data = 'ul'
+// CHECK-0-NEXT:           <AttrKey abbrevid=12 op0=5/> blob data = 'class'
+// CHECK-0-NEXT:           <AttrVal abbrevid=13 op0=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=9 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
+// CHECK-0-NEXT:           <Name abbrevid=6 op0=2/> blob data = 'li'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=9 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=9/> blob data = ' Testing.'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=9 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=17/> blob data = 'HTMLEndTagComment'
+// CHECK-0-NEXT:           <Name abbrevid=6 op0=2/> blob data = 'ul'
+// CHECK-0-NEXT:           <SelfClosing abbrevid=10 op0=1/>
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=13 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=32 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=20/> blob data = 'VerbatimBlockComment'
+// CHECK-0-NEXT:         <Name abbrevid=6 op0=8/> blob data = 'verbatim'
+// CHECK-0-NEXT:         <CloseName abbrevid=9 op0=11/> blob data = 'endverbatim'
+// CHECK-0-NEXT:         <CommentBlock NumWords=16 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=24/> blob data = 'VerbatimBlockLineComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=27/> blob data = ' The description continues.'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=22 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=7 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=3/> blob data = ' --'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:         <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=39 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
+// CHECK-0-NEXT:         <Direction abbrevid=7 op0=5/> blob data = '[out]'
+// CHECK-0-NEXT:         <ParamName abbrevid=8 op0=1/> blob data = 'I'
+// CHECK-0-NEXT:         <Explicit abbrevid=11 op0=1/>
+// CHECK-0-NEXT:         <CommentBlock NumWords=25 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:           <CommentBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:             <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:           <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=38 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
+// CHECK-0-NEXT:         <Direction abbrevid=7 op0=4/> blob data = '[in]'
+// CHECK-0-NEXT:         <ParamName abbrevid=8 op0=1/> blob data = 'J'
+// CHECK-0-NEXT:         <CommentBlock NumWords=25 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:           <CommentBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:             <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:           <CommentBlock NumWords=5 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:       <CommentBlock NumWords=28 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
+// CHECK-0-NEXT:         <Name abbrevid=6 op0=6/> blob data = 'return'
+// CHECK-0-NEXT:         <CommentBlock NumWords=16 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:           <CommentBlock NumWords=8 BlockCodeSize=4>
+// CHECK-0-NEXT:             <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:             <Text abbrevid=5 op0=5/> blob data = ' void'
+// CHECK-0-NEXT:           </CommentBlock>
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:     </CommentBlock>
+// CHECK-0-NEXT:     <CommentBlock NumWords=28 BlockCodeSize=4>
+// CHECK-0-NEXT:       <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
+// CHECK-0-NEXT:       <CommentBlock NumWords=21 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=13 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=28/> blob data = ' Bonus comment on definition'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:     </CommentBlock>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=25 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <Location abbrevid=7 op0=22 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'I'
+// CHECK-0-NEXT:     </FieldTypeBlock>
+// CHECK-0-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'J'
+// CHECK-0-NEXT:     </FieldTypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </NamespaceBlock>
Index: clang-tools-extra/test/clang-doc/bc-namespace.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/bc-namespace.cpp
+++ clang-tools-extra/test/clang-doc/bc-namespace.cpp
@@ -2,18 +2,8 @@
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-intermediate -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/8D042EFFC98B373450BC6B5B90A330C25A150E9C.bc --dump | FileCheck %s --check-prefix CHECK-A
-// RUN: llvm-bcanalyzer %t/docs/bc/E21AF79E2A9D02554BA090D10DF39FE273F5CDB5.bc --dump | FileCheck %s --check-prefix CHECK-B
-// RUN: llvm-bcanalyzer %t/docs/bc/39D3C95A5F7CE2BA4937BD7B01BAE09EBC2AD8AC.bc --dump | FileCheck %s --check-prefix CHECK-F
-// RUN: llvm-bcanalyzer %t/docs/bc/9A82CB33ED0FDF81EE383D31CD0957D153C5E840.bc --dump | FileCheck %s --check-prefix CHECK-FUNC
-// RUN: llvm-bcanalyzer %t/docs/bc/E9ABF7E7E2425B626723D41E76E4BC7E7A5BD775.bc --dump | FileCheck %s --check-prefix CHECK-E
- 
+
 namespace A {
-// CHECK-A: <NamespaceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-A-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-  // CHECK-A-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-// CHECK-A-NEXT: </NamespaceBlock>
   
 void f();
 
@@ -22,88 +12,107 @@
 namespace A {
 
 void f(){};
-// CHECK-F: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=57 op2=211 op3=201 op4=90 op5=95 op6=124 op7=226 op8=186 op9=73 op10=55 op11=189 op12=123 op13=1 op14=186 op15=224 op16=158 op17=188 op18=42 op19=216 op20=172/>
-  // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'f'
-  // CHECK-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-    // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-    // CHECK-F-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-F-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-F-NEXT: </ReferenceBlock>
-  // CHECK-F-NEXT: <DefLocation abbrevid=6 op0=24 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-F-NEXT: <Location abbrevid=7 op0=18 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-F-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-F-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-F-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-F-NEXT: </ReferenceBlock>
-  // CHECK-F-NEXT: </TypeBlock>
-// CHECK-F-NEXT: </FunctionBlock>
 
 namespace B {
-// CHECK-B: <NamespaceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-B-NEXT: <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
-  // CHECK-B-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-  // CHECK-B-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-B-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-    // CHECK-B-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-    // CHECK-B-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-B-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-B-NEXT: </ReferenceBlock>
-// CHECK-B-NEXT: </NamespaceBlock>
 
 enum E { X };
-// CHECK-E: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-E-NEXT: <USR abbrevid=4 op0=20 op1=233 op2=171 op3=247 op4=231 op5=226 op6=66 op7=91 op8=98 op9=103 op10=35 op11=212 op12=30 op13=118 op14=228 op15=188 op16=126 op17=122 op18=91 op19=215 op20=117/>
-  // CHECK-E-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-  // CHECK-E-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-E-NEXT: <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
-    // CHECK-E-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-    // CHECK-E-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-E-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-E-NEXT: </ReferenceBlock>
-  // CHECK-E-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-E-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-    // CHECK-E-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-    // CHECK-E-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-E-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-E-NEXT: </ReferenceBlock>
-  // CHECK-E-NEXT: <DefLocation abbrevid=6 op0=56 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-E-NEXT: <Member abbrevid=8 op0=1/> blob data = 'X'
-// CHECK-E-NEXT: </EnumBlock>
 
 E func(int i) { return X; }
-// CHECK-FUNC: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-FUNC-NEXT: <USR abbrevid=4 op0=20 op1=154 op2=130 op3=203 op4=51 op5=237 op6=15 op7=223 op8=129 op9=238 op10=56 op11=61 op12=49 op13=205 op14=9 op15=87 op16=209 op17=83 op18=197 op19=232 op20=64/>
-  // CHECK-FUNC-NEXT: <Name abbrevid=5 op0=4/> blob data = 'func'
-  // CHECK-FUNC-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-FUNC-NEXT: <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
-    // CHECK-FUNC-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-    // CHECK-FUNC-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-FUNC-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-FUNC-NEXT: </ReferenceBlock>
-  // CHECK-FUNC-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-FUNC-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-    // CHECK-FUNC-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-    // CHECK-FUNC-NEXT: <RefType abbrevid=6 op0=1/>
-    // CHECK-FUNC-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-FUNC-NEXT: </ReferenceBlock>
-  // CHECK-FUNC-NEXT: <DefLocation abbrevid=6 op0=76 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-FUNC-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-FUNC-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-FUNC-NEXT: <Name abbrevid=5 op0=12/> blob data = 'enum A::B::E'
-      // CHECK-FUNC-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-FUNC-NEXT: </ReferenceBlock>
-  // CHECK-FUNC-NEXT: </TypeBlock>
-  // CHECK-FUNC-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-FUNC-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-FUNC-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-FUNC-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-FUNC-NEXT: </ReferenceBlock>
-    // CHECK-FUNC-NEXT: <Name abbrevid=4 op0=1/> blob data = 'i'
-  // CHECK-FUNC-NEXT: </FieldTypeBlock>
-// CHECK-FUNC-NEXT: </FunctionBlock>
 
 }  // namespace B
 }  // namespace A
+
+// RUN: clang-doc --dump-intermediate --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/8D042EFFC98B373450BC6B5B90A330C25A150E9C.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <NamespaceBlock NumWords=46 BlockCodeSize=4>
+// CHECK-0-NEXT:   <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-0-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-0-NEXT:   <FunctionBlock NumWords=35 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=57 op2=211 op3=201 op4=90 op5=95 op6=124 op7=226 op8=186 op9=73 op10=55 op11=189 op12=123 op13=1 op14=186 op15=224 op16=158 op17=188 op18=42 op19=216 op20=172/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'f'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=14 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <Location abbrevid=7 op0=8 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </NamespaceBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E21AF79E2A9D02554BA090D10DF39FE273F5CDB5.bc | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: <BLOCKINFO_BLOCK/>
+// CHECK-1-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-1-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-1-NEXT: </VersionBlock>
+// CHECK-1-NEXT: <NamespaceBlock NumWords=119 BlockCodeSize=4>
+// CHECK-1-NEXT:   <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
+// CHECK-1-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'B'
+// CHECK-1-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:     <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-1-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-1-NEXT:     <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:     <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:   </ReferenceBlock>
+// CHECK-1-NEXT:   <FunctionBlock NumWords=56 BlockCodeSize=4>
+// CHECK-1-NEXT:     <USR abbrevid=4 op0=20 op1=154 op2=130 op3=203 op4=51 op5=237 op6=15 op7=223 op8=129 op9=238 op10=56 op11=61 op12=49 op13=205 op14=9 op15=87 op16=209 op17=83 op18=197 op19=232 op20=64/>
+// CHECK-1-NEXT:     <Name abbrevid=5 op0=4/> blob data = 'func'
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'B'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <DefLocation abbrevid=6 op0=20 op1=4/> blob data = '{{.*}}'
+// CHECK-1-NEXT:     <TypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-1-NEXT:       <ReferenceBlock NumWords=5 BlockCodeSize=4>
+// CHECK-1-NEXT:         <Name abbrevid=5 op0=12/> blob data = 'enum A::B::E'
+// CHECK-1-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-1-NEXT:       </ReferenceBlock>
+// CHECK-1-NEXT:     </TypeBlock>
+// CHECK-1-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-1-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-1-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-1-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-1-NEXT:       </ReferenceBlock>
+// CHECK-1-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'i'
+// CHECK-1-NEXT:     </FieldTypeBlock>
+// CHECK-1-NEXT:   </FunctionBlock>
+// CHECK-1-NEXT:   <EnumBlock NumWords=38 BlockCodeSize=4>
+// CHECK-1-NEXT:     <USR abbrevid=4 op0=20 op1=233 op2=171 op3=247 op4=231 op5=226 op6=66 op7=91 op8=98 op9=103 op10=35 op11=212 op12=30 op13=118 op14=228 op15=188 op16=126 op17=122 op18=91 op19=215 op20=117/>
+// CHECK-1-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'B'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <DefLocation abbrevid=6 op0=18 op1=4/> blob data = '{{.*}}'
+// CHECK-1-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'X'
+// CHECK-1-NEXT:   </EnumBlock>
+// CHECK-1-NEXT: </NamespaceBlock>
Index: clang-tools-extra/test/clang-doc/bc-record.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/bc-record.cpp
+++ clang-tools-extra/test/clang-doc/bc-record.cpp
@@ -1,120 +1,23 @@
-// This test requires Linux due to the system-dependent USR for the
-// inner class in function H.
+// This test requires Linux due to system-dependent USR for the inner class.
 // REQUIRES: system-linux
 // RUN: rm -rf %t
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-intermediate -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/ACE81AFA6627B4CEF2B456FB6E1252925674AF7E.bc --dump | FileCheck %s --check-prefix CHECK-A
-// RUN: llvm-bcanalyzer %t/docs/bc/FC07BD34D5E77782C263FA944447929EA8753740.bc --dump | FileCheck %s --check-prefix CHECK-B
-// RUN: llvm-bcanalyzer %t/docs/bc/1E3438A08BA22025C0B46289FF0686F92C8924C5.bc --dump | FileCheck %s --check-prefix CHECK-BC
-// RUN: llvm-bcanalyzer %t/docs/bc/06B5F6A19BA9F6A832E127C9968282B94619B210.bc --dump | FileCheck %s --check-prefix CHECK-C
-// RUN: llvm-bcanalyzer %t/docs/bc/0921737541208B8FA9BB42B60F78AC1D779AA054.bc --dump | FileCheck %s --check-prefix CHECK-D
-// RUN: llvm-bcanalyzer %t/docs/bc/289584A8E0FF4178A794622A547AA622503967A1.bc --dump | FileCheck %s --check-prefix CHECK-E
-// RUN: llvm-bcanalyzer %t/docs/bc/DEB4AC1CD9253CD9EF7FBE6BCAC506D77984ABD4.bc --dump | FileCheck %s --check-prefix CHECK-ECON
-// RUN: llvm-bcanalyzer %t/docs/bc/BD2BDEBD423F80BACCEA75DE6D6622D355FC2D17.bc --dump | FileCheck %s --check-prefix CHECK-EDES
-// RUN: llvm-bcanalyzer %t/docs/bc/E3B54702FABFF4037025BA194FC27C47006330B5.bc --dump | FileCheck %s --check-prefix CHECK-F
-// RUN: llvm-bcanalyzer %t/docs/bc/B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E.bc --dump | FileCheck %s --check-prefix CHECK-H
-// RUN: llvm-bcanalyzer %t/docs/bc/6BA1EE2B3DAEACF6E4306F10AF44908F4807927C.bc --dump | FileCheck %s --check-prefix CHECK-I
-// RUN: llvm-bcanalyzer %t/docs/bc/5093D428CDC62096A67547BA52566E4FB9404EEE.bc --dump | FileCheck %s --check-prefix CHECK-PM
-// RUN: llvm-bcanalyzer %t/docs/bc/CA7C7935730B5EACD25F080E9C83FA087CCDC75E.bc --dump | FileCheck %s --check-prefix CHECK-X
-// RUN: llvm-bcanalyzer %t/docs/bc/641AB4A3D36399954ACDE29C7A8833032BF40472.bc --dump | FileCheck %s --check-prefix CHECK-Y
 
 void H() {
   class I {};
 }
-// CHECK-H: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-H-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-  // CHECK-H-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=24 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-H-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-H-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-H-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-H-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-H-NEXT: </ReferenceBlock>
-  // CHECK-H-NEXT: </TypeBlock>
-// CHECK-H-NEXT: </FunctionBlock>
-
-
-// CHECK-I: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-I-NEXT: <USR abbrevid=4 op0=20 op1=107 op2=161 op3=238 op4=43 op5=61 op6=174 op7=172 op8=246 op9=228 op10=48 op11=111 op12=16 op13=175 op14=68 op15=144 op16=143 op17=72 op18=7 op19=146 op20=124/>
-  // CHECK-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'I'
-  // CHECK-I-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-I-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-    // CHECK-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-    // CHECK-I-NEXT: <RefType abbrevid=6 op0=3/>
-    // CHECK-I-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-I-NEXT: </ReferenceBlock>
-  // CHECK-I-NEXT: <DefLocation abbrevid=6 op0=25 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-I-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-I-NEXT: </RecordBlock>
 
 union A { int X; int Y; };
-// CHECK-A: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-A-NEXT: <USR abbrevid=4 op0=20 op1=172 op2=232 op3=26 op4=250 op5=102 op6=39 op7=180 op8=206 op9=242 op10=180 op11=86 op12=251 op13=110 op14=18 op15=82 op16=146 op17=86 op18=116 op19=175 op20=126/>
-  // CHECK-A-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-  // CHECK-A-NEXT: <DefLocation abbrevid=6 op0=53 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-A-NEXT: <TagType abbrevid=8 op0=2/>
-  // CHECK-A-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-A-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-A-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-A-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-A-NEXT: </ReferenceBlock>
-    // CHECK-A-NEXT: <Name abbrevid=4 op0=1/> blob data = 'X'
-    // CHECK-A-NEXT: <Access abbrevid=5 op0=3/>
-  // CHECK-A-NEXT: </MemberTypeBlock>
-  // CHECK-A-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-A-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-A-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-A-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-A-NEXT: </ReferenceBlock>
-    // CHECK-A-NEXT: <Name abbrevid=4 op0=1/> blob data = 'Y'
-    // CHECK-A-NEXT: <Access abbrevid=5 op0=3/>
-  // CHECK-A-NEXT: </MemberTypeBlock>
-// CHECK-A-NEXT: </RecordBlock>
 
 enum B { X, Y };
-// CHECK-B: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-B-NEXT: <USR abbrevid=4 op0=20 op1=252 op2=7 op3=189 op4=52 op5=213 op6=231 op7=119 op8=130 op9=194 op10=99 op11=250 op12=148 op13=68 op14=71 op15=146 op16=158 op17=168 op18=117 op19=55 op20=64/>
-  // CHECK-B-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-  // CHECK-B-NEXT: <DefLocation abbrevid=6 op0=77 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'X'
-  // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'Y'
-// CHECK-B-NEXT: </EnumBlock>
 
 enum class Bc { A, B };
-// CHECK-BC: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-BC-NEXT: <USR abbrevid=4 op0=20 op1=30 op2=52 op3=56 op4=160 op5=139 op6=162 op7=32 op8=37 op9=192 op10=180 op11=98 op12=137 op13=255 op14=6 op15=134 op16=249 op17=44 op18=137 op19=36 op20=197/>
-  // CHECK-BC-NEXT: <Name abbrevid=5 op0=2/> blob data = 'Bc'
-  // CHECK-BC-NEXT: <DefLocation abbrevid=6 op0=86 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-BC-NEXT: <Scoped abbrevid=9 op0=1/>
-  // CHECK-BC-NEXT: <Member abbrevid=8 op0=1/> blob data = 'A'
-  // CHECK-BC-NEXT: <Member abbrevid=8 op0=1/> blob data = 'B'
-// CHECK-BC-NEXT: </EnumBlock>
 
 struct C { int i; };
-// CHECK-C: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-C-NEXT: <USR abbrevid=4 op0=20 op1=6 op2=181 op3=246 op4=161 op5=155 op6=169 op7=246 op8=168 op9=50 op10=225 op11=39 op12=201 op13=150 op14=130 op15=130 op16=185 op17=70 op18=25 op19=178 op20=16/>
-  // CHECK-C-NEXT: <Name abbrevid=5 op0=1/> blob data = 'C'
-  // CHECK-C-NEXT: <DefLocation abbrevid=6 op0=96 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-C-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-C-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-C-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-C-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-C-NEXT: </ReferenceBlock>
-    // CHECK-C-NEXT: <Name abbrevid=4 op0=1/> blob data = 'i'
-    // CHECK-C-NEXT: <Access abbrevid=5 op0=3/>
-  // CHECK-C-NEXT: </MemberTypeBlock>
-// CHECK-C-NEXT: </RecordBlock>
 
 class D {};
-// CHECK-D: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-D-NEXT: <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
-  // CHECK-D-NEXT: <Name abbrevid=5 op0=1/> blob data = 'D'
-  // CHECK-D-NEXT: <DefLocation abbrevid=6 op0=111 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-D-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-D-NEXT: </RecordBlock>
 
 class E {
 public:
@@ -124,131 +27,264 @@
 protected:
   void ProtectedMethod();
 };
-// CHECK-E: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-E-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-  // CHECK-E-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-  // CHECK-E-NEXT: <DefLocation abbrevid=6 op0=119 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-E-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-E-NEXT: </RecordBlock>
-
-// CHECK-ECON: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-ECON-NEXT: <USR abbrevid=4 op0=20 op1=222 op2=180 op3=172 op4=28 op5=217 op6=37 op7=60 op8=217 op9=239 op10=127 op11=190 op12=107 op13=202 op14=197 op15=6 op16=215 op17=121 op18=132 op19=171 op20=212/>
-  // CHECK-ECON-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-ECON-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-ECON-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-      // CHECK-ECON-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-      // CHECK-ECON-NEXT: <RefType abbrevid=6 op0=2/>
-      // CHECK-ECON-NEXT: <Field abbrevid=7 op0=1/>
-    // CHECK-ECON-NEXT: </ReferenceBlock>
-  // CHECK-ECON-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-ECON-NEXT: <DefLocation abbrevid=6 op0=121 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-ECON-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-ECON-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-ECON-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-ECON-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-ECON-NEXT: <Field abbrevid=7 op0=2/>
-  // CHECK-ECON-NEXT: </ReferenceBlock>
-  // CHECK-ECON-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-ECON-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-ECON-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-ECON-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-ECON-NEXT: </ReferenceBlock>
-  // CHECK-ECON-NEXT: </TypeBlock>
-// CHECK-ECON-NEXT: </FunctionBlock>
-
-// CHECK-EDES: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-EDES-NEXT: <USR abbrevid=4 op0=20 op1=189 op2=43 op3=222 op4=189 op5=66 op6=63 op7=128 op8=186 op9=204 op10=234 op11=117 op12=222 op13=109 op14=102 op15=34 op16=211 op17=85 op18=252 op19=45 op20=23/>
-  // CHECK-EDES-NEXT: <Name abbrevid=5 op0=2/> blob data = '~E'
-  // CHECK-EDES-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-EDES-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-EDES-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-EDES-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-EDES-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-EDES-NEXT: </ReferenceBlock>
-  // CHECK-EDES-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-EDES-NEXT: <DefLocation abbrevid=6 op0=122 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-EDES-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-EDES-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-EDES-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-EDES-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-EDES-NEXT: <Field abbrevid=7 op0=2/>
-  // CHECK-EDES-NEXT: </ReferenceBlock>
-  // CHECK-EDES-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-EDES-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-EDES-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-EDES-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-EDES-NEXT: </ReferenceBlock>
-  // CHECK-EDES-NEXT: </TypeBlock>
-// CHECK-EDES-NEXT: </FunctionBlock>
 
 void E::ProtectedMethod() {}
-// CHECK-PM: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-PM-NEXT: <USR abbrevid=4 op0=20 op1=80 op2=147 op3=212 op4=40 op5=205 op6=198 op7=32 op8=150 op9=166 op10=117 op11=71 op12=186 op13=82 op14=86 op15=110 op16=79 op17=185 op18=64 op19=78 op20=238/>
-  // CHECK-PM-NEXT: <Name abbrevid=5 op0=15/> blob data = 'ProtectedMethod'
-  // CHECK-PM-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-PM-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-PM-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-PM-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-PM-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-PM-NEXT: </ReferenceBlock>
-  // CHECK-PM-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-PM-NEXT: <DefLocation abbrevid=6 op0=184 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-PM-NEXT: <Location abbrevid=7 op0=125 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-PM-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-PM-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-PM-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-PM-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-PM-NEXT: <Field abbrevid=7 op0=2/>
-  // CHECK-PM-NEXT: </ReferenceBlock>
-  // CHECK-PM-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-PM-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-PM-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-PM-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-PM-NEXT: </ReferenceBlock>
-  // CHECK-PM-NEXT: </TypeBlock>
-// CHECK-PM-NEXT: </FunctionBlock>
-
-
 
 class F : virtual private D, public E {};
-// CHECK-F: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=227 op2=181 op3=71 op4=2 op5=250 op6=191 op7=244 op8=3 op9=112 op10=37 op11=186 op12=25 op13=79 op14=194 op15=124 op16=71 op17=0 op18=99 op19=48 op20=181/>
-  // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'F'
-  // CHECK-F-NEXT: <DefLocation abbrevid=6 op0=213 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-F-NEXT: <TagType abbrevid=8 op0=3/>
-  // CHECK-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-    // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-    // CHECK-F-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-F-NEXT: <Field abbrevid=7 op0=2/>
-  // CHECK-F-NEXT: </ReferenceBlock>
-  // CHECK-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
-    // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'D'
-    // CHECK-F-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-F-NEXT: <Field abbrevid=7 op0=3/>
-  // CHECK-F-NEXT: </ReferenceBlock>
-// CHECK-F-NEXT: </RecordBlock>
 
 class X {
   class Y {};
 };
-// CHECK-X: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-X-NEXT: <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
-  // CHECK-X-NEXT: <Name abbrevid=5 op0=1/> blob data = 'X'
-  // CHECK-X-NEXT: <DefLocation abbrevid=6 op0=233 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-X-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-X-NEXT: </RecordBlock>
-
-// CHECK-Y: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-Y-NEXT: <USR abbrevid=4 op0=20 op1=100 op2=26 op3=180 op4=163 op5=211 op6=99 op7=153 op8=149 op9=74 op10=205 op11=226 op12=156 op13=122 op14=136 op15=51 op16=3 op17=43 op18=244 op19=4 op20=114/>
-  // CHECK-Y-NEXT: <Name abbrevid=5 op0=1/> blob data = 'Y'
-  // CHECK-Y-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-Y-NEXT: <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
-    // CHECK-Y-NEXT: <Name abbrevid=5 op0=1/> blob data = 'X'
-    // CHECK-Y-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-Y-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-Y-NEXT: </ReferenceBlock>
-  // CHECK-Y-NEXT: <DefLocation abbrevid=6 op0=234 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-Y-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-Y-NEXT: </RecordBlock>
+
+// RUN: clang-doc --dump-intermediate --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/289584A8E0FF4178A794622A547AA622503967A1.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <RecordBlock NumWords=157 BlockCodeSize=4>
+// CHECK-0-NEXT:   <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:   <DefLocation abbrevid=6 op0=22 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=44 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=222 op2=180 op3=172 op4=28 op5=217 op6=37 op7=60 op8=217 op9=239 op10=127 op11=190 op12=107 op13=202 op14=197 op15=6 op16=215 op17=121 op18=132 op19=171 op20=212/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <IsMethod abbrevid=9 op0=1/>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=24 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=2/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=44 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=189 op2=43 op3=222 op4=189 op5=66 op6=63 op7=128 op8=186 op9=204 op10=234 op11=117 op12=222 op13=109 op14=102 op15=34 op16=211 op17=85 op18=252 op19=45 op20=23/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=2/> blob data = '~E'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <IsMethod abbrevid=9 op0=1/>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=25 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=2/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=50 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=80 op2=147 op3=212 op4=40 op5=205 op6=198 op7=32 op8=150 op9=166 op10=117 op11=71 op12=186 op13=82 op14=86 op15=110 op16=79 op17=185 op18=64 op19=78 op20=238/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=15/> blob data = 'ProtectedMethod'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <IsMethod abbrevid=9 op0=1/>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=31 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <Location abbrevid=7 op0=28 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=2/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/CA7C7935730B5EACD25F080E9C83FA087CCDC75E.bc | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: <BLOCKINFO_BLOCK/>
+// CHECK-1-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-1-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-1-NEXT: </VersionBlock>
+// CHECK-1-NEXT: <RecordBlock NumWords=12 BlockCodeSize=4>
+// CHECK-1-NEXT:   <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
+// CHECK-1-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'X'
+// CHECK-1-NEXT:   <DefLocation abbrevid=6 op0=35 op1=4/> blob data = '{{.*}}'
+// CHECK-1-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-1-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/06B5F6A19BA9F6A832E127C9968282B94619B210.bc | FileCheck %s --check-prefix CHECK-2
+// CHECK-2: <BLOCKINFO_BLOCK/>
+// CHECK-2-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-2-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-2-NEXT: </VersionBlock>
+// CHECK-2-NEXT: <RecordBlock NumWords=22 BlockCodeSize=4>
+// CHECK-2-NEXT:   <USR abbrevid=4 op0=20 op1=6 op2=181 op3=246 op4=161 op5=155 op6=169 op7=246 op8=168 op9=50 op10=225 op11=39 op12=201 op13=150 op14=130 op15=130 op16=185 op17=70 op18=25 op19=178 op20=16/>
+// CHECK-2-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'C'
+// CHECK-2-NEXT:   <DefLocation abbrevid=6 op0=18 op1=4/> blob data = '{{.*}}'
+// CHECK-2-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-2-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-2-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-2-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-2-NEXT:     </ReferenceBlock>
+// CHECK-2-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'i'
+// CHECK-2-NEXT:     <Access abbrevid=5 op0=3/>
+// CHECK-2-NEXT:   </MemberTypeBlock>
+// CHECK-2-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E60CA1CC7048098A7F4A48C3A53D45A533BDC39B.bc | FileCheck %s --check-prefix CHECK-3
+// CHECK-3: <BLOCKINFO_BLOCK/>
+// CHECK-3-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-3-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-3-NEXT: </VersionBlock>
+// CHECK-3-NEXT: <RecordBlock NumWords=24 BlockCodeSize=4>
+// CHECK-3-NEXT:   <USR abbrevid=4 op0=20 op1=230 op2=12 op3=161 op4=204 op5=112 op6=72 op7=9 op8=138 op9=127 op10=74 op11=72 op12=195 op13=165 op14=61 op15=69 op16=165 op17=51 op18=189 op19=195 op20=155/>
+// CHECK-3-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'I'
+// CHECK-3-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-3-NEXT:     <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
+// CHECK-3-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'H'
+// CHECK-3-NEXT:     <RefType abbrevid=6 op0=3/>
+// CHECK-3-NEXT:     <Field abbrevid=7 op0=1/>
+// CHECK-3-NEXT:   </ReferenceBlock>
+// CHECK-3-NEXT:   <DefLocation abbrevid=6 op0=9 op1=4/> blob data = '{{.*}}'
+// CHECK-3-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-3-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/641AB4A3D36399954ACDE29C7A8833032BF40472.bc | FileCheck %s --check-prefix CHECK-4
+// CHECK-4: <BLOCKINFO_BLOCK/>
+// CHECK-4-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-4-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-4-NEXT: </VersionBlock>
+// CHECK-4-NEXT: <RecordBlock NumWords=24 BlockCodeSize=4>
+// CHECK-4-NEXT:   <USR abbrevid=4 op0=20 op1=100 op2=26 op3=180 op4=163 op5=211 op6=99 op7=153 op8=149 op9=74 op10=205 op11=226 op12=156 op13=122 op14=136 op15=51 op16=3 op17=43 op18=244 op19=4 op20=114/>
+// CHECK-4-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'Y'
+// CHECK-4-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-4-NEXT:     <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
+// CHECK-4-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'X'
+// CHECK-4-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-4-NEXT:     <Field abbrevid=7 op0=1/>
+// CHECK-4-NEXT:   </ReferenceBlock>
+// CHECK-4-NEXT:   <DefLocation abbrevid=6 op0=36 op1=4/> blob data = '{{.*}}'
+// CHECK-4-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-4-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0000000000000000000000000000000000000000.bc | FileCheck %s --check-prefix CHECK-5
+// CHECK-5: <BLOCKINFO_BLOCK/>
+// CHECK-5-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-5-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-5-NEXT: </VersionBlock>
+// CHECK-5-NEXT: <NamespaceBlock NumWords=59 BlockCodeSize=4>
+// CHECK-5-NEXT:   <FunctionBlock NumWords=20 BlockCodeSize=4>
+// CHECK-5-NEXT:     <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
+// CHECK-5-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'H'
+// CHECK-5-NEXT:     <DefLocation abbrevid=6 op0=8 op1=4/> blob data = '{{.*}}'
+// CHECK-5-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-5-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-5-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-5-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-5-NEXT:       </ReferenceBlock>
+// CHECK-5-NEXT:     </TypeBlock>
+// CHECK-5-NEXT:   </FunctionBlock>
+// CHECK-5-NEXT:   <EnumBlock NumWords=16 BlockCodeSize=4>
+// CHECK-5-NEXT:     <USR abbrevid=4 op0=20 op1=252 op2=7 op3=189 op4=52 op5=213 op6=231 op7=119 op8=130 op9=194 op10=99 op11=250 op12=148 op13=68 op14=71 op15=146 op16=158 op17=168 op18=117 op19=55 op20=64/>
+// CHECK-5-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'B'
+// CHECK-5-NEXT:     <DefLocation abbrevid=6 op0=14 op1=4/> blob data = '{{.*}}'
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'X'
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'Y'
+// CHECK-5-NEXT:   </EnumBlock>
+// CHECK-5-NEXT:   <EnumBlock NumWords=16 BlockCodeSize=4>
+// CHECK-5-NEXT:     <USR abbrevid=4 op0=20 op1=30 op2=52 op3=56 op4=160 op5=139 op6=162 op7=32 op8=37 op9=192 op10=180 op11=98 op12=137 op13=255 op14=6 op15=134 op16=249 op17=44 op18=137 op19=36 op20=197/>
+// CHECK-5-NEXT:     <Name abbrevid=5 op0=2/> blob data = 'Bc'
+// CHECK-5-NEXT:     <DefLocation abbrevid=6 op0=16 op1=4/> blob data = '{{.*}}'
+// CHECK-5-NEXT:     <Scoped abbrevid=9 op0=1/>
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'A'
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'B'
+// CHECK-5-NEXT:   </EnumBlock>
+// CHECK-5-NEXT: </NamespaceBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0921737541208B8FA9BB42B60F78AC1D779AA054.bc | FileCheck %s --check-prefix CHECK-6
+// CHECK-6: <BLOCKINFO_BLOCK/>
+// CHECK-6-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-6-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-6-NEXT: </VersionBlock>
+// CHECK-6-NEXT: <RecordBlock NumWords=12 BlockCodeSize=4>
+// CHECK-6-NEXT:   <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
+// CHECK-6-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'D'
+// CHECK-6-NEXT:   <DefLocation abbrevid=6 op0=20 op1=4/> blob data = '{{.*}}'
+// CHECK-6-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-6-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E3B54702FABFF4037025BA194FC27C47006330B5.bc | FileCheck %s --check-prefix CHECK-7
+// CHECK-7: <BLOCKINFO_BLOCK/>
+// CHECK-7-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-7-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-7-NEXT: </VersionBlock>
+// CHECK-7-NEXT: <RecordBlock NumWords=37 BlockCodeSize=4>
+// CHECK-7-NEXT:   <USR abbrevid=4 op0=20 op1=227 op2=181 op3=71 op4=2 op5=250 op6=191 op7=244 op8=3 op9=112 op10=37 op11=186 op12=25 op13=79 op14=194 op15=124 op16=71 op17=0 op18=99 op19=48 op20=181/>
+// CHECK-7-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'F'
+// CHECK-7-NEXT:   <DefLocation abbrevid=6 op0=33 op1=4/> blob data = '{{.*}}'
+// CHECK-7-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-7-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-7-NEXT:     <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-7-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-7-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-7-NEXT:     <Field abbrevid=7 op0=2/>
+// CHECK-7-NEXT:   </ReferenceBlock>
+// CHECK-7-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-7-NEXT:     <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
+// CHECK-7-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'D'
+// CHECK-7-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-7-NEXT:     <Field abbrevid=7 op0=3/>
+// CHECK-7-NEXT:   </ReferenceBlock>
+// CHECK-7-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/ACE81AFA6627B4CEF2B456FB6E1252925674AF7E.bc | FileCheck %s --check-prefix CHECK-8
+// CHECK-8: <BLOCKINFO_BLOCK/>
+// CHECK-8-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-8-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-8-NEXT: </VersionBlock>
+// CHECK-8-NEXT: <RecordBlock NumWords=33 BlockCodeSize=4>
+// CHECK-8-NEXT:   <USR abbrevid=4 op0=20 op1=172 op2=232 op3=26 op4=250 op5=102 op6=39 op7=180 op8=206 op9=242 op10=180 op11=86 op12=251 op13=110 op14=18 op15=82 op16=146 op17=86 op18=116 op19=175 op20=126/>
+// CHECK-8-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-8-NEXT:   <DefLocation abbrevid=6 op0=12 op1=4/> blob data = '{{.*}}'
+// CHECK-8-NEXT:   <TagType abbrevid=8 op0=2/>
+// CHECK-8-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-8-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-8-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-8-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-8-NEXT:     </ReferenceBlock>
+// CHECK-8-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'X'
+// CHECK-8-NEXT:     <Access abbrevid=5 op0=3/>
+// CHECK-8-NEXT:   </MemberTypeBlock>
+// CHECK-8-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-8-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-8-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-8-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-8-NEXT:     </ReferenceBlock>
+// CHECK-8-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'Y'
+// CHECK-8-NEXT:     <Access abbrevid=5 op0=3/>
+// CHECK-8-NEXT:   </MemberTypeBlock>
+// CHECK-8-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-class-in-class.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-class-in-class.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/641AB4A3D36399954ACDE29C7A8833032BF40472.bc --dump | FileCheck %s --check-prefix CHECK-X-Y
-// RUN: llvm-bcanalyzer %t/docs/bc/CA7C7935730B5EACD25F080E9C83FA087CCDC75E.bc --dump | FileCheck %s --check-prefix CHECK-X
-
-class X {
-  class Y {};
-};
-
-// CHECK-X: <BLOCKINFO_BLOCK/>
-// CHECK-X-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-X-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-X-NEXT: </VersionBlock>
-// CHECK-X-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-X-NEXT: <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
-  // CHECK-X-NEXT: <Name abbrevid=5 op0=1/> blob data = 'X'
-  // CHECK-X-NEXT: <DefLocation abbrevid=6 op0=9 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-X-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-X-NEXT: </RecordBlock>
-
-
-// CHECK-X-Y: <BLOCKINFO_BLOCK/>
-// CHECK-X-Y-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-X-Y-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-X-Y-NEXT: </VersionBlock>
-// CHECK-X-Y-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-X-Y-NEXT: <USR abbrevid=4 op0=20 op1=100 op2=26 op3=180 op4=163 op5=211 op6=99 op7=153 op8=149 op9=74 op10=205 op11=226 op12=156 op13=122 op14=136 op15=51 op16=3 op17=43 op18=244 op19=4 op20=114/>
-  // CHECK-X-Y-NEXT: <Name abbrevid=5 op0=1/> blob data = 'Y'
-  // CHECK-X-Y-NEXT: <ReferenceBlock NumWords=10 BlockCodeSize=4>
-      // CHECK-X-Y-NEXT: <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
-      // CHECK-X-Y-NEXT: <Name abbrevid=5 op0=1/> blob data = 'X'
-      // CHECK-X-Y-NEXT: <RefType abbrevid=6 op0=2/>
-      // CHECK-X-Y-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-X-Y-NEXT: </ReferenceBlock>  
-  // CHECK-X-Y-NEXT: <DefLocation abbrevid=6 op0=10 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-X-Y-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-X-Y-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-class-in-function.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-class-in-function.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// This test requires Linux due to the system-dependent USR for the
-// inner class.
-// REQUIRES: system-linux
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E.bc --dump | FileCheck %s --check-prefix CHECK-H
-// RUN: llvm-bcanalyzer %t/docs/bc/01A95F3F73F53281B3E50109A577FD2493159365.bc --dump | FileCheck %s --check-prefix CHECK-H-I
-
-void H() {
-  class I {};
-}
-
-// CHECK-H: <BLOCKINFO_BLOCK/>
-// CHECK-H-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-H-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-H-NEXT: </VersionBlock>
-// CHECK-H-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-H-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-  // CHECK-H-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=12 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-H-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-H-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-H-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
-      // CHECK-H-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-H-NEXT: </ReferenceBlock>
-  // CHECK-H-NEXT: </TypeBlock>
-// CHECK-H-NEXT: </FunctionBlock>
-
-// CHECK-H-I: <BLOCKINFO_BLOCK/>
-// CHECK-H-I-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-H-I-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-H-I-NEXT: </VersionBlock>
-// CHECK-H-I-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-H-I-NEXT: <USR abbrevid=4 op0=20 op1=1 op2=169 op3=95 op4=63 op5=115 op6=245 op7=50 op8=129 op9=179 op10=229 op11=1 op12=9 op13=165 op14=119 op15=253 op16=36 op17=147 op18=21 op19=147 op20=101/>
-  // CHECK-H-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'I'
-  // CHECK-H-I-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-H-I-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-    // CHECK-H-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-    // CHECK-H-I-NEXT: <RefType abbrevid=6 op0=3/>
-    // CHECK-H-I-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-H-I-NEXT: </ReferenceBlock>
-  // CHECK-H-I-NEXT: <DefLocation abbrevid=6 op0=13 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-H-I-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-H-I-NEXT: </RecordBlock>
-
-
Index: clang-tools-extra/test/clang-doc/mapper-class.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-class.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/289584A8E0FF4178A794622A547AA622503967A1.bc --dump | FileCheck %s
-
-class E {};
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-  // CHECK-NEXT: <DefLocation abbrevid=6 op0=8 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-comment.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-doc/mapper-comment.cpp
@@ -0,0 +1,71 @@
+// RUN: rm -rf %t
+// RUN: mkdir %t
+// RUN: echo "" > %t/compile_flags.txt
+// RUN: cp "%s" "%t/test.cpp"
+
+/// \brief Brief description.
+///
+/// Extended description that
+/// continues onto the next line.
+/// 
+/// <ul class="test">
+///   <li> Testing.
+/// </ul>
+///
+/// \verbatim
+/// The description continues.
+/// \endverbatim
+/// --
+/// \param [out] I is a parameter.
+/// \param J is a parameter.
+/// \return void
+void F(int I, int J);
+
+/// Bonus comment on definition
+void F(int I, int J) {}
+
+// RUN: clang-doc --dump-mapper --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0000000000000000000000000000000000000000.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <NamespaceBlock NumWords=73 BlockCodeSize=4>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=70 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=117 op2=116 op3=99 op4=6 op5=20 op6=165 op7=53 op8=113 op9=14 op10=90 op11=106 op12=188 op13=255 op14=249 op15=139 op16=202 op17=45 op18=6 op19=164 op20=202/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'F'
+// CHECK-0-NEXT:     <CommentBlock NumWords=28 BlockCodeSize=4>
+// CHECK-0-NEXT:       <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
+// CHECK-0-NEXT:       <CommentBlock NumWords=21 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
+// CHECK-0-NEXT:         <CommentBlock NumWords=13 BlockCodeSize=4>
+// CHECK-0-NEXT:           <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
+// CHECK-0-NEXT:           <Text abbrevid=5 op0=28/> blob data = ' Bonus comment on definition'
+// CHECK-0-NEXT:         </CommentBlock>
+// CHECK-0-NEXT:       </CommentBlock>
+// CHECK-0-NEXT:     </CommentBlock>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=25 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'I'
+// CHECK-0-NEXT:     </FieldTypeBlock>
+// CHECK-0-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'J'
+// CHECK-0-NEXT:     </FieldTypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </NamespaceBlock>
Index: clang-tools-extra/test/clang-doc/mapper-comments.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-comments.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/7574630614A535710E5A6ABCFFF98BCA2D06A4CA.bc --dump | FileCheck %s
-
-/// \brief Brief description.
-///
-/// Extended description that
-/// continues onto the next line.
-/// 
-/// <ul> class="test">
-///   <li> Testing.
-/// </ul>
-///
-/// \verbatim
-/// The description continues.
-/// \endverbatim
-///
-/// \param [out] I is a parameter.
-/// \param J is a parameter.
-/// \return int
-int F(int I, int J);
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=117 op2=116 op3=99 op4=6 op5=20 op6=165 op7=53 op8=113 op9=14 op10=90 op11=106 op12=188 op13=255 op14=249 op15=139 op16=202 op17=45 op18=6 op19=164 op20=202/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'F'
-  // CHECK-NEXT: <CommentBlock NumWords=351 BlockCodeSize=4>
-    // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'FullComment'
-    // CHECK-NEXT: <CommentBlock NumWords=13 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=31 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=5/> blob data = 'brief'
-      // CHECK-NEXT: <CommentBlock NumWords=19 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords=11 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=19/> blob data = ' Brief description.'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=37 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords=13 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=26/> blob data = ' Extended description that'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=14 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=30/> blob data = ' continues onto the next line.'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=83 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=9 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'ul'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=10 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=14/> blob data = ' class="test">'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=9 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'HTMLStartTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'li'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=9 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=9/> blob data = ' Testing.'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: <CommentBlock NumWords=9 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=17/> blob data = 'HTMLEndTagComment'
-        // CHECK-NEXT: <Name abbrevid=6 op0=2/> blob data = 'ul'
-        // CHECK-NEXT: <SelfClosing abbrevid=10 op0=1/>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=13 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=32 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=20/> blob data = 'VerbatimBlockComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=8/> blob data = 'verbatim'
-      // CHECK-NEXT: <CloseName abbrevid=9 op0=11/> blob data = 'endverbatim'
-      // CHECK-NEXT: <CommentBlock NumWords=16 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=24/> blob data = 'VerbatimBlockLineComment'
-        // CHECK-NEXT: <Text abbrevid=5 op0=27/> blob data = ' The description continues.'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=13 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-      // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=39 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
-      // CHECK-NEXT: <Direction abbrevid=7 op0=5/> blob data = '[out]'
-      // CHECK-NEXT: <ParamName abbrevid=8 op0=1/> blob data = 'I'
-      // CHECK-NEXT: <Explicit abbrevid=11 op0=1/>
-      // CHECK-NEXT: <CommentBlock NumWords=25 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords=10 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
-        // CHECK-NEXT: </CommentBlock>
-        // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=38 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'ParamCommandComment'
-      // CHECK-NEXT: <Direction abbrevid=7 op0=4/> blob data = '[in]'
-      // CHECK-NEXT: <ParamName abbrevid=8 op0=1/> blob data = 'J'
-      // CHECK-NEXT: <CommentBlock NumWords=25 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords=10 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=16/> blob data = ' is a parameter.'
-        // CHECK-NEXT: </CommentBlock>
-        // CHECK-NEXT: <CommentBlock NumWords=5 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: <CommentBlock NumWords=27 BlockCodeSize=4>
-      // CHECK-NEXT: <Kind abbrevid=4 op0=19/> blob data = 'BlockCommandComment'
-      // CHECK-NEXT: <Name abbrevid=6 op0=6/> blob data = 'return'
-      // CHECK-NEXT: <CommentBlock NumWords=15 BlockCodeSize=4>
-        // CHECK-NEXT: <Kind abbrevid=4 op0=16/> blob data = 'ParagraphComment'
-        // CHECK-NEXT: <CommentBlock NumWords=7 BlockCodeSize=4>
-          // CHECK-NEXT: <Kind abbrevid=4 op0=11/> blob data = 'TextComment'
-          // CHECK-NEXT: <Text abbrevid=5 op0=4/> blob data = ' int'
-        // CHECK-NEXT: </CommentBlock>
-      // CHECK-NEXT: </CommentBlock>
-    // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: </CommentBlock>
-  // CHECK-NEXT: <Location abbrevid=7 op0=24 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-  // CHECK-NEXT: </TypeBlock>
-  // CHECK-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'I'
-  // CHECK-NEXT: </FieldTypeBlock>
-  // CHECK-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'J'
-  // CHECK-NEXT: </FieldTypeBlock>
-// CHECK-NEXT: </FunctionBlock>
Index: clang-tools-extra/test/clang-doc/mapper-enum.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-enum.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/FC07BD34D5E77782C263FA944447929EA8753740.bc --dump | FileCheck %s --check-prefix CHECK-B
-// RUN: llvm-bcanalyzer %t/docs/bc/020E6C32A700C3170C009FCCD41671EDDBEAF575.bc --dump | FileCheck %s --check-prefix CHECK-C
-
-enum B { X, Y };
-
-// CHECK-B: <BLOCKINFO_BLOCK/>
-// CHECK-B-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-B-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-B-NEXT: </VersionBlock>
-// CHECK-B-NEXT: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-B-NEXT: <USR abbrevid=4 op0=20 op1=252 op2=7 op3=189 op4=52 op5=213 op6=231 op7=119 op8=130 op9=194 op10=99 op11=250 op12=148 op13=68 op14=71 op15=146 op16=158 op17=168 op18=117 op19=55 op20=64/>
-  // CHECK-B-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-  // CHECK-B-NEXT: <DefLocation abbrevid=6 op0=9 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'X'
-  // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'Y'
-// CHECK-B-NEXT: </EnumBlock>
-
-enum class C { A, B };
-
-// CHECK-C: <BLOCKINFO_BLOCK/>
-// CHECK-C-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-C-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-C-NEXT: </VersionBlock>
-// CHECK-C-NEXT: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-C-NEXT: <USR abbrevid=4 op0=20 op1=2 op2=14 op3=108 op4=50 op5=167 op6=0 op7=195 op8=23 op9=12 op10=0 op11=159 op12=204 op13=212 op14=22 op15=113 op16=237 op17=219 op18=234 op19=245 op20=117/>
-  // CHECK-C-NEXT: <Name abbrevid=5 op0=1/> blob data = 'C'
-  // CHECK-C-NEXT: <DefLocation abbrevid=6 op0=23 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-C-NEXT: <Scoped abbrevid=9 op0=1/>
-  // CHECK-C-NEXT: <Member abbrevid=8 op0=1/> blob data = 'A'
-  // CHECK-C-NEXT: <Member abbrevid=8 op0=1/> blob data = 'B'
-// CHECK-C-NEXT: </EnumBlock>
Index: clang-tools-extra/test/clang-doc/mapper-function.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-function.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/A44B32CC3C087C9AF75DAF50DE193E85E7B2C16B.bc --dump | FileCheck %s
-
-int F(int param) { return param; }
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=164 op2=75 op3=50 op4=204 op5=60 op6=8 op7=124 op8=154 op9=247 op10=93 op11=175 op12=80 op13=222 op14=25 op15=62 op16=133 op17=231 op18=178 op19=193 op20=107/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'F'
-  // CHECK-NEXT: <DefLocation abbrevid=6 op0=8 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-  // CHECK-NEXT: </TypeBlock>
-  // CHECK-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=5/> blob data = 'param'
-  // CHECK-NEXT: </FieldTypeBlock>
-// CHECK-NEXT: </FunctionBlock>
Index: clang-tools-extra/test/clang-doc/mapper-method.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-method.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/F0F9FC65FC90F54F690144A7AFB15DFC3D69B6E6.bc --dump | FileCheck %s --check-prefix CHECK-G-F
-// RUN: llvm-bcanalyzer %t/docs/bc/4202E8BF0ECB12AE354C8499C52725B0EE30AED5.bc --dump | FileCheck %s --check-prefix CHECK-G
-
-class G {
-public: 
-	int Method(int param) { return param; }
-};
-
-// CHECK-G: <BLOCKINFO_BLOCK/>
-// CHECK-G-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-G-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-G-NEXT: </VersionBlock>
-// CHECK-G-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-G-NEXT: <USR abbrevid=4 op0=20 op1=66 op2=2 op3=232 op4=191 op5=14 op6=203 op7=18 op8=174 op9=53 op10=76 op11=132 op12=153 op13=197 op14=39 op15=37 op16=176 op17=238 op18=48 op19=174 op20=213/>
-  // CHECK-G-NEXT: <Name abbrevid=5 op0=1/> blob data = 'G'
-  // CHECK-G-NEXT: <DefLocation abbrevid=6 op0=9 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-G-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-G-NEXT: </RecordBlock>
-
-// CHECK-G-F: <BLOCKINFO_BLOCK/>
-// CHECK-G-F-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-G-F-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-G-F-NEXT: </VersionBlock>
-// CHECK-G-F-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-G-F-NEXT: <USR abbrevid=4 op0=20 op1=240 op2=249 op3=252 op4=101 op5=252 op6=144 op7=245 op8=79 op9=105 op10=1 op11=68 op12=167 op13=175 op14=177 op15=93 op16=252 op17=61 op18=105 op19=182 op20=230/>
-  // CHECK-G-F-NEXT: <Name abbrevid=5 op0=6/> blob data = 'Method'
-  // CHECK-G-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-G-F-NEXT: <USR abbrevid=4 op0=20 op1=66 op2=2 op3=232 op4=191 op5=14 op6=203 op7=18 op8=174 op9=53 op10=76 op11=132 op12=153 op13=197 op14=39 op15=37 op16=176 op17=238 op18=48 op19=174 op20=213/>
-    // CHECK-G-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'G'
-    // CHECK-G-F-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-G-F-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-G-F-NEXT: </ReferenceBlock>
-  // CHECK-G-F-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-G-F-NEXT: <DefLocation abbrevid=6 op0=11 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-G-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-G-F-NEXT: <USR abbrevid=4 op0=20 op1=66 op2=2 op3=232 op4=191 op5=14 op6=203 op7=18 op8=174 op9=53 op10=76 op11=132 op12=153 op13=197 op14=39 op15=37 op16=176 op17=238 op18=48 op19=174 op20=213/>
-    // CHECK-G-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'G'
-    // CHECK-G-F-NEXT: <RefType abbrevid=6 op0=2/>
-    // CHECK-G-F-NEXT: <Field abbrevid=7 op0=2/>
-  // CHECK-G-F-NEXT: </ReferenceBlock>
-    // CHECK-G-F-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-G-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-G-F-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-G-F-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-G-F-NEXT: </ReferenceBlock>
-  // CHECK-G-F-NEXT: </TypeBlock>
-  // CHECK-G-F-NEXT: <FieldTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-G-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-G-F-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-G-F-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-G-F-NEXT: </ReferenceBlock>
-    // CHECK-G-F-NEXT: <Name abbrevid=4 op0=5/> blob data = 'param'
-  // CHECK-G-F-NEXT: </FieldTypeBlock>
-// CHECK-G-F-NEXT: </FunctionBlock>
Index: clang-tools-extra/test/clang-doc/mapper-namespace.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-namespace.cpp
+++ clang-tools-extra/test/clang-doc/mapper-namespace.cpp
@@ -2,16 +2,90 @@
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/8D042EFFC98B373450BC6B5B90A330C25A150E9C.bc --dump | FileCheck %s
-
-namespace A {}
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <NamespaceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-// CHECK-NEXT: </NamespaceBlock>
+
+namespace A {
+  
+void f();
+
+}  // namespace A
+
+namespace A {
+
+void f(){};
+
+namespace B {
+
+enum E { X };
+
+E func(int i) { return X; }
+
+}  // namespace B
+}  // namespace A
+
+// RUN: clang-doc --dump-mapper --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/8D042EFFC98B373450BC6B5B90A330C25A150E9C.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <NamespaceBlock NumWords=40 BlockCodeSize=4>
+// CHECK-0-NEXT:   <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=32 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=57 op2=211 op3=201 op4=90 op5=95 op6=124 op7=226 op8=186 op9=73 op10=55 op11=189 op12=123 op13=1 op14=186 op15=224 op16=158 op17=188 op18=42 op19=216 op20=172/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'f'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=14 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </NamespaceBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E21AF79E2A9D02554BA090D10DF39FE273F5CDB5.bc | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: <BLOCKINFO_BLOCK/>
+// CHECK-1-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-1-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-1-NEXT: </VersionBlock>
+// CHECK-1-NEXT: <NamespaceBlock NumWords=64 BlockCodeSize=4>
+// CHECK-1-NEXT:   <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
+// CHECK-1-NEXT:   <FunctionBlock NumWords=56 BlockCodeSize=4>
+// CHECK-1-NEXT:     <USR abbrevid=4 op0=20 op1=154 op2=130 op3=203 op4=51 op5=237 op6=15 op7=223 op8=129 op9=238 op10=56 op11=61 op12=49 op13=205 op14=9 op15=87 op16=209 op17=83 op18=197 op19=232 op20=64/>
+// CHECK-1-NEXT:     <Name abbrevid=5 op0=4/> blob data = 'func'
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=226 op2=26 op3=247 op4=158 op5=42 op6=157 op7=2 op8=85 op9=75 op10=160 op11=144 op12=209 op13=13 op14=243 op15=159 op16=226 op17=115 op18=245 op19=205 op20=181/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'B'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-1-NEXT:       <USR abbrevid=4 op0=20 op1=141 op2=4 op3=46 op4=255 op5=201 op6=139 op7=55 op8=52 op9=80 op10=188 op11=107 op12=91 op13=144 op14=163 op15=48 op16=194 op17=90 op18=21 op19=14 op20=156/>
+// CHECK-1-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-1-NEXT:       <RefType abbrevid=6 op0=1/>
+// CHECK-1-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-1-NEXT:     </ReferenceBlock>
+// CHECK-1-NEXT:     <DefLocation abbrevid=6 op0=20 op1=4/> blob data = '{{.*}}'
+// CHECK-1-NEXT:     <TypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-1-NEXT:       <ReferenceBlock NumWords=5 BlockCodeSize=4>
+// CHECK-1-NEXT:         <Name abbrevid=5 op0=12/> blob data = 'enum A::B::E'
+// CHECK-1-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-1-NEXT:       </ReferenceBlock>
+// CHECK-1-NEXT:     </TypeBlock>
+// CHECK-1-NEXT:     <FieldTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-1-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-1-NEXT:         <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-1-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-1-NEXT:       </ReferenceBlock>
+// CHECK-1-NEXT:       <Name abbrevid=4 op0=1/> blob data = 'i'
+// CHECK-1-NEXT:     </FieldTypeBlock>
+// CHECK-1-NEXT:   </FunctionBlock>
+// CHECK-1-NEXT: </NamespaceBlock>
Index: clang-tools-extra/test/clang-doc/mapper-record.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-doc/mapper-record.cpp
@@ -0,0 +1,217 @@
+// This test requires Linux due to system-dependent USR for the inner class.
+// REQUIRES: system-linux
+// RUN: rm -rf %t
+// RUN: mkdir %t
+// RUN: echo "" > %t/compile_flags.txt
+// RUN: cp "%s" "%t/test.cpp"
+
+void H() {
+  class I {};
+}
+
+union A { int X; int Y; };
+
+enum B { X, Y };
+
+enum class Bc { A, B };
+
+struct C { int i; };
+
+class D {};
+
+class E {
+public:
+  E() {}
+  ~E() {}
+
+protected:
+  void ProtectedMethod();
+};
+
+void E::ProtectedMethod() {}
+
+class F : virtual private D, public E {};
+
+class X {
+  class Y {};
+};
+
+// RUN: clang-doc --dump-mapper --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/289584A8E0FF4178A794622A547AA622503967A1.bc | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: <BLOCKINFO_BLOCK/>
+// CHECK-0-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-0-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-0-NEXT: </VersionBlock>
+// CHECK-0-NEXT: <RecordBlock NumWords=55 BlockCodeSize=4>
+// CHECK-0-NEXT:   <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:   <FunctionBlock NumWords=47 BlockCodeSize=4>
+// CHECK-0-NEXT:     <USR abbrevid=4 op0=20 op1=80 op2=147 op3=212 op4=40 op5=205 op6=198 op7=32 op8=150 op9=166 op10=117 op11=71 op12=186 op13=82 op14=86 op15=110 op16=79 op17=185 op18=64 op19=78 op20=238/>
+// CHECK-0-NEXT:     <Name abbrevid=5 op0=15/> blob data = 'ProtectedMethod'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=1/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <IsMethod abbrevid=9 op0=1/>
+// CHECK-0-NEXT:     <DefLocation abbrevid=6 op0=31 op1=4/> blob data = '{{.*}}'
+// CHECK-0-NEXT:     <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-0-NEXT:       <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-0-NEXT:       <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-0-NEXT:       <RefType abbrevid=6 op0=2/>
+// CHECK-0-NEXT:       <Field abbrevid=7 op0=2/>
+// CHECK-0-NEXT:     </ReferenceBlock>
+// CHECK-0-NEXT:     <TypeBlock NumWords=6 BlockCodeSize=4>
+// CHECK-0-NEXT:       <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-0-NEXT:         <Name abbrevid=5 op0=4/> blob data = 'void'
+// CHECK-0-NEXT:         <Field abbrevid=7 op0=4/>
+// CHECK-0-NEXT:       </ReferenceBlock>
+// CHECK-0-NEXT:     </TypeBlock>
+// CHECK-0-NEXT:   </FunctionBlock>
+// CHECK-0-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/CA7C7935730B5EACD25F080E9C83FA087CCDC75E.bc | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: <BLOCKINFO_BLOCK/>
+// CHECK-1-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-1-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-1-NEXT: </VersionBlock>
+// CHECK-1-NEXT: <RecordBlock NumWords=12 BlockCodeSize=4>
+// CHECK-1-NEXT:   <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
+// CHECK-1-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'X'
+// CHECK-1-NEXT:   <DefLocation abbrevid=6 op0=35 op1=4/> blob data = '{{.*}}'
+// CHECK-1-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-1-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/06B5F6A19BA9F6A832E127C9968282B94619B210.bc | FileCheck %s --check-prefix CHECK-2
+// CHECK-2: <BLOCKINFO_BLOCK/>
+// CHECK-2-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-2-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-2-NEXT: </VersionBlock>
+// CHECK-2-NEXT: <RecordBlock NumWords=22 BlockCodeSize=4>
+// CHECK-2-NEXT:   <USR abbrevid=4 op0=20 op1=6 op2=181 op3=246 op4=161 op5=155 op6=169 op7=246 op8=168 op9=50 op10=225 op11=39 op12=201 op13=150 op14=130 op15=130 op16=185 op17=70 op18=25 op19=178 op20=16/>
+// CHECK-2-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'C'
+// CHECK-2-NEXT:   <DefLocation abbrevid=6 op0=18 op1=4/> blob data = '{{.*}}'
+// CHECK-2-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-2-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-2-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-2-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-2-NEXT:     </ReferenceBlock>
+// CHECK-2-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'i'
+// CHECK-2-NEXT:   </MemberTypeBlock>
+// CHECK-2-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E60CA1CC7048098A7F4A48C3A53D45A533BDC39B.bc | FileCheck %s --check-prefix CHECK-3
+// CHECK-3: <BLOCKINFO_BLOCK/>
+// CHECK-3-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-3-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-3-NEXT: </VersionBlock>
+// CHECK-3-NEXT: <RecordBlock NumWords=24 BlockCodeSize=4>
+// CHECK-3-NEXT:   <USR abbrevid=4 op0=20 op1=230 op2=12 op3=161 op4=204 op5=112 op6=72 op7=9 op8=138 op9=127 op10=74 op11=72 op12=195 op13=165 op14=61 op15=69 op16=165 op17=51 op18=189 op19=195 op20=155/>
+// CHECK-3-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'I'
+// CHECK-3-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-3-NEXT:     <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
+// CHECK-3-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'H'
+// CHECK-3-NEXT:     <RefType abbrevid=6 op0=3/>
+// CHECK-3-NEXT:     <Field abbrevid=7 op0=1/>
+// CHECK-3-NEXT:   </ReferenceBlock>
+// CHECK-3-NEXT:   <DefLocation abbrevid=6 op0=9 op1=4/> blob data = '{{.*}}'
+// CHECK-3-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-3-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/641AB4A3D36399954ACDE29C7A8833032BF40472.bc | FileCheck %s --check-prefix CHECK-4
+// CHECK-4: <BLOCKINFO_BLOCK/>
+// CHECK-4-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-4-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-4-NEXT: </VersionBlock>
+// CHECK-4-NEXT: <RecordBlock NumWords=24 BlockCodeSize=4>
+// CHECK-4-NEXT:   <USR abbrevid=4 op0=20 op1=100 op2=26 op3=180 op4=163 op5=211 op6=99 op7=153 op8=149 op9=74 op10=205 op11=226 op12=156 op13=122 op14=136 op15=51 op16=3 op17=43 op18=244 op19=4 op20=114/>
+// CHECK-4-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'Y'
+// CHECK-4-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-4-NEXT:     <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
+// CHECK-4-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'X'
+// CHECK-4-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-4-NEXT:     <Field abbrevid=7 op0=1/>
+// CHECK-4-NEXT:   </ReferenceBlock>
+// CHECK-4-NEXT:   <DefLocation abbrevid=6 op0=36 op1=4/> blob data = '{{.*}}'
+// CHECK-4-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-4-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0000000000000000000000000000000000000000.bc | FileCheck %s --check-prefix CHECK-5
+// CHECK-5: <BLOCKINFO_BLOCK/>
+// CHECK-5-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-5-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-5-NEXT: </VersionBlock>
+// CHECK-5-NEXT: <NamespaceBlock NumWords=19 BlockCodeSize=4>
+// CHECK-5-NEXT:   <EnumBlock NumWords=16 BlockCodeSize=4>
+// CHECK-5-NEXT:     <USR abbrevid=4 op0=20 op1=30 op2=52 op3=56 op4=160 op5=139 op6=162 op7=32 op8=37 op9=192 op10=180 op11=98 op12=137 op13=255 op14=6 op15=134 op16=249 op17=44 op18=137 op19=36 op20=197/>
+// CHECK-5-NEXT:     <Name abbrevid=5 op0=2/> blob data = 'Bc'
+// CHECK-5-NEXT:     <DefLocation abbrevid=6 op0=16 op1=4/> blob data = '{{.*}}'
+// CHECK-5-NEXT:     <Scoped abbrevid=9 op0=1/>
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'A'
+// CHECK-5-NEXT:     <Member abbrevid=8 op0=1/> blob data = 'B'
+// CHECK-5-NEXT:   </EnumBlock>
+// CHECK-5-NEXT: </NamespaceBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/0921737541208B8FA9BB42B60F78AC1D779AA054.bc | FileCheck %s --check-prefix CHECK-6
+// CHECK-6: <BLOCKINFO_BLOCK/>
+// CHECK-6-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-6-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-6-NEXT: </VersionBlock>
+// CHECK-6-NEXT: <RecordBlock NumWords=12 BlockCodeSize=4>
+// CHECK-6-NEXT:   <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
+// CHECK-6-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'D'
+// CHECK-6-NEXT:   <DefLocation abbrevid=6 op0=20 op1=4/> blob data = '{{.*}}'
+// CHECK-6-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-6-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/E3B54702FABFF4037025BA194FC27C47006330B5.bc | FileCheck %s --check-prefix CHECK-7
+// CHECK-7: <BLOCKINFO_BLOCK/>
+// CHECK-7-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-7-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-7-NEXT: </VersionBlock>
+// CHECK-7-NEXT: <RecordBlock NumWords=37 BlockCodeSize=4>
+// CHECK-7-NEXT:   <USR abbrevid=4 op0=20 op1=227 op2=181 op3=71 op4=2 op5=250 op6=191 op7=244 op8=3 op9=112 op10=37 op11=186 op12=25 op13=79 op14=194 op15=124 op16=71 op17=0 op18=99 op19=48 op20=181/>
+// CHECK-7-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'F'
+// CHECK-7-NEXT:   <DefLocation abbrevid=6 op0=33 op1=4/> blob data = '{{.*}}'
+// CHECK-7-NEXT:   <TagType abbrevid=8 op0=3/>
+// CHECK-7-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-7-NEXT:     <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
+// CHECK-7-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'E'
+// CHECK-7-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-7-NEXT:     <Field abbrevid=7 op0=2/>
+// CHECK-7-NEXT:   </ReferenceBlock>
+// CHECK-7-NEXT:   <ReferenceBlock NumWords=10 BlockCodeSize=4>
+// CHECK-7-NEXT:     <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
+// CHECK-7-NEXT:     <Name abbrevid=5 op0=1/> blob data = 'D'
+// CHECK-7-NEXT:     <RefType abbrevid=6 op0=2/>
+// CHECK-7-NEXT:     <Field abbrevid=7 op0=3/>
+// CHECK-7-NEXT:   </ReferenceBlock>
+// CHECK-7-NEXT: </RecordBlock>
+
+// RUN: llvm-bcanalyzer --dump %t/docs/bc/ACE81AFA6627B4CEF2B456FB6E1252925674AF7E.bc | FileCheck %s --check-prefix CHECK-8
+// CHECK-8: <BLOCKINFO_BLOCK/>
+// CHECK-8-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
+// CHECK-8-NEXT:   <Version abbrevid=4 op0=2/>
+// CHECK-8-NEXT: </VersionBlock>
+// CHECK-8-NEXT: <RecordBlock NumWords=33 BlockCodeSize=4>
+// CHECK-8-NEXT:   <USR abbrevid=4 op0=20 op1=172 op2=232 op3=26 op4=250 op5=102 op6=39 op7=180 op8=206 op9=242 op10=180 op11=86 op12=251 op13=110 op14=18 op15=82 op16=146 op17=86 op18=116 op19=175 op20=126/>
+// CHECK-8-NEXT:   <Name abbrevid=5 op0=1/> blob data = 'A'
+// CHECK-8-NEXT:   <DefLocation abbrevid=6 op0=12 op1=4/> blob data = '{{.*}}'
+// CHECK-8-NEXT:   <TagType abbrevid=8 op0=2/>
+// CHECK-8-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-8-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-8-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-8-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-8-NEXT:     </ReferenceBlock>
+// CHECK-8-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'X'
+// CHECK-8-NEXT:   </MemberTypeBlock>
+// CHECK-8-NEXT:   <MemberTypeBlock NumWords=8 BlockCodeSize=4>
+// CHECK-8-NEXT:     <ReferenceBlock NumWords=3 BlockCodeSize=4>
+// CHECK-8-NEXT:       <Name abbrevid=5 op0=3/> blob data = 'int'
+// CHECK-8-NEXT:       <Field abbrevid=7 op0=4/>
+// CHECK-8-NEXT:     </ReferenceBlock>
+// CHECK-8-NEXT:     <Name abbrevid=4 op0=1/> blob data = 'Y'
+// CHECK-8-NEXT:   </MemberTypeBlock>
+// CHECK-8-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-struct.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-struct.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/06B5F6A19BA9F6A832E127C9968282B94619B210.bc --dump | FileCheck %s
-
-struct C { int i; };
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=6 op2=181 op3=246 op4=161 op5=155 op6=169 op7=246 op8=168 op9=50 op10=225 op11=39 op12=201 op13=150 op14=130 op15=130 op16=185 op17=70 op18=25 op19=178 op20=16/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'C'
-  // CHECK-NEXT: <DefLocation abbrevid=6 op0=8 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'i'
-  // CHECK-NEXT: </MemberTypeBlock>
-// CHECK-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-union.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-union.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: llvm-bcanalyzer %t/docs/bc/0B8A6B938B939B77C6325CCCC8AA3E938BF9E2E8.bc --dump | FileCheck %s
-
-union D { int X; int Y; };
-
-// CHECK: <BLOCKINFO_BLOCK/>
-// CHECK-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-NEXT: </VersionBlock>
-// CHECK-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-NEXT: <USR abbrevid=4 op0=20 op1=11 op2=138 op3=107 op4=147 op5=139 op6=147 op7=155 op8=119 op9=198 op10=50 op11=92 op12=204 op13=200 op14=170 op15=62 op16=147 op17=139 op18=249 op19=226 op20=232/>
-  // CHECK-NEXT: <Name abbrevid=5 op0=1/> blob data = 'D'
-  // CHECK-NEXT: <DefLocation abbrevid=6 op0=8 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-NEXT: <TagType abbrevid=8 op0=2/>
-  // CHECK-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'X'
-  // CHECK-NEXT: </MemberTypeBlock>
-  // CHECK-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-      // CHECK-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
-      // CHECK-NEXT: <Field abbrevid=7 op0=4/>
-    // CHECK-NEXT: </ReferenceBlock>
-    // CHECK-NEXT: <Name abbrevid=4 op0=1/> blob data = 'Y'
-  // CHECK-NEXT: </MemberTypeBlock>
-// CHECK-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/yaml-comment.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-doc/yaml-comment.cpp
@@ -0,0 +1,135 @@
+// RUN: rm -rf %t
+// RUN: mkdir %t
+// RUN: echo "" > %t/compile_flags.txt
+// RUN: cp "%s" "%t/test.cpp"
+
+/// \brief Brief description.
+///
+/// Extended description that
+/// continues onto the next line.
+/// 
+/// <ul class="test">
+///   <li> Testing.
+/// </ul>
+///
+/// \verbatim
+/// The description continues.
+/// \endverbatim
+/// --
+/// \param [out] I is a parameter.
+/// \param J is a parameter.
+/// \return void
+void F(int I, int J);
+
+/// Bonus comment on definition
+void F(int I, int J) {}
+
+// RUN: clang-doc --format=yaml --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: cat %t/docs/./GlobalNamespace.yaml | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: ---
+// CHECK-0-NEXT: USR:             '0000000000000000000000000000000000000000'
+// CHECK-0-NEXT: ChildFunctions:  
+// CHECK-0-NEXT:   - USR:             '7574630614A535710E5A6ABCFFF98BCA2D06A4CA'
+// CHECK-0-NEXT:     Name:            'F'
+// CHECK-0-NEXT:     Description:     
+// CHECK-0-NEXT:       - Kind:            'FullComment'
+// CHECK-0-NEXT:         Children:        
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:           - Kind:            'BlockCommandComment'
+// CHECK-0-NEXT:             Name:            'brief'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:                 Children:        
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:                     Text:            ' Brief description.'
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:                 Text:            ' Extended description that'
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:                 Text:            ' continues onto the next line.'
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:               - Kind:            'HTMLStartTagComment'
+// CHECK-0-NEXT:                 Name:            'ul'
+// CHECK-0-NEXT:                 AttrKeys:        
+// CHECK-0-NEXT:                   - 'class'
+// CHECK-0-NEXT:                 AttrValues:      
+// CHECK-0-NEXT:                   - 'test'
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:               - Kind:            'HTMLStartTagComment'
+// CHECK-0-NEXT:                 Name:            'li'
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:                 Text:            ' Testing.'
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:               - Kind:            'HTMLEndTagComment'
+// CHECK-0-NEXT:                 Name:            'ul'
+// CHECK-0-NEXT:                 SelfClosing:     true
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:           - Kind:            'VerbatimBlockComment'
+// CHECK-0-NEXT:             Name:            'verbatim'
+// CHECK-0-NEXT:             CloseName:       'endverbatim'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'VerbatimBlockLineComment'
+// CHECK-0-NEXT:                 Text:            ' The description continues.'
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:                 Text:            ' --'
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:           - Kind:            'ParamCommandComment'
+// CHECK-0-NEXT:             Direction:       '[out]'
+// CHECK-0-NEXT:             ParamName:       'I'
+// CHECK-0-NEXT:             Explicit:        true
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:                 Children:        
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:                     Text:            ' is a parameter.'
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:           - Kind:            'ParamCommandComment'
+// CHECK-0-NEXT:             Direction:       '[in]'
+// CHECK-0-NEXT:             ParamName:       'J'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:                 Children:        
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:                     Text:            ' is a parameter.'
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:           - Kind:            'BlockCommandComment'
+// CHECK-0-NEXT:             Name:            'return'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:                 Children:        
+// CHECK-0-NEXT:                   - Kind:            'TextComment'
+// CHECK-0-NEXT:                     Text:            ' void'
+// CHECK-0-NEXT:       - Kind:            'FullComment'
+// CHECK-0-NEXT:         Children:        
+// CHECK-0-NEXT:           - Kind:            'ParagraphComment'
+// CHECK-0-NEXT:             Children:        
+// CHECK-0-NEXT:               - Kind:            'TextComment'
+// CHECK-0-NEXT:                 Text:            ' Bonus comment on definition'
+// CHECK-0-NEXT:     DefLocation:     
+// CHECK-0-NEXT:       LineNumber:      25
+// CHECK-0-NEXT:       Filename:        'test'
+// CHECK-0-NEXT:     Location:        
+// CHECK-0-NEXT:       - LineNumber:      22
+// CHECK-0-NEXT:         Filename:        'test'
+// CHECK-0-NEXT:     Params:          
+// CHECK-0-NEXT:       - Type:            
+// CHECK-0-NEXT:           Name:            'int'
+// CHECK-0-NEXT:         Name:            'I'
+// CHECK-0-NEXT:       - Type:            
+// CHECK-0-NEXT:           Name:            'int'
+// CHECK-0-NEXT:         Name:            'J'
+// CHECK-0-NEXT:     ReturnType:      
+// CHECK-0-NEXT:       Type:            
+// CHECK-0-NEXT:         Name:            'void'
+// CHECK-0-NEXT: ...
Index: clang-tools-extra/test/clang-doc/yaml-comments.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/yaml-comments.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "" > %t/compile_flags.txt
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: cat %t/docs/F.yaml | FileCheck %s
-
-/// \brief Brief description.
-///
-/// Extended description that
-/// continues onto the next line.
-/// 
-/// <ul class="test">
-///   <li> Testing.
-/// </ul>
-///
-/// \verbatim
-/// The description continues.
-/// \endverbatim
-///
-/// \param [out] I is a parameter.
-/// \param J is a parameter.
-/// \return void
-void F(int I, int J);
-
-/// Bonus comment on definition
-void F(int I, int J) {}
-
-// CHECK: ---
-// CHECK-NEXT: USR:             '7574630614A535710E5A6ABCFFF98BCA2D06A4CA'
-// CHECK-NEXT: Name:            'F'
-// CHECK-NEXT: Description:     
-// CHECK-NEXT:   - Kind:            'FullComment'
-// CHECK-NEXT:     Children:        
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:       - Kind:            'BlockCommandComment'
-// CHECK-NEXT:         Name:            'brief'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'ParagraphComment'
-// CHECK-NEXT:             Children:        
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:                 Text:            ' Brief description.'
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:             Text:            ' Extended description that'
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:             Text:            ' continues onto the next line.'
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:           - Kind:            'HTMLStartTagComment'
-// CHECK-NEXT:             Name:            'ul'
-// CHECK-NEXT:             AttrKeys:        
-// CHECK-NEXT:               - 'class'
-// CHECK-NEXT:             AttrValues:      
-// CHECK-NEXT:               - 'test'
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:           - Kind:            'HTMLStartTagComment'
-// CHECK-NEXT:             Name:            'li'
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:             Text:            ' Testing.'
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:           - Kind:            'HTMLEndTagComment'
-// CHECK-NEXT:             Name:            'ul'
-// CHECK-NEXT:             SelfClosing:     true
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:       - Kind:            'VerbatimBlockComment'
-// CHECK-NEXT:         Name:            'verbatim'
-// CHECK-NEXT:         CloseName:       'endverbatim'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'VerbatimBlockLineComment'
-// CHECK-NEXT:             Text:            ' The description continues.'
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:       - Kind:            'ParamCommandComment'
-// CHECK-NEXT:         Direction:       '[out]'
-// CHECK-NEXT:         ParamName:       'I'
-// CHECK-NEXT:         Explicit:        true
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'ParagraphComment'
-// CHECK-NEXT:             Children:        
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:                 Text:            ' is a parameter.'
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:       - Kind:            'ParamCommandComment'
-// CHECK-NEXT:         Direction:       '[in]'
-// CHECK-NEXT:         ParamName:       'J'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'ParagraphComment'
-// CHECK-NEXT:             Children:        
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:                 Text:            ' is a parameter.'
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:       - Kind:            'BlockCommandComment'
-// CHECK-NEXT:         Name:            'return'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'ParagraphComment'
-// CHECK-NEXT:             Children:        
-// CHECK-NEXT:               - Kind:            'TextComment'
-// CHECK-NEXT:                 Text:            ' void'
-// CHECK-NEXT:   - Kind:            'FullComment'
-// CHECK-NEXT:     Children:        
-// CHECK-NEXT:       - Kind:            'ParagraphComment'
-// CHECK-NEXT:         Children:        
-// CHECK-NEXT:           - Kind:            'TextComment'
-// CHECK-NEXT:             Text:            ' Bonus comment on definition'
-// CHECK-NEXT: DefLocation:     
-// CHECK-NEXT:   LineNumber:      27
-// CHECK-NEXT:   Filename:        '{{.*}}'
-// CHECK-NEXT: Location:        
-// CHECK-NEXT:   - LineNumber:      24
-// CHECK-NEXT:     Filename:        '{{.*}}'
-// CHECK-NEXT: Params:          
-// CHECK-NEXT:   - Type:            
-// CHECK-NEXT:       Name:            'int'
-// CHECK-NEXT:     Name:            'I'
-// CHECK-NEXT:   - Type:            
-// CHECK-NEXT:       Name:            'int'
-// CHECK-NEXT:     Name:            'J'
-// CHECK-NEXT: ReturnType:      
-// CHECK-NEXT:   Type:            
-// CHECK-NEXT:     Name:            'void'
-// CHECK-NEXT: ...
Index: clang-tools-extra/test/clang-doc/yaml-namespace.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/yaml-namespace.cpp
+++ clang-tools-extra/test/clang-doc/yaml-namespace.cpp
@@ -2,21 +2,9 @@
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: cat %t/docs/A.yaml | FileCheck %s --check-prefix=CHECK-A
-// RUN: cat %t/docs/A/B.yaml | FileCheck %s --check-prefix=CHECK-B
-// RUN: cat %t/docs/A/f.yaml | FileCheck %s --check-prefix=CHECK-F
-// RUN: cat %t/docs/A/B/E.yaml | FileCheck %s --check-prefix=CHECK-E
-// RUN: cat %t/docs/A/B/func.yaml | FileCheck %s --check-prefix=CHECK-FUNC
 
 namespace A {
   
-// CHECK-A: ---
-// CHECK-A-NEXT: USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
-// CHECK-A-NEXT: Name:            'A'
-// CHECK-A-NEXT: ...
-
-
 void f();
 
 }  // namespace A
@@ -25,78 +13,81 @@
 
 void f(){};
 
-// CHECK-F: ---
-// CHECK-F-NEXT: USR:             '39D3C95A5F7CE2BA4937BD7B01BAE09EBC2AD8AC'
-// CHECK-F-NEXT: Name:            'f'
-// CHECK-F-NEXT: Namespace:       
-// CHECK-F-NEXT:   - Type:            Namespace
-// CHECK-F-NEXT:     Name:            'A'
-// CHECK-F-NEXT:     USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
-// CHECK-F-NEXT: DefLocation:     
-// CHECK-F-NEXT:   LineNumber:      26
-// CHECK-F-NEXT:   Filename:        '{{.*}}'
-// CHECK-F-NEXT: Location:        
-// CHECK-F-NEXT:   - LineNumber:      20
-// CHECK-F-NEXT:     Filename:        'test'
-// CHECK-F-NEXT: ReturnType:      
-// CHECK-F-NEXT:   Type:            
-// CHECK-F-NEXT:     Name:            'void'
-// CHECK-F-NEXT: ...
-
 namespace B {
-  
-// CHECK-B: ---
-// CHECK-B-NEXT: USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
-// CHECK-B-NEXT: Name:            'B'
-// CHECK-B-NEXT: Namespace:       
-// CHECK-B-NEXT:   - Type:            Namespace
-// CHECK-B-NEXT:     Name:            'A'
-// CHECK-B-NEXT:     USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
-// CHECK-B-NEXT: ...
-
 
 enum E { X };
 
-// CHECK-E: ---
-// CHECK-E-NEXT: USR:             'E9ABF7E7E2425B626723D41E76E4BC7E7A5BD775'
-// CHECK-E-NEXT: Name:            'E'
-// CHECK-E-NEXT: Namespace:       
-// CHECK-E-NEXT:   - Type:            Namespace
-// CHECK-E-NEXT:     Name:            'B'
-// CHECK-E-NEXT:     USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
-// CHECK-E-NEXT:   - Type:            Namespace
-// CHECK-E-NEXT:     Name:            'A'
-// CHECK-E-NEXT:     USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
-// CHECK-E-NEXT: DefLocation:     
-// CHECK-E-NEXT:   LineNumber:      58
-// CHECK-E-NEXT:   Filename:        '{{.*}}'
-// CHECK-E-NEXT: Members:         
-// CHECK-E-NEXT:   - 'X'
-// CHECK-E-NEXT: ...
-
 E func(int i) { return X; }
 
-// CHECK-FUNC: ---
-// CHECK-FUNC-NEXT: USR:             '9A82CB33ED0FDF81EE383D31CD0957D153C5E840'
-// CHECK-FUNC-NEXT: Name:            'func'
-// CHECK-FUNC-NEXT: Namespace:       
-// CHECK-FUNC-NEXT:   - Type:            Namespace
-// CHECK-FUNC-NEXT:     Name:            'B'
-// CHECK-FUNC-NEXT:     USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
-// CHECK-FUNC-NEXT:   - Type:            Namespace
-// CHECK-FUNC-NEXT:     Name:            'A'
-// CHECK-FUNC-NEXT:     USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
-// CHECK-FUNC-NEXT: DefLocation:     
-// CHECK-FUNC-NEXT:   LineNumber:      77
-// CHECK-FUNC-NEXT:   Filename:        '{{.*}}'
-// CHECK-FUNC-NEXT: Params:          
-// CHECK-FUNC-NEXT:   - Type:            
-// CHECK-FUNC-NEXT:       Name:            'int'
-// CHECK-FUNC-NEXT:     Name:            'i'
-// CHECK-FUNC-NEXT: ReturnType:      
-// CHECK-FUNC-NEXT:   Type:            
-// CHECK-FUNC-NEXT:     Name:            'enum A::B::E'
-// CHECK-FUNC-NEXT: ...
-
 }  // namespace B
 }  // namespace A
+
+// RUN: clang-doc --format=yaml --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: cat %t/docs/./A.yaml | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: ---
+// CHECK-0-NEXT: USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
+// CHECK-0-NEXT: Name:            'A'
+// CHECK-0-NEXT: ChildFunctions:  
+// CHECK-0-NEXT:   - USR:             '39D3C95A5F7CE2BA4937BD7B01BAE09EBC2AD8AC'
+// CHECK-0-NEXT:     Name:            'f'
+// CHECK-0-NEXT:     Namespace:       
+// CHECK-0-NEXT:       - Type:            Namespace
+// CHECK-0-NEXT:         Name:            'A'
+// CHECK-0-NEXT:         USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
+// CHECK-0-NEXT:     DefLocation:     
+// CHECK-0-NEXT:       LineNumber:      14
+// CHECK-0-NEXT:       Filename:        'test'
+// CHECK-0-NEXT:     Location:        
+// CHECK-0-NEXT:       - LineNumber:      8
+// CHECK-0-NEXT:         Filename:        'test'
+// CHECK-0-NEXT:     ReturnType:      
+// CHECK-0-NEXT:       Type:            
+// CHECK-0-NEXT:         Name:            'void'
+// CHECK-0-NEXT: ...
+
+// RUN: cat %t/docs/A/B.yaml | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: ---
+// CHECK-1-NEXT: USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
+// CHECK-1-NEXT: Name:            'B'
+// CHECK-1-NEXT: Namespace:       
+// CHECK-1-NEXT:   - Type:            Namespace
+// CHECK-1-NEXT:     Name:            'A'
+// CHECK-1-NEXT:     USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
+// CHECK-1-NEXT: ChildFunctions:  
+// CHECK-1-NEXT:   - USR:             '9A82CB33ED0FDF81EE383D31CD0957D153C5E840'
+// CHECK-1-NEXT:     Name:            'func'
+// CHECK-1-NEXT:     Namespace:       
+// CHECK-1-NEXT:       - Type:            Namespace
+// CHECK-1-NEXT:         Name:            'B'
+// CHECK-1-NEXT:         USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
+// CHECK-1-NEXT:       - Type:            Namespace
+// CHECK-1-NEXT:         Name:            'A'
+// CHECK-1-NEXT:         USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
+// CHECK-1-NEXT:     DefLocation:     
+// CHECK-1-NEXT:       LineNumber:      20
+// CHECK-1-NEXT:       Filename:        'test'
+// CHECK-1-NEXT:     Params:          
+// CHECK-1-NEXT:       - Type:            
+// CHECK-1-NEXT:           Name:            'int'
+// CHECK-1-NEXT:         Name:            'i'
+// CHECK-1-NEXT:     ReturnType:      
+// CHECK-1-NEXT:       Type:            
+// CHECK-1-NEXT:         Name:            'enum A::B::E'
+// CHECK-1-NEXT: ChildEnums:      
+// CHECK-1-NEXT:   - USR:             'E9ABF7E7E2425B626723D41E76E4BC7E7A5BD775'
+// CHECK-1-NEXT:     Name:            'E'
+// CHECK-1-NEXT:     Namespace:       
+// CHECK-1-NEXT:       - Type:            Namespace
+// CHECK-1-NEXT:         Name:            'B'
+// CHECK-1-NEXT:         USR:             'E21AF79E2A9D02554BA090D10DF39FE273F5CDB5'
+// CHECK-1-NEXT:       - Type:            Namespace
+// CHECK-1-NEXT:         Name:            'A'
+// CHECK-1-NEXT:         USR:             '8D042EFFC98B373450BC6B5B90A330C25A150E9C'
+// CHECK-1-NEXT:     DefLocation:     
+// CHECK-1-NEXT:       LineNumber:      18
+// CHECK-1-NEXT:       Filename:        'test'
+// CHECK-1-NEXT:     Members:         
+// CHECK-1-NEXT:       - 'X'
+// CHECK-1-NEXT: ...
Index: clang-tools-extra/test/clang-doc/yaml-record.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/yaml-record.cpp
+++ clang-tools-extra/test/clang-doc/yaml-record.cpp
@@ -1,250 +1,233 @@
+// This test requires Linux due to system-dependent USR for the inner class.
+// REQUIRES: system-linux
 // RUN: rm -rf %t
 // RUN: mkdir %t
 // RUN: echo "" > %t/compile_flags.txt
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: clang-doc -doxygen -p %t %t/test.cpp -output=%t/docs
-// RUN: cat %t/docs/A.yaml | FileCheck %s --check-prefix=CHECK-A
-// RUN: cat %t/docs/Bc.yaml | FileCheck %s --check-prefix=CHECK-BC
-// RUN: cat %t/docs/B.yaml | FileCheck %s --check-prefix=CHECK-B
-// RUN: cat %t/docs/C.yaml | FileCheck %s --check-prefix=CHECK-C
-// RUN: cat %t/docs/D.yaml | FileCheck %s --check-prefix=CHECK-D
-// RUN: cat %t/docs/E.yaml | FileCheck %s --check-prefix=CHECK-E
-// RUN: cat %t/docs/E/ProtectedMethod.yaml | FileCheck %s --check-prefix=CHECK-EPM
-// RUN: cat %t/docs/E/E.yaml | FileCheck %s --check-prefix=CHECK-ECON
-// RUN: cat %t/docs/E/'~E.yaml' | FileCheck %s --check-prefix=CHECK-EDES
-// RUN: cat %t/docs/F.yaml | FileCheck %s --check-prefix=CHECK-F
-// RUN: cat %t/docs/X.yaml | FileCheck %s --check-prefix=CHECK-X
-// RUN: cat %t/docs/X/Y.yaml | FileCheck %s --check-prefix=CHECK-Y
-// RUN: cat %t/docs/H.yaml | FileCheck %s --check-prefix=CHECK-H
-// RUN: cat %t/docs/H/I.yaml | FileCheck %s --check-prefix=CHECK-I
 
-union A { int X; int Y; };
-
-// CHECK-A: ---
-// CHECK-A-NEXT: USR:             'ACE81AFA6627B4CEF2B456FB6E1252925674AF7E'
-// CHECK-A-NEXT: Name:            'A'
-// CHECK-A-NEXT: DefLocation:     
-// CHECK-A-NEXT:   LineNumber:      21
-// CHECK-A-NEXT:   Filename:        '{{.*}}'
-// CHECK-A-NEXT: TagType:         Union
-// CHECK-A-NEXT: Members:         
-// CHECK-A-NEXT:   - Type:            
-// CHECK-A-NEXT:       Name:            'int'
-// CHECK-A-NEXT:     Name:            'X'
-// CHECK-A-NEXT:   - Type:            
-// CHECK-A-NEXT:       Name:            'int'
-// CHECK-A-NEXT:     Name:            'Y'
-// CHECK-A-NEXT: ...
+void H() {
+  class I {};
+}
 
+union A { int X; int Y; };
 
 enum B { X, Y };
 
-// CHECK-B: ---
-// CHECK-B-NEXT: USR:             'FC07BD34D5E77782C263FA944447929EA8753740'
-// CHECK-B-NEXT: Name:            'B'
-// CHECK-B-NEXT: DefLocation:     
-// CHECK-B-NEXT:   LineNumber:      40
-// CHECK-B-NEXT:   Filename:        '{{.*}}'
-// CHECK-B-NEXT: Members:         
-// CHECK-B-NEXT:   - 'X'
-// CHECK-B-NEXT:   - 'Y'
-// CHECK-B-NEXT: ...
-
 enum class Bc { A, B };
 
-// CHECK-BC: ---
-// CHECK-BC-NEXT: USR:             '1E3438A08BA22025C0B46289FF0686F92C8924C5'
-// CHECK-BC-NEXT: Name:            'Bc'
-// CHECK-BC-NEXT: DefLocation:     
-// CHECK-BC-NEXT:   LineNumber:      53
-// CHECK-BC-NEXT:   Filename:        '{{.*}}'
-// CHECK-BC-NEXT: Scoped:          true
-// CHECK-BC-NEXT: Members:         
-// CHECK-BC-NEXT:   - 'A'
-// CHECK-BC-NEXT:   - 'B'
-// CHECK-BC-NEXT: ...
-
 struct C { int i; };
 
-// CHECK-C: ---
-// CHECK-C-NEXT: USR:             '06B5F6A19BA9F6A832E127C9968282B94619B210'
-// CHECK-C-NEXT: Name:            'C'
-// CHECK-C-NEXT: DefLocation:     
-// CHECK-C-NEXT:   LineNumber:      67
-// CHECK-C-NEXT:   Filename:        '{{.*}}'
-// CHECK-C-NEXT: Members:         
-// CHECK-C-NEXT:   - Type:            
-// CHECK-C-NEXT:       Name:            'int'
-// CHECK-C-NEXT:     Name:            'i'
-// CHECK-C-NEXT: ...
-
 class D {};
 
-// CHECK-D: ---
-// CHECK-D-NEXT: USR:             '0921737541208B8FA9BB42B60F78AC1D779AA054'
-// CHECK-D-NEXT: Name:            'D'
-// CHECK-D-NEXT: DefLocation:     
-// CHECK-D-NEXT:   LineNumber:      81
-// CHECK-D-NEXT:   Filename:        '{{.*}}'
-// CHECK-D-NEXT: TagType:         Class
-// CHECK-D-NEXT: ...
-
 class E {
 public:
   E() {}
-
-// CHECK-ECON: ---
-// CHECK-ECON-NEXT: USR:             'DEB4AC1CD9253CD9EF7FBE6BCAC506D77984ABD4'
-// CHECK-ECON-NEXT: Name:            'E'
-// CHECK-ECON-NEXT: Namespace:       
-// CHECK-ECON-NEXT:   - Type:            Record
-// CHECK-ECON-NEXT:     Name:            'E'
-// CHECK-ECON-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-ECON-NEXT: DefLocation:
-// CHECK-ECON-NEXT:   LineNumber:      94
-// CHECK-ECON-NEXT:   Filename:        '{{.*}}'
-// CHECK-ECON-NEXT: IsMethod:        true
-// CHECK-ECON-NEXT: Parent:          
-// CHECK-ECON-NEXT:   Type:            Record
-// CHECK-ECON-NEXT:   Name:            'E'
-// CHECK-ECON-NEXT:   USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-ECON-NEXT: ReturnType:      
-// CHECK-ECON-NEXT:   Type:            
-// CHECK-ECON-NEXT:     Name:            'void'
-// CHECK-ECON-NEXT: ...
-  
   ~E() {}
-  
-// CHECK-EDES: ---
-// CHECK-EDES-NEXT: USR:             'BD2BDEBD423F80BACCEA75DE6D6622D355FC2D17'
-// CHECK-EDES-NEXT: Name:            '~E'
-// CHECK-EDES-NEXT: Namespace:       
-// CHECK-EDES-NEXT:   - Type:            Record
-// CHECK-EDES-NEXT:     Name:            'E'
-// CHECK-EDES-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-EDES-NEXT: DefLocation:     
-// CHECK-EDES-NEXT:   LineNumber:      116
-// CHECK-EDES-NEXT:   Filename:        '{{.*}}'
-// CHECK-EDES-NEXT: IsMethod:        true
-// CHECK-EDES-NEXT: Parent:          
-// CHECK-EDES-NEXT:   Type:            Record
-// CHECK-EDES-NEXT:   Name:            'E'
-// CHECK-EDES-NEXT:   USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-EDES-NEXT: ReturnType:      
-// CHECK-EDES-NEXT:   Type:            
-// CHECK-EDES-NEXT:     Name:            'void'
-// CHECK-EDES-NEXT: ...
-
 
 protected:
   void ProtectedMethod();
 };
 
-// CHECK-E: ---
-// CHECK-E-NEXT: USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-E-NEXT: Name:            'E'
-// CHECK-E-NEXT: DefLocation:     
-// CHECK-E-NEXT:   LineNumber:      92
-// CHECK-E-NEXT:   Filename:        '{{.*}}'
-// CHECK-E-NEXT: TagType:         Class
-// CHECK-E-NEXT: ...
-
 void E::ProtectedMethod() {}
 
-// CHECK-EPM: ---
-// CHECK-EPM-NEXT: USR:             '5093D428CDC62096A67547BA52566E4FB9404EEE'
-// CHECK-EPM-NEXT: Name:            'ProtectedMethod'
-// CHECK-EPM-NEXT: Namespace:       
-// CHECK-EPM-NEXT:   - Type:            Record
-// CHECK-EPM-NEXT:     Name:            'E'
-// CHECK-EPM-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-EPM-NEXT: DefLocation:     
-// CHECK-EPM-NEXT:   LineNumber:      152
-// CHECK-EPM-NEXT:   Filename:        '{{.*}}'
-// CHECK-EPM-NEXT: Location:        
-// CHECK-EPM-NEXT:   - LineNumber:      140
-// CHECK-EPM-NEXT:     Filename:        '{{.*}}'
-// CHECK-EPM-NEXT: IsMethod:        true
-// CHECK-EPM-NEXT: Parent:          
-// CHECK-EPM-NEXT:   Type:            Record
-// CHECK-EPM-NEXT:   Name:            'E'
-// CHECK-EPM-NEXT:   USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-EPM-NEXT: ReturnType:      
-// CHECK-EPM-NEXT:   Type:            
-// CHECK-EPM-NEXT:     Name:            'void'
-// CHECK-EPM-NEXT: ...
-
 class F : virtual private D, public E {};
 
-// CHECK-F: ---
-// CHECK-F-NEXT: USR:             'E3B54702FABFF4037025BA194FC27C47006330B5'
-// CHECK-F-NEXT: Name:            'F'
-// CHECK-F-NEXT: DefLocation:     
-// CHECK-F-NEXT:   LineNumber:      177
-// CHECK-F-NEXT:   Filename:        '{{.*}}'
-// CHECK-F-NEXT: TagType:         Class
-// CHECK-F-NEXT: Parents:         
-// CHECK-F-NEXT:   - Type:            Record
-// CHECK-F-NEXT:     Name:            'E'
-// CHECK-F-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
-// CHECK-F-NEXT: VirtualParents:  
-// CHECK-F-NEXT:   - Type:            Record
-// CHECK-F-NEXT:     Name:            'D'
-// CHECK-F-NEXT:     USR:             '0921737541208B8FA9BB42B60F78AC1D779AA054'
-// CHECK-F-NEXT: ...
-
 class X {
   class Y {};
-  
-// CHECK-Y: ---
-// CHECK-Y-NEXT: USR:             '641AB4A3D36399954ACDE29C7A8833032BF40472'
-// CHECK-Y-NEXT: Name:            'Y'
-// CHECK-Y-NEXT: Namespace:       
-// CHECK-Y-NEXT:   - Type:            Record
-// CHECK-Y-NEXT:     Name:            'X'
-// CHECK-Y-NEXT:     USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
-// CHECK-Y-NEXT: DefLocation:     
-// CHECK-Y-NEXT:   LineNumber:      197
-// CHECK-Y-NEXT:   Filename:        '{{.*}}'
-// CHECK-Y-NEXT: TagType:         Class
-// CHECK-Y-NEXT: ...
-
 };
 
-// CHECK-X: ---
-// CHECK-X-NEXT: USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
-// CHECK-X-NEXT: Name:            'X'
-// CHECK-X-NEXT: DefLocation:     
-// CHECK-X-NEXT:   LineNumber:      196
-// CHECK-X-NEXT:   Filename:        '{{.*}}'
-// CHECK-X-NEXT: TagType:         Class
-// CHECK-X-NEXT: ...
-
-void H() {
-  class I {};
-  
-// CHECK-I: ---
-// CHECK-I-NEXT: USR:             '{{.*}}'
-// CHECK-I-NEXT: Name:            'I'
-// CHECK-I-NEXT: Namespace:       
-// CHECK-I-NEXT:   - Type:            Function
-// CHECK-I-NEXT:     Name:            'H'
-// CHECK-I-NEXT:     USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
-// CHECK-I-NEXT: DefLocation:     
-// CHECK-I-NEXT:   LineNumber:      224
-// CHECK-I-NEXT:   Filename:        'test'
-// CHECK-I-NEXT: TagType:         Class
-// CHECK-I-NEXT: ...
-
-}
-
-// CHECK-H: ---
-// CHECK-H-NEXT: USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
-// CHECK-H-NEXT: Name:            'H'
-// CHECK-H-NEXT: DefLocation:     
-// CHECK-H-NEXT:   LineNumber:      223
-// CHECK-H-NEXT:   Filename:        'test'
-// CHECK-H-NEXT: ReturnType:      
-// CHECK-H-NEXT:   Type:            
-// CHECK-H-NEXT:     Name:            'void'
-// CHECK-H-NEXT: ...
+// RUN: clang-doc --format=yaml --doxygen -p %t %t/test.cpp -output=%t/docs
+
+
+// RUN: cat %t/docs/./C.yaml | FileCheck %s --check-prefix CHECK-0
+// CHECK-0: ---
+// CHECK-0-NEXT: USR:             '06B5F6A19BA9F6A832E127C9968282B94619B210'
+// CHECK-0-NEXT: Name:            'C'
+// CHECK-0-NEXT: DefLocation:     
+// CHECK-0-NEXT:   LineNumber:      18
+// CHECK-0-NEXT:   Filename:        'test'
+// CHECK-0-NEXT: Members:         
+// CHECK-0-NEXT:   - Type:            
+// CHECK-0-NEXT:       Name:            'int'
+// CHECK-0-NEXT:     Name:            'i'
+// CHECK-0-NEXT: ...
+
+// RUN: cat %t/docs/./A.yaml | FileCheck %s --check-prefix CHECK-1
+// CHECK-1: ---
+// CHECK-1-NEXT: USR:             'ACE81AFA6627B4CEF2B456FB6E1252925674AF7E'
+// CHECK-1-NEXT: Name:            'A'
+// CHECK-1-NEXT: DefLocation:     
+// CHECK-1-NEXT:   LineNumber:      12
+// CHECK-1-NEXT:   Filename:        'test'
+// CHECK-1-NEXT: TagType:         Union
+// CHECK-1-NEXT: Members:         
+// CHECK-1-NEXT:   - Type:            
+// CHECK-1-NEXT:       Name:            'int'
+// CHECK-1-NEXT:     Name:            'X'
+// CHECK-1-NEXT:   - Type:            
+// CHECK-1-NEXT:       Name:            'int'
+// CHECK-1-NEXT:     Name:            'Y'
+// CHECK-1-NEXT: ...
+
+// RUN: cat %t/docs/./F.yaml | FileCheck %s --check-prefix CHECK-2
+// CHECK-2: ---
+// CHECK-2-NEXT: USR:             'E3B54702FABFF4037025BA194FC27C47006330B5'
+// CHECK-2-NEXT: Name:            'F'
+// CHECK-2-NEXT: DefLocation:     
+// CHECK-2-NEXT:   LineNumber:      33
+// CHECK-2-NEXT:   Filename:        'test'
+// CHECK-2-NEXT: TagType:         Class
+// CHECK-2-NEXT: Parents:         
+// CHECK-2-NEXT:   - Type:            Record
+// CHECK-2-NEXT:     Name:            'E'
+// CHECK-2-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-2-NEXT: VirtualParents:  
+// CHECK-2-NEXT:   - Type:            Record
+// CHECK-2-NEXT:     Name:            'D'
+// CHECK-2-NEXT:     USR:             '0921737541208B8FA9BB42B60F78AC1D779AA054'
+// CHECK-2-NEXT: ...
+
+// RUN: cat %t/docs/./E.yaml | FileCheck %s --check-prefix CHECK-3
+// CHECK-3: ---
+// CHECK-3-NEXT: USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT: Name:            'E'
+// CHECK-3-NEXT: DefLocation:     
+// CHECK-3-NEXT:   LineNumber:      22
+// CHECK-3-NEXT:   Filename:        'test'
+// CHECK-3-NEXT: TagType:         Class
+// CHECK-3-NEXT: ChildFunctions:  
+// CHECK-3-NEXT:   - USR:             'DEB4AC1CD9253CD9EF7FBE6BCAC506D77984ABD4'
+// CHECK-3-NEXT:     Name:            'E'
+// CHECK-3-NEXT:     Namespace:       
+// CHECK-3-NEXT:       - Type:            Record
+// CHECK-3-NEXT:         Name:            'E'
+// CHECK-3-NEXT:         USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     DefLocation:     
+// CHECK-3-NEXT:       LineNumber:      24
+// CHECK-3-NEXT:       Filename:        'test'
+// CHECK-3-NEXT:     IsMethod:        true
+// CHECK-3-NEXT:     Parent:          
+// CHECK-3-NEXT:       Type:            Record
+// CHECK-3-NEXT:       Name:            'E'
+// CHECK-3-NEXT:       USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     ReturnType:      
+// CHECK-3-NEXT:       Type:            
+// CHECK-3-NEXT:         Name:            'void'
+// CHECK-3-NEXT:   - USR:             'BD2BDEBD423F80BACCEA75DE6D6622D355FC2D17'
+// CHECK-3-NEXT:     Name:            '~E'
+// CHECK-3-NEXT:     Namespace:       
+// CHECK-3-NEXT:       - Type:            Record
+// CHECK-3-NEXT:         Name:            'E'
+// CHECK-3-NEXT:         USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     DefLocation:     
+// CHECK-3-NEXT:       LineNumber:      25
+// CHECK-3-NEXT:       Filename:        'test'
+// CHECK-3-NEXT:     IsMethod:        true
+// CHECK-3-NEXT:     Parent:          
+// CHECK-3-NEXT:       Type:            Record
+// CHECK-3-NEXT:       Name:            'E'
+// CHECK-3-NEXT:       USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     ReturnType:      
+// CHECK-3-NEXT:       Type:            
+// CHECK-3-NEXT:         Name:            'void'
+// CHECK-3-NEXT:   - USR:             '5093D428CDC62096A67547BA52566E4FB9404EEE'
+// CHECK-3-NEXT:     Name:            'ProtectedMethod'
+// CHECK-3-NEXT:     Namespace:       
+// CHECK-3-NEXT:       - Type:            Record
+// CHECK-3-NEXT:         Name:            'E'
+// CHECK-3-NEXT:         USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     DefLocation:     
+// CHECK-3-NEXT:       LineNumber:      31
+// CHECK-3-NEXT:       Filename:        'test'
+// CHECK-3-NEXT:     Location:        
+// CHECK-3-NEXT:       - LineNumber:      28
+// CHECK-3-NEXT:         Filename:        'test'
+// CHECK-3-NEXT:     IsMethod:        true
+// CHECK-3-NEXT:     Parent:          
+// CHECK-3-NEXT:       Type:            Record
+// CHECK-3-NEXT:       Name:            'E'
+// CHECK-3-NEXT:       USR:             '289584A8E0FF4178A794622A547AA622503967A1'
+// CHECK-3-NEXT:     ReturnType:      
+// CHECK-3-NEXT:       Type:            
+// CHECK-3-NEXT:         Name:            'void'
+// CHECK-3-NEXT: ...
+
+// RUN: cat %t/docs/./D.yaml | FileCheck %s --check-prefix CHECK-4
+// CHECK-4: ---
+// CHECK-4-NEXT: USR:             '0921737541208B8FA9BB42B60F78AC1D779AA054'
+// CHECK-4-NEXT: Name:            'D'
+// CHECK-4-NEXT: DefLocation:     
+// CHECK-4-NEXT:   LineNumber:      20
+// CHECK-4-NEXT:   Filename:        'test'
+// CHECK-4-NEXT: TagType:         Class
+// CHECK-4-NEXT: ...
+
+// RUN: cat %t/docs/./X.yaml | FileCheck %s --check-prefix CHECK-5
+// CHECK-5: ---
+// CHECK-5-NEXT: USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
+// CHECK-5-NEXT: Name:            'X'
+// CHECK-5-NEXT: DefLocation:     
+// CHECK-5-NEXT:   LineNumber:      35
+// CHECK-5-NEXT:   Filename:        'test'
+// CHECK-5-NEXT: TagType:         Class
+// CHECK-5-NEXT: ...
+
+// RUN: cat %t/docs/./GlobalNamespace.yaml | FileCheck %s --check-prefix CHECK-6
+// CHECK-6: ---
+// CHECK-6-NEXT: USR:             '0000000000000000000000000000000000000000'
+// CHECK-6-NEXT: ChildFunctions:  
+// CHECK-6-NEXT:   - USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
+// CHECK-6-NEXT:     Name:            'H'
+// CHECK-6-NEXT:     DefLocation:     
+// CHECK-6-NEXT:       LineNumber:      8
+// CHECK-6-NEXT:       Filename:        'test'
+// CHECK-6-NEXT:     ReturnType:      
+// CHECK-6-NEXT:       Type:            
+// CHECK-6-NEXT:         Name:            'void'
+// CHECK-6-NEXT: ChildEnums:      
+// CHECK-6-NEXT:   - USR:             'FC07BD34D5E77782C263FA944447929EA8753740'
+// CHECK-6-NEXT:     Name:            'B'
+// CHECK-6-NEXT:     DefLocation:     
+// CHECK-6-NEXT:       LineNumber:      14
+// CHECK-6-NEXT:       Filename:        'test'
+// CHECK-6-NEXT:     Members:         
+// CHECK-6-NEXT:       - 'X'
+// CHECK-6-NEXT:       - 'Y'
+// CHECK-6-NEXT:   - USR:             '1E3438A08BA22025C0B46289FF0686F92C8924C5'
+// CHECK-6-NEXT:     Name:            'Bc'
+// CHECK-6-NEXT:     DefLocation:     
+// CHECK-6-NEXT:       LineNumber:      16
+// CHECK-6-NEXT:       Filename:        'test'
+// CHECK-6-NEXT:     Scoped:          true
+// CHECK-6-NEXT:     Members:         
+// CHECK-6-NEXT:       - 'A'
+// CHECK-6-NEXT:       - 'B'
+// CHECK-6-NEXT: ...
+
+// RUN: cat %t/docs/H/I.yaml | FileCheck %s --check-prefix CHECK-7
+// CHECK-7: ---
+// CHECK-7-NEXT: USR:             'E60CA1CC7048098A7F4A48C3A53D45A533BDC39B'
+// CHECK-7-NEXT: Name:            'I'
+// CHECK-7-NEXT: Namespace:       
+// CHECK-7-NEXT:   - Type:            Function
+// CHECK-7-NEXT:     Name:            'H'
+// CHECK-7-NEXT:     USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
+// CHECK-7-NEXT: DefLocation:     
+// CHECK-7-NEXT:   LineNumber:      9
+// CHECK-7-NEXT:   Filename:        'test'
+// CHECK-7-NEXT: TagType:         Class
+// CHECK-7-NEXT: ...
+
+// RUN: cat %t/docs/X/Y.yaml | FileCheck %s --check-prefix CHECK-8
+// CHECK-8: ---
+// CHECK-8-NEXT: USR:             '641AB4A3D36399954ACDE29C7A8833032BF40472'
+// CHECK-8-NEXT: Name:            'Y'
+// CHECK-8-NEXT: Namespace:       
+// CHECK-8-NEXT:   - Type:            Record
+// CHECK-8-NEXT:     Name:            'X'
+// CHECK-8-NEXT:     USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
+// CHECK-8-NEXT: DefLocation:     
+// CHECK-8-NEXT:   LineNumber:      36
+// CHECK-8-NEXT:   Filename:        'test'
+// CHECK-8-NEXT: TagType:         Class
+// CHECK-8-NEXT: ...