Revert "[clang-doc] Refactoring mapper to map by scope"

This reverts commit r338738 as it's breaking the bots.

llvm-svn: 338748

Author: Julie Hockett

clang-tools-extra/clang-doc/BitcodeReader.cpp

@@ -100,8 +100,6 @@ bool decodeRecord(Record R, FieldId &Field, llvm::StringRef Blob) {
   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;
@@ -374,12 +372,6 @@ template <> void addReference(NamespaceInfo *I, Reference &&R, FieldId F) {
   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);
@@ -411,37 +403,12 @@ template <> void addReference(RecordInfo *I, Reference &&R, FieldId F) {
   case FieldId::F_vparent:
     I->VirtualParents.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;
@@ -488,8 +455,7 @@ template <typename T> bool ClangDocBitcodeReader::readBlock(unsigned ID, T I) {
 template <typename T>
 bool ClangDocBitcodeReader::readSubBlock(unsigned ID, T I) {
   switch (ID) {
-  // Blocks can only have Comment, Reference, TypeInfo, FunctionInfo, or
-  // EnumInfo subblocks
+  // Blocks can only have Comment, Reference, or TypeInfo subblocks
   case BI_COMMENT_BLOCK_ID:
     if (readBlock(ID, getCommentInfo(I)))
       return true;
@@ -526,22 +492,6 @@ bool ClangDocBitcodeReader::readSubBlock(unsigned ID, T I) {
     }
     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;
@@ -623,21 +573,16 @@ std::unique_ptr<Info> ClangDocBitcodeReader::readBlockToInfo(unsigned ID) {
 }
 
 // Entry point
-llvm::Expected<std::vector<std::unique_ptr<Info>>>
-ClangDocBitcodeReader::readBitcode() {
+std::vector<std::unique_ptr<Info>> ClangDocBitcodeReader::readBitcode() {
   std::vector<std::unique_ptr<Info>> Infos;
   if (!validateStream())
-    return llvm::make_error<llvm::StringError>("Invalid bitcode stream.\n",
-                                               llvm::inconvertibleErrorCode());
-  ;
+    return Infos;
 
   // Read the top level blocks.
   while (!Stream.AtEndOfStream()) {
     unsigned Code = Stream.ReadCode();
     if (Code != llvm::bitc::ENTER_SUBBLOCK)
-      return llvm::make_error<llvm::StringError>(
-          "Missing subblock in bitcode.\n", llvm::inconvertibleErrorCode());
-    ;
+      return Infos;
 
     unsigned ID = Stream.ReadSubBlockID();
     switch (ID) {
@@ -647,30 +592,24 @@ ClangDocBitcodeReader::readBitcode() {
     case BI_MEMBER_TYPE_BLOCK_ID:
     case BI_COMMENT_BLOCK_ID:
     case BI_REFERENCE_BLOCK_ID:
-      return llvm::make_error<llvm::StringError>(
-          "Invalid top level block in bitcode.\n",
-          llvm::inconvertibleErrorCode());
-      ;
+      llvm::errs() << "Invalid top level block.\n";
+      return Infos;
     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 llvm::make_error<llvm::StringError>(
-          "Invalid bitcode version in bitcode.\n",
-          llvm::inconvertibleErrorCode());
-      ;
+      return Infos;
     case llvm::bitc::BLOCKINFO_BLOCK_ID:
       if (readBlockInfoBlock())
         continue;
-      return llvm::make_error<llvm::StringError>(
-          "Invalid BlockInfo in bitcode.\n", llvm::inconvertibleErrorCode());
-      ;
+      return Infos;
     default:
       if (!Stream.SkipBlock())
         continue;

clang-tools-extra/clang-doc/BitcodeReader.h

@@ -19,7 +19,6 @@
 #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"
 
@@ -32,7 +31,7 @@ class ClangDocBitcodeReader {
   ClangDocBitcodeReader(llvm::BitstreamCursor &Stream) : Stream(Stream) {}
 
   // Main entry point, calls readBlock to read each block in the given stream.
-  llvm::Expected<std::vector<std::unique_ptr<Info>>> readBitcode();
+  std::vector<std::unique_ptr<Info>> readBitcode();
 
 private:
   enum class Cursor { BadBlock = 1, Record, BlockEnd, BlockBegin };

clang-tools-extra/clang-doc/BitcodeWriter.cpp

@@ -434,14 +434,6 @@ void ClangDocBitcodeWriter::emitBlock(const NamespaceInfo &I) {
     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) {
@@ -480,12 +472,6 @@ void ClangDocBitcodeWriter::emitBlock(const RecordInfo &I) {
     emitBlock(P, FieldId::F_parent);
   for (const auto &P : I.VirtualParents)
     emitBlock(P, FieldId::F_vparent);
-  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) {

clang-tools-extra/clang-doc/BitcodeWriter.h

@@ -68,10 +68,11 @@ enum BlockId {
 
 // 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,
-  FUNCTION_USR,
-  FUNCTION_NAME,
+  INFORECORDS(FUNCTION),
   FUNCTION_DEFLOCATION,
   FUNCTION_LOCATION,
   FUNCTION_ACCESS,
@@ -90,16 +91,13 @@ enum RecordId {
   FIELD_TYPE_NAME,
   MEMBER_TYPE_NAME,
   MEMBER_TYPE_ACCESS,
-  NAMESPACE_USR,
-  NAMESPACE_NAME,
-  ENUM_USR,
-  ENUM_NAME,
+  INFORECORDS(NAMESPACE),
+  INFORECORDS(ENUM),
   ENUM_DEFLOCATION,
   ENUM_LOCATION,
   ENUM_MEMBER,
   ENUM_SCOPED,
-  RECORD_USR,
-  RECORD_NAME,
+  INFORECORDS(RECORD),
   RECORD_DEFLOCATION,
   RECORD_LOCATION,
   RECORD_TAG_TYPE,
@@ -114,16 +112,10 @@ enum RecordId {
 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,
-  F_child_namespace,
-  F_child_record
-};
+enum class FieldId { F_default, F_namespace, F_parent, F_vparent, F_type };
 
 class ClangDocBitcodeWriter {
 public:

clang-tools-extra/clang-doc/Mapper.cpp

@@ -13,7 +13,6 @@
 #include "clang/AST/Comment.h"
 #include "clang/Index/USRGeneration.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Error.h"
 
 using clang::comments::FullComment;
 
@@ -34,15 +33,14 @@ template <typename T> bool MapASTVisitor::mapDecl(const T *D) {
   if (index::generateUSRForDecl(D, USR))
     return true;
 
-  auto I = serialize::emitInfo(
+  std::string info = serialize::emitInfo(
       D, getComment(D, D->getASTContext()), getLine(D, D->getASTContext()),
       getFile(D, D->getASTContext()), CDCtx.PublicOnly);
 
-  // A null in place of I indicates that the serializer is skipping this decl
-  // for some reason (e.g. we're only reporting public decls).
-  if (I)
-    CDCtx.ECtx->reportResult(llvm::toHex(llvm::toStringRef(I->USR)),
-                       serialize::serialize(I));
+  if (info != "")
+    CDCtx.ECtx->reportResult(
+        llvm::toHex(llvm::toStringRef(serialize::hashUSR(USR))), info);
+
   return true;
 }
 

clang-tools-extra/clang-doc/Representation.cpp

@@ -26,70 +26,17 @@
 namespace clang {
 namespace doc {
 
-namespace {
-
-const SymbolID EmptySID = SymbolID();
+static const SymbolID EmptySID = SymbolID();
 
 template <typename 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);
+std::unique_ptr<Info> reduce(std::vector<std::unique_ptr<Info>> &Values) {
+  std::unique_ptr<Info> Merged = llvm::make_unique<T>();
   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 getChildIndexIfExists(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 (getChildIndexIfExists(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 = getChildIndexIfExists(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 = getChildIndexIfExists(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) {
@@ -126,7 +73,7 @@ void Info::mergeBase(Info &&Other) {
 }
 
 bool Info::mergeable(const Info &Other) {
-  return IT == Other.IT && USR == Other.USR;
+  return IT == Other.IT && (USR == EmptySID || USR == Other.USR);
 }
 
 void SymbolInfo::merge(SymbolInfo &&Other) {
@@ -140,11 +87,6 @@ void SymbolInfo::merge(SymbolInfo &&Other) {
 
 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));
 }
 
@@ -158,10 +100,6 @@ void RecordInfo::merge(RecordInfo &&Other) {
     Parents = std::move(Other.Parents);
   if (VirtualParents.empty())
     VirtualParents = std::move(Other.VirtualParents);
-  // Reduce children if necessary.
-  reduceChildren(ChildRecords, std::move(Other.ChildRecords));
-  reduceChildren(ChildFunctions, std::move(Other.ChildFunctions));
-  reduceChildren(ChildEnums, std::move(Other.ChildEnums));
   SymbolInfo::merge(std::move(Other));
 }