[clang-doc] Bringing bitcode tests in line

[juliehockett]

Summary

Makes bitcode tests line up with what's actually called in the tool. Should fix the failing bot.
Also fixes a warning that was being thrown about initialization braces.

[leonardchan]

clang-tools-extra/unittests/clang-doc/BitcodeTest.cpp

39–40 ↗

(On Diff #170024)

Nit: The dispatchInfoForWrite function returns true on default and writeInfo would catch that assert. I assume just returning empty string is intended on this case?

clang-tools-extra/trunk/unittests/clang-doc/BitcodeTest.cpp

 #include "Representation.h"
 #include "llvm/Bitcode/BitstreamReader.h"
 #include "llvm/Bitcode/BitstreamWriter.h"
 #include "gtest/gtest.h"
 
 namespace clang {
 namespace doc {
 
-std::string writeInfo(Info *I) {
+template <typename T> static std::string writeInfo(T &I) {
   SmallString<2048> Buffer;
   llvm::BitstreamWriter Stream(Buffer);
   ClangDocBitcodeWriter Writer(Stream);
-  // Check that there was no error in the write.
-  assert(Writer.dispatchInfoForWrite(I) == false);
+  Writer.emitBlock(I);
   return Buffer.str().str();
 }
 
+std::string writeInfo(Info *I) {
+  switch (I->IT) {
+  case InfoType::IT_namespace:
+    return writeInfo(*static_cast<NamespaceInfo *>(I));
+  case InfoType::IT_record:
+    return writeInfo(*static_cast<RecordInfo *>(I));
+  case InfoType::IT_enum:
+    return writeInfo(*static_cast<EnumInfo *>(I));
+  case InfoType::IT_function:
+    return writeInfo(*static_cast<FunctionInfo *>(I));
+  default:
+    return "";
+  }
+}
+
 std::vector<std::unique_ptr<Info>> readInfo(StringRef Bitcode,
                                             size_t NumInfos) {
   llvm::BitstreamCursor Stream(Bitcode);
   doc::ClangDocBitcodeReader Reader(Stream);
   auto Infos = Reader.readBitcode();
 
   // Check that there was no error in the read.
   assert(Infos);

clang-tools-extra/trunk/unittests/clang-doc/ClangDocTest.h

 
 namespace clang {
 namespace doc {
 
 using EmittedInfoList = std::vector<std::unique_ptr<Info>>;
 
 static const SymbolID EmptySID = SymbolID();
 static const SymbolID NonEmptySID =
-    SymbolID{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+    SymbolID{{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}};
 
 NamespaceInfo *InfoAsNamespace(Info *I);
 RecordInfo *InfoAsRecord(Info *I);
 FunctionInfo *InfoAsFunction(Info *I);
 EnumInfo *InfoAsEnum(Info *I);
 
 // Unlike the operator==, these functions explicitly does not check USRs, as
 // that may change and it would be better to not rely on its implementation.