Updated code and source sizes.

Fixed some minor typos.

llvm-svn: 12513

.arcconfig

@@ -1,3 +0,0 @@
-{
-  "conduit_uri" : "https://reviews.llvm.org/"
-}

README.md

@@ -1,5 +0,0 @@
-# The LLVM Compiler Infrastructure
-
-This directory and its subdirectories contain source code for LLVM,
-a toolkit for the construction of highly optimized compilers,
-optimizers, and runtime environments.

clang-tools-extra/.arcconfig

@@ -1,4 +0,0 @@
-{
-  "repository.callsign" : "CTE",
-  "conduit_uri" : "https://reviews.llvm.org/"
-}

clang-tools-extra/.gitignore

@@ -1,32 +0,0 @@
-#==============================================================================#
-# This file specifies intentionally untracked files that git should ignore.
-# See: http://www.kernel.org/pub/software/scm/git/docs/gitignore.html
-#
-# This file is intentionally different from the output of `git svn show-ignore`,
-# as most of those are useless.
-#==============================================================================#
-
-#==============================================================================#
-# File extensions to be ignored anywhere in the tree.
-#==============================================================================#
-# Temp files created by most text editors.
-*~
-# Merge files created by git.
-*.orig
-# Byte compiled python modules.
-*.pyc
-# vim swap files
-.*.swp
-.sw?
-
-#==============================================================================#
-# Explicit files to ignore (only matches one).
-#==============================================================================#
-cscope.files
-cscope.out
-.clang_complete
-
-#==============================================================================#
-# Directories to ignore (do not add trailing '/'s, they skip symlinks).
-#==============================================================================#
-docs/_build

clang-tools-extra/CMakeLists.txt

@@ -1,32 +0,0 @@
-option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE)
-endif ()
-
-add_subdirectory(clang-apply-replacements)
-add_subdirectory(clang-reorder-fields)
-add_subdirectory(modularize)
-add_subdirectory(clang-tidy)
-add_subdirectory(clang-tidy-vs)
-
-add_subdirectory(change-namespace)
-add_subdirectory(clang-doc)
-add_subdirectory(clang-query)
-add_subdirectory(clang-move)
-add_subdirectory(clangd)
-add_subdirectory(include-fixer)
-add_subdirectory(pp-trace)
-add_subdirectory(tool-template)
-
-# Add the common testsuite after all the tools.
-if(CLANG_INCLUDE_TESTS)
-add_subdirectory(test)
-add_subdirectory(unittests)
-endif()
-
-option(CLANG_TOOLS_EXTRA_INCLUDE_DOCS "Generate build targets for the Clang Extra Tools docs."
-  ${LLVM_INCLUDE_DOCS})
-if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS )
-  add_subdirectory(docs)
-endif()
-

clang-tools-extra/CODE_OWNERS.TXT

@@ -1,21 +0,0 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular tool are reviewed, either by themself or by someone else. They are
-also the gatekeepers for their part of Clang, with the final word on what goes
-in or not.
-
-The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), web-address
-(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
-
-N: Aaron Ballman
-E: aaron@aaronballman.com
-D: clang-query
-
-N: Manuel Klimek
-E: klimek@google.com
-D: clang-rename, all parts of clang-tools-extra not covered by someone else
-
-N: Alexander Kornienko
-E: alexfh@google.com
-D: clang-tidy

clang-tools-extra/LICENSE.TXT

@@ -1,63 +0,0 @@
-==============================================================================
-LLVM Release License
-==============================================================================
-University of Illinois/NCSA
-Open Source License
-
-Copyright (c) 2007-2019 University of Illinois at Urbana-Champaign.
-All rights reserved.
-
-Developed by:
-
-    LLVM Team
-
-    University of Illinois at Urbana-Champaign
-
-    http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimers in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the LLVM Team, University of Illinois at
-      Urbana-Champaign, nor the names of its contributors may be used to
-      endorse or promote products derived from this Software without specific
-      prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
-
-==============================================================================
-The LLVM software contains code written by third parties.  Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the LLVM Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program             Directory
--------             ---------
-clang-tidy          clang-tidy/cert
-clang-tidy          clang-tidy/hicpp

clang-tools-extra/README.txt

@@ -1,22 +0,0 @@
-//===----------------------------------------------------------------------===//
-// Clang Tools repository
-//===----------------------------------------------------------------------===//
-
-Welcome to the repository of extra Clang Tools.  This repository holds tools
-that are developed as part of the LLVM compiler infrastructure project and the
-Clang frontend.  These tools are kept in a separate "extra" repository to
-allow lighter weight checkouts of the core Clang codebase.
-
-This repository is only intended to be checked out inside of a full LLVM+Clang
-tree, and in the 'tools/extra' subdirectory of the Clang checkout.
-
-All discussion regarding Clang, Clang-based tools, and code in this repository
-should be held using the standard Clang mailing lists:
-  http://lists.llvm.org/mailman/listinfo/cfe-dev
-
-Code review for this tree should take place on the standard Clang patch and
-commit lists:
-  http://lists.llvm.org/mailman/listinfo/cfe-commits
-
-If you find a bug in these tools, please file it in the LLVM bug tracker:
-  http://llvm.org/bugs/

clang-tools-extra/change-namespace/CMakeLists.txt

@@ -1,20 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  )
-
-add_clang_library(clangChangeNamespace
-  ChangeNamespace.cpp
-
-  LINK_LIBS
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangLex
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )
-
-add_subdirectory(tool)

clang-tools-extra/change-namespace/ChangeNamespace.h

@@ -1,176 +0,0 @@
-//===-- ChangeNamespace.h -- Change namespace  ------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CHANGE_NAMESPACE_CHANGENAMESPACE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CHANGE_NAMESPACE_CHANGENAMESPACE_H
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Format/Format.h"
-#include "clang/Tooling/Core/Replacement.h"
-#include "llvm/Support/Regex.h"
-#include <string>
-
-namespace clang {
-namespace change_namespace {
-
-// This tool can be used to change the surrounding namespaces of class/function
-// definitions. Classes/functions in the moved namespace will have new
-// namespaces while references to symbols (e.g. types, functions) which are not
-// defined in the changed namespace will be correctly qualified by prepending
-// namespace specifiers before them.
-// This will try to add shortest namespace specifiers possible. When a symbol
-// reference needs to be fully-qualified, this adds a "::" prefix to the
-// namespace specifiers unless the new namespace is the global namespace.
-// For classes, only classes that are declared/defined in the given namespace in
-// speficifed files will be moved: forward declarations will remain in the old
-// namespace.
-// For example, changing "a" to "x":
-// Old code:
-//   namespace a {
-//   class FWD;
-//   class A { FWD *fwd; }
-//   }  // a
-// New code:
-//   namespace a {
-//   class FWD;
-//   }  // a
-//   namespace x {
-//   class A { ::a::FWD *fwd; }
-//   }  // x
-// FIXME: support moving typedef, enums across namespaces.
-class ChangeNamespaceTool : public ast_matchers::MatchFinder::MatchCallback {
-public:
-  // Moves code in the old namespace `OldNs` to the new namespace `NewNs` in
-  // files matching `FilePattern`.
-  ChangeNamespaceTool(
-      llvm::StringRef OldNs, llvm::StringRef NewNs, llvm::StringRef FilePattern,
-      llvm::ArrayRef<std::string> WhiteListedSymbolPatterns,
-      std::map<std::string, tooling::Replacements> *FileToReplacements,
-      llvm::StringRef FallbackStyle = "LLVM");
-
-  void registerMatchers(ast_matchers::MatchFinder *Finder);
-
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override;
-
-  // Moves the changed code in old namespaces but leaves class forward
-  // declarations behind.
-  void onEndOfTranslationUnit() override;
-
-private:
-  void moveOldNamespace(const ast_matchers::MatchFinder::MatchResult &Result,
-                        const NamespaceDecl *NsDecl);
-
-  void moveClassForwardDeclaration(
-      const ast_matchers::MatchFinder::MatchResult &Result,
-      const NamedDecl *FwdDecl);
-
-  void replaceQualifiedSymbolInDeclContext(
-      const ast_matchers::MatchFinder::MatchResult &Result,
-      const DeclContext *DeclContext, SourceLocation Start, SourceLocation End,
-      const NamedDecl *FromDecl);
-
-  void fixTypeLoc(const ast_matchers::MatchFinder::MatchResult &Result,
-                  SourceLocation Start, SourceLocation End, TypeLoc Type);
-
-  void fixUsingShadowDecl(const ast_matchers::MatchFinder::MatchResult &Result,
-                          const UsingDecl *UsingDeclaration);
-
-  void fixDeclRefExpr(const ast_matchers::MatchFinder::MatchResult &Result,
-                      const DeclContext *UseContext, const NamedDecl *From,
-                      const DeclRefExpr *Ref);
-
-  // Information about moving an old namespace.
-  struct MoveNamespace {
-    // The start offset of the namespace block being moved in the original
-    // code.
-    unsigned Offset;
-    // The length of the namespace block in the original code.
-    unsigned Length;
-    // The offset at which the new namespace block will be inserted in the
-    // original code.
-    unsigned InsertionOffset;
-    // The file in which the namespace is declared.
-    FileID FID;
-    SourceManager *SourceMgr;
-  };
-
-  // Information about inserting a class forward declaration.
-  struct InsertForwardDeclaration {
-    // The offset at while the forward declaration will be inserted in the
-    // original code.
-    unsigned InsertionOffset;
-    // The code to be inserted.
-    std::string ForwardDeclText;
-  };
-
-  std::string FallbackStyle;
-  // In match callbacks, this contains replacements for replacing `typeLoc`s in
-  // and deleting forward declarations in the moved namespace blocks.
-  // In `onEndOfTranslationUnit` callback, the previous added replacements are
-  // applied (on the moved namespace blocks), and then changed code in old
-  // namespaces re moved to new namespaces, and previously deleted forward
-  // declarations are inserted back to old namespaces, from which they are
-  // deleted.
-  std::map<std::string, tooling::Replacements> &FileToReplacements;
-  // A fully qualified name of the old namespace without "::" prefix, e.g.
-  // "a::b::c".
-  std::string OldNamespace;
-  // A fully qualified name of the new namespace without "::" prefix, e.g.
-  // "x::y::z".
-  std::string NewNamespace;
-  // The longest suffix in the old namespace that does not overlap the new
-  // namespace.
-  // For example, if `OldNamespace` is "a::b::c" and `NewNamespace` is
-  // "a::x::y", then `DiffOldNamespace` will be "b::c".
-  std::string DiffOldNamespace;
-  // The longest suffix in the new namespace that does not overlap the old
-  // namespace.
-  // For example, if `OldNamespace` is "a::b::c" and `NewNamespace` is
-  // "a::x::y", then `DiffNewNamespace` will be "x::y".
-  std::string DiffNewNamespace;
-  // A regex pattern that matches files to be processed.
-  std::string FilePattern;
-  llvm::Regex FilePatternRE;
-  // Information about moved namespaces grouped by file.
-  // Since we are modifying code in old namespaces (e.g. add namespace
-  // spedifiers) as well as moving them, we store information about namespaces
-  // to be moved and only move them after all modifications are finished (i.e.
-  // in `onEndOfTranslationUnit`).
-  std::map<std::string, std::vector<MoveNamespace>> MoveNamespaces;
-  // Information about forward declaration insertions grouped by files.
-  // A class forward declaration is not moved, so it will be deleted from the
-  // moved code block and inserted back into the old namespace. The insertion
-  // will be done after removing the code from the old namespace and before
-  // inserting it to the new namespace.
-  std::map<std::string, std::vector<InsertForwardDeclaration>> InsertFwdDecls;
-  // Records all using declarations, which can be used to shorten namespace
-  // specifiers.
-  llvm::SmallPtrSet<const UsingDecl *, 8> UsingDecls;
-  // Records all using namespace declarations, which can be used to shorten
-  // namespace specifiers.
-  llvm::SmallPtrSet<const UsingDirectiveDecl *, 8> UsingNamespaceDecls;
-  // Records all namespace alias declarations, which can be used to shorten
-  // namespace specifiers.
-  llvm::SmallPtrSet<const NamespaceAliasDecl *, 8> NamespaceAliasDecls;
-  // TypeLocs of CXXCtorInitializer. Types of CXXCtorInitializers do not need to
-  // be fixed.
-  llvm::SmallVector<TypeLoc, 8> BaseCtorInitializerTypeLocs;
-  // Since a DeclRefExpr for a function call can be matched twice (one as
-  // CallExpr and one as DeclRefExpr), we record all DeclRefExpr's that have
-  // been processed so that we don't handle them twice.
-  llvm::SmallPtrSet<const clang::DeclRefExpr*, 16> ProcessedFuncRefs;
-  // Patterns of symbol names whose references are not expected to be updated
-  // when changing namespaces around them.
-  std::vector<llvm::Regex> WhiteListedSymbolRegexes;
-};
-
-} // namespace change_namespace
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CHANGE_NAMESPACE_CHANGENAMESPACE_H

clang-tools-extra/change-namespace/tool/CMakeLists.txt

@@ -1,25 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_executable(clang-change-namespace
-  ClangChangeNamespace.cpp
-  )
-target_link_libraries(clang-change-namespace
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangChangeNamespace
-  clangFormat
-  clangFrontend
-  clangRewrite
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )
-
-install(TARGETS clang-change-namespace
-  RUNTIME DESTINATION bin)

clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp

@@ -1,178 +0,0 @@
-//===-- ClangIncludeFixer.cpp - Standalone change namespace ---------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-// This tool can be used to change the surrounding namespaces of class/function
-// definitions.
-//
-// Example: test.cc
-//    namespace na {
-//    class X {};
-//    namespace nb {
-//    class Y { X x; };
-//    } // namespace nb
-//    } // namespace na
-// To move the definition of class Y from namespace "na::nb" to "x::y", run:
-//    clang-change-namespace --old_namespace "na::nb" \
-//      --new_namespace "x::y" --file_pattern "test.cc" test.cc --
-// Output:
-//    namespace na {
-//    class X {};
-//    } // namespace na
-//    namespace x {
-//    namespace y {
-//    class Y { na::X x; };
-//    } // namespace y
-//    } // namespace x
-
-#include "ChangeNamespace.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/CommonOptionsParser.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/YAMLTraits.h"
-
-using namespace clang;
-using namespace llvm;
-
-namespace {
-
-cl::OptionCategory ChangeNamespaceCategory("Change namespace.");
-
-cl::opt<std::string> OldNamespace("old_namespace", cl::Required,
-                                  cl::desc("Old namespace."),
-                                  cl::cat(ChangeNamespaceCategory));
-
-cl::opt<std::string> NewNamespace("new_namespace", cl::Required,
-                                  cl::desc("New namespace."),
-                                  cl::cat(ChangeNamespaceCategory));
-
-cl::opt<std::string> FilePattern(
-    "file_pattern", cl::Required,
-    cl::desc("Only rename namespaces in files that match the given pattern."),
-    cl::cat(ChangeNamespaceCategory));
-
-cl::opt<bool> Inplace("i", cl::desc("Inplace edit <file>s, if specified."),
-                      cl::cat(ChangeNamespaceCategory));
-
-cl::opt<bool>
-    DumpYAML("dump_result",
-         cl::desc("Dump new file contents in YAML, if specified."),
-         cl::cat(ChangeNamespaceCategory));
-
-cl::opt<std::string> Style("style",
-                           cl::desc("The style name used for reformatting."),
-                           cl::init("LLVM"), cl::cat(ChangeNamespaceCategory));
-
-cl::opt<std::string> WhiteListFile(
-    "whitelist_file",
-    cl::desc("A file containing regexes of symbol names that are not expected "
-             "to be updated when changing namespaces around them."),
-    cl::init(""), cl::cat(ChangeNamespaceCategory));
-
-llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() {
-  std::vector<std::string> Patterns;
-  if (WhiteListFile.empty())
-    return Patterns;
-
-  llvm::SmallVector<StringRef, 8> Lines;
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-      llvm::MemoryBuffer::getFile(WhiteListFile);
-  if (!File)
-    return File.getError();
-  llvm::StringRef Content = File.get()->getBuffer();
-  Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
-  for (auto Line : Lines)
-    Patterns.push_back(Line.trim());
-  return Patterns;
-}
-
-} // anonymous namespace
-
-int main(int argc, const char **argv) {
-  llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
-  tooling::CommonOptionsParser OptionsParser(argc, argv,
-                                             ChangeNamespaceCategory);
-  const auto &Files = OptionsParser.getSourcePathList();
-  tooling::RefactoringTool Tool(OptionsParser.getCompilations(), Files);
-  llvm::ErrorOr<std::vector<std::string>> WhiteListPatterns =
-      GetWhiteListedSymbolPatterns();
-  if (!WhiteListPatterns) {
-    llvm::errs() << "Failed to open whitelist file " << WhiteListFile << ". "
-                 << WhiteListPatterns.getError().message() << "\n";
-    return 1;
-  }
-  change_namespace::ChangeNamespaceTool NamespaceTool(
-      OldNamespace, NewNamespace, FilePattern, *WhiteListPatterns,
-      &Tool.getReplacements(), Style);
-  ast_matchers::MatchFinder Finder;
-  NamespaceTool.registerMatchers(&Finder);
-  std::unique_ptr<tooling::FrontendActionFactory> Factory =
-      tooling::newFrontendActionFactory(&Finder);
-
-  if (int Result = Tool.run(Factory.get()))
-    return Result;
-  LangOptions DefaultLangOptions;
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  clang::TextDiagnosticPrinter DiagnosticPrinter(errs(), &*DiagOpts);
-  DiagnosticsEngine Diagnostics(
-      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
-      &DiagnosticPrinter, false);
-  auto &FileMgr = Tool.getFiles();
-  SourceManager Sources(Diagnostics, FileMgr);
-  Rewriter Rewrite(Sources, DefaultLangOptions);
-
-  if (!formatAndApplyAllReplacements(Tool.getReplacements(), Rewrite, Style)) {
-    llvm::errs() << "Failed applying all replacements.\n";
-    return 1;
-  }
-  if (Inplace)
-    return Rewrite.overwriteChangedFiles();
-
-  std::set<llvm::StringRef> ChangedFiles;
-  for (const auto &it : Tool.getReplacements())
-    ChangedFiles.insert(it.first);
-
-  if (DumpYAML) {
-    auto WriteToYAML = [&](llvm::raw_ostream &OS) {
-      OS << "[\n";
-      for (auto I = ChangedFiles.begin(), E = ChangedFiles.end(); I != E; ++I) {
-        OS << "  {\n";
-        OS << "    \"FilePath\": \"" << *I << "\",\n";
-        const auto *Entry = FileMgr.getFile(*I);
-        auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
-        std::string Content;
-        llvm::raw_string_ostream ContentStream(Content);
-        Rewrite.getEditBuffer(ID).write(ContentStream);
-        OS << "    \"SourceText\": \""
-           << llvm::yaml::escape(ContentStream.str()) << "\"\n";
-        OS << "  }";
-        if (I != std::prev(E))
-          OS << ",\n";
-      }
-      OS << "\n]\n";
-    };
-    WriteToYAML(llvm::outs());
-    return 0;
-  }
-
-  for (const auto &File : ChangedFiles) {
-    const auto *Entry = FileMgr.getFile(File);
-
-    auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
-    outs() << "============== " << File << " ==============\n";
-    Rewrite.getEditBuffer(ID).write(llvm::outs());
-    outs() << "\n============================================\n";
-  }
-
-  return 0;
-}

clang-tools-extra/clang-apply-replacements/CMakeLists.txt

@@ -1,20 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_library(clangApplyReplacements
-  lib/Tooling/ApplyReplacements.cpp
-
-  LINK_LIBS
-  clangAST
-  clangBasic
-  clangRewrite
-  clangToolingCore
-  clangToolingRefactor
-  )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  include
-  )
-add_subdirectory(tool)

clang-tools-extra/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h

@@ -1,123 +0,0 @@
-//===-- ApplyReplacements.h - Deduplicate and apply replacements -- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief This file provides the interface for deduplicating, detecting
-/// conflicts in, and applying collections of Replacements.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_APPLYREPLACEMENTS_H
-#define LLVM_CLANG_APPLYREPLACEMENTS_H
-
-#include "clang/Tooling/Core/Diagnostic.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Refactoring/AtomicChange.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include <string>
-#include <system_error>
-#include <vector>
-
-namespace clang {
-
-class DiagnosticsEngine;
-class Rewriter;
-
-namespace replace {
-
-/// \brief Collection of TranslationUnitReplacements.
-typedef std::vector<clang::tooling::TranslationUnitReplacements> TUReplacements;
-
-/// \brief Collection of TranslationUnitReplacement files.
-typedef std::vector<std::string> TUReplacementFiles;
-
-/// \brief Collection of TranslationUniDiagnostics.
-typedef std::vector<clang::tooling::TranslationUnitDiagnostics> TUDiagnostics;
-
-/// \brief Map mapping file name to a set of AtomicChange targeting that file.
-typedef llvm::DenseMap<const clang::FileEntry *,
-                       std::vector<tooling::AtomicChange>>
-    FileToChangesMap;
-
-/// \brief Recursively descends through a directory structure rooted at \p
-/// Directory and attempts to deserialize *.yaml files as
-/// TranslationUnitReplacements. All docs that successfully deserialize are
-/// added to \p TUs.
-///
-/// Directories starting with '.' are ignored during traversal.
-///
-/// \param[in] Directory Directory to begin search for serialized
-/// TranslationUnitReplacements.
-/// \param[out] TUs Collection of all found and deserialized
-/// TranslationUnitReplacements or TranslationUnitDiagnostics.
-/// \param[out] TUFiles Collection of all TranslationUnitReplacement files
-/// found in \c Directory.
-/// \param[in] Diagnostics DiagnosticsEngine used for error output.
-///
-/// \returns An error_code indicating success or failure in navigating the
-/// directory structure.
-std::error_code collectReplacementsFromDirectory(
-    const llvm::StringRef Directory, TUReplacements &TUs,
-    TUReplacementFiles &TUFiles, clang::DiagnosticsEngine &Diagnostics);
-
-std::error_code collectReplacementsFromDirectory(
-    const llvm::StringRef Directory, TUDiagnostics &TUs,
-    TUReplacementFiles &TUFiles, clang::DiagnosticsEngine &Diagnostics);
-
-/// \brief Deduplicate, check for conflicts, and extract all Replacements stored
-/// in \c TUs. Conflicting replacements are skipped.
-///
-/// \post For all (key,value) in FileChanges, value[i].getOffset() <=
-/// value[i+1].getOffset().
-///
-/// \param[in] TUs Collection of TranslationUnitReplacements or
-/// TranslationUnitDiagnostics to merge, deduplicate, and test for conflicts.
-/// \param[out] FileChanges Container grouping all changes by the
-/// file they target. Only non conflicting replacements are kept into
-/// FileChanges.
-/// \param[in] SM SourceManager required for conflict reporting.
-///
-/// \returns \parblock
-///          \li true If all changes were converted successfully.
-///          \li false If there were conflicts.
-bool mergeAndDeduplicate(const TUReplacements &TUs, const TUDiagnostics &TUDs,
-                         FileToChangesMap &FileChanges,
-                         clang::SourceManager &SM);
-
-/// \brief Apply \c AtomicChange on File and rewrite it.
-///
-/// \param[in] File Path of the file where to apply AtomicChange.
-/// \param[in] Changes to apply.
-/// \param[in] Spec For code cleanup and formatting.
-/// \param[in] Diagnostics DiagnosticsEngine used for error output.
-///
-/// \returns The changed code if all changes are applied successfully;
-/// otherwise, an llvm::Error carrying llvm::StringError or an error_code.
-llvm::Expected<std::string>
-applyChanges(StringRef File, const std::vector<tooling::AtomicChange> &Changes,
-             const tooling::ApplyChangesSpec &Spec,
-             DiagnosticsEngine &Diagnostics);
-
-/// \brief Delete the replacement files.
-///
-/// \param[in] Files Replacement files to delete.
-/// \param[in] Diagnostics DiagnosticsEngine used for error output.
-///
-/// \returns \parblock
-///          \li true If all files have been deleted successfully.
-///          \li false If at least one or more failures occur when deleting
-/// files.
-bool deleteReplacementFiles(const TUReplacementFiles &Files,
-                            clang::DiagnosticsEngine &Diagnostics);
-
-} // end namespace replace
-} // end namespace clang
-
-#endif // LLVM_CLANG_APPLYREPLACEMENTS_H

clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp

@@ -1,260 +0,0 @@
-//===-- ApplyReplacements.cpp - Apply and deduplicate replacements --------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief This file provides the implementation for deduplicating, detecting
-/// conflicts in, and applying collections of Replacements.
-///
-/// FIXME: Use Diagnostics for output instead of llvm::errs().
-///
-//===----------------------------------------------------------------------===//
-#include "clang-apply-replacements/Tooling/ApplyReplacements.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Format/Format.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/DiagnosticsYaml.h"
-#include "clang/Tooling/ReplacementsYaml.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm;
-using namespace clang;
-
-static void eatDiagnostics(const SMDiagnostic &, void *) {}
-
-namespace clang {
-namespace replace {
-
-std::error_code collectReplacementsFromDirectory(
-    const llvm::StringRef Directory, TUReplacements &TUs,
-    TUReplacementFiles &TUFiles, clang::DiagnosticsEngine &Diagnostics) {
-  using namespace llvm::sys::fs;
-  using namespace llvm::sys::path;
-
-  std::error_code ErrorCode;
-
-  for (recursive_directory_iterator I(Directory, ErrorCode), E;
-       I != E && !ErrorCode; I.increment(ErrorCode)) {
-    if (filename(I->path())[0] == '.') {
-      // Indicate not to descend into directories beginning with '.'
-      I.no_push();
-      continue;
-    }
-
-    if (extension(I->path()) != ".yaml")
-      continue;
-
-    TUFiles.push_back(I->path());
-
-    ErrorOr<std::unique_ptr<MemoryBuffer>> Out =
-        MemoryBuffer::getFile(I->path());
-    if (std::error_code BufferError = Out.getError()) {
-      errs() << "Error reading " << I->path() << ": " << BufferError.message()
-             << "\n";
-      continue;
-    }
-
-    yaml::Input YIn(Out.get()->getBuffer(), nullptr, &eatDiagnostics);
-    tooling::TranslationUnitReplacements TU;
-    YIn >> TU;
-    if (YIn.error()) {
-      // File doesn't appear to be a header change description. Ignore it.
-      continue;
-    }
-
-    // Only keep files that properly parse.
-    TUs.push_back(TU);
-  }
-
-  return ErrorCode;
-}
-
-std::error_code collectReplacementsFromDirectory(
-    const llvm::StringRef Directory, TUDiagnostics &TUs,
-    TUReplacementFiles &TUFiles, clang::DiagnosticsEngine &Diagnostics) {
-  using namespace llvm::sys::fs;
-  using namespace llvm::sys::path;
-
-  std::error_code ErrorCode;
-
-  for (recursive_directory_iterator I(Directory, ErrorCode), E;
-       I != E && !ErrorCode; I.increment(ErrorCode)) {
-    if (filename(I->path())[0] == '.') {
-      // Indicate not to descend into directories beginning with '.'
-      I.no_push();
-      continue;
-    }
-
-    if (extension(I->path()) != ".yaml")
-      continue;
-
-    TUFiles.push_back(I->path());
-
-    ErrorOr<std::unique_ptr<MemoryBuffer>> Out =
-        MemoryBuffer::getFile(I->path());
-    if (std::error_code BufferError = Out.getError()) {
-      errs() << "Error reading " << I->path() << ": " << BufferError.message()
-             << "\n";
-      continue;
-    }
-
-    yaml::Input YIn(Out.get()->getBuffer(), nullptr, &eatDiagnostics);
-    tooling::TranslationUnitDiagnostics TU;
-    YIn >> TU;
-    if (YIn.error()) {
-      // File doesn't appear to be a header change description. Ignore it.
-      continue;
-    }
-
-    // Only keep files that properly parse.
-    TUs.push_back(TU);
-  }
-
-  return ErrorCode;
-}
-
-/// \brief Extract replacements from collected TranslationUnitReplacements and
-/// TranslationUnitDiagnostics and group them per file. Identical replacements
-/// from diagnostics are deduplicated.
-///
-/// \param[in] TUs Collection of all found and deserialized
-/// TranslationUnitReplacements.
-/// \param[in] TUDs Collection of all found and deserialized
-/// TranslationUnitDiagnostics.
-/// \param[in] SM Used to deduplicate paths.
-///
-/// \returns A map mapping FileEntry to a set of Replacement targeting that
-/// file.
-static llvm::DenseMap<const FileEntry *, std::vector<tooling::Replacement>>
-groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
-                  const clang::SourceManager &SM) {
-  std::set<StringRef> Warned;
-  llvm::DenseMap<const FileEntry *, std::vector<tooling::Replacement>>
-      GroupedReplacements;
-
-  // Deduplicate identical replacements in diagnostics.
-  // FIXME: Find an efficient way to deduplicate on diagnostics level.
-  llvm::DenseMap<const FileEntry *, std::set<tooling::Replacement>>
-      DiagReplacements;
-
-  auto AddToGroup = [&](const tooling::Replacement &R, bool FromDiag) {
-    // Use the file manager to deduplicate paths. FileEntries are
-    // automatically canonicalized.
-    if (const FileEntry *Entry = SM.getFileManager().getFile(R.getFilePath())) {
-      if (FromDiag) {
-        auto &Replaces = DiagReplacements[Entry];
-        if (!Replaces.insert(R).second)
-          return;
-      }
-      GroupedReplacements[Entry].push_back(R);
-    } else if (Warned.insert(R.getFilePath()).second) {
-      errs() << "Described file '" << R.getFilePath()
-             << "' doesn't exist. Ignoring...\n";
-    }
-  };
-
-  for (const auto &TU : TUs)
-    for (const tooling::Replacement &R : TU.Replacements)
-      AddToGroup(R, false);
-
-  for (const auto &TU : TUDs)
-    for (const auto &D : TU.Diagnostics)
-      for (const auto &Fix : D.Fix)
-        for (const tooling::Replacement &R : Fix.second)
-          AddToGroup(R, true);
-
-  // Sort replacements per file to keep consistent behavior when
-  // clang-apply-replacements run on differents machine.
-  for (auto &FileAndReplacements : GroupedReplacements) {
-    llvm::sort(FileAndReplacements.second.begin(),
-               FileAndReplacements.second.end());
-  }
-
-  return GroupedReplacements;
-}
-
-bool mergeAndDeduplicate(const TUReplacements &TUs, const TUDiagnostics &TUDs,
-                         FileToChangesMap &FileChanges,
-                         clang::SourceManager &SM) {
-  auto GroupedReplacements = groupReplacements(TUs, TUDs, SM);
-  bool ConflictDetected = false;
-
-  // To report conflicting replacements on corresponding file, all replacements
-  // are stored into 1 big AtomicChange.
-  for (const auto &FileAndReplacements : GroupedReplacements) {
-    const FileEntry *Entry = FileAndReplacements.first;
-    const SourceLocation BeginLoc =
-        SM.getLocForStartOfFile(SM.getOrCreateFileID(Entry, SrcMgr::C_User));
-    tooling::AtomicChange FileChange(Entry->getName(), Entry->getName());
-    for (const auto &R : FileAndReplacements.second) {
-      llvm::Error Err =
-          FileChange.replace(SM, BeginLoc.getLocWithOffset(R.getOffset()),
-                             R.getLength(), R.getReplacementText());
-      if (Err) {
-        // FIXME: This will report conflicts by pair using a file+offset format
-        // which is not so much human readable.
-        // A first improvement could be to translate offset to line+col. For
-        // this and without loosing error message some modifications arround
-        // `tooling::ReplacementError` are need (access to
-        // `getReplacementErrString`).
-        // A better strategy could be to add a pretty printer methods for
-        // conflict reporting. Methods that could be parameterized to report a
-        // conflict in different format, file+offset, file+line+col, or even
-        // more human readable using VCS conflict markers.
-        // For now, printing directly the error reported by `AtomicChange` is
-        // the easiest solution.
-        errs() << llvm::toString(std::move(Err)) << "\n";
-        ConflictDetected = true;
-      }
-    }
-    FileChanges.try_emplace(Entry,
-                            std::vector<tooling::AtomicChange>{FileChange});
-  }
-
-  return !ConflictDetected;
-}
-
-llvm::Expected<std::string>
-applyChanges(StringRef File, const std::vector<tooling::AtomicChange> &Changes,
-             const tooling::ApplyChangesSpec &Spec,
-             DiagnosticsEngine &Diagnostics) {
-  FileManager Files((FileSystemOptions()));
-  SourceManager SM(Diagnostics, Files);
-
-  llvm::ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer =
-      SM.getFileManager().getBufferForFile(File);
-  if (!Buffer)
-    return errorCodeToError(Buffer.getError());
-  return tooling::applyAtomicChanges(File, Buffer.get()->getBuffer(), Changes,
-                                     Spec);
-}
-
-bool deleteReplacementFiles(const TUReplacementFiles &Files,
-                            clang::DiagnosticsEngine &Diagnostics) {
-  bool Success = true;
-  for (const auto &Filename : Files) {
-    std::error_code Error = llvm::sys::fs::remove(Filename);
-    if (Error) {
-      Success = false;
-      // FIXME: Use Diagnostics for outputting errors.
-      errs() << "Error deleting file: " << Filename << "\n";
-      errs() << Error.message() << "\n";
-      errs() << "Please delete the file manually\n";
-    }
-  }
-  return Success;
-}
-
-} // end namespace replace
-} // end namespace clang

clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt

@@ -1,19 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_tool(clang-apply-replacements
-  ClangApplyReplacementsMain.cpp
-  )
-target_link_libraries(clang-apply-replacements
-  PRIVATE
-  clangApplyReplacements
-  clangBasic
-  clangFormat
-  clangRewrite
-  clangToolingCore
-  clangToolingRefactor
-  )
-
-install(TARGETS clang-apply-replacements
-  RUNTIME DESTINATION bin)

clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp

@@ -1,165 +0,0 @@
-//===-- ClangApplyReplacementsMain.cpp - Main file for the tool -----------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief This file provides the main function for the
-/// clang-apply-replacements tool.
-///
-//===----------------------------------------------------------------------===//
-
-#include "clang-apply-replacements/Tooling/ApplyReplacements.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/Version.h"
-#include "clang/Format/Format.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/Support/CommandLine.h"
-
-using namespace llvm;
-using namespace clang;
-using namespace clang::replace;
-
-static cl::opt<std::string> Directory(cl::Positional, cl::Required,
-                                      cl::desc("<Search Root Directory>"));
-
-static cl::OptionCategory ReplacementCategory("Replacement Options");
-static cl::OptionCategory FormattingCategory("Formatting Options");
-
-const cl::OptionCategory *VisibleCategories[] = {&ReplacementCategory,
-                                                 &FormattingCategory};
-
-static cl::opt<bool> RemoveTUReplacementFiles(
-    "remove-change-desc-files",
-    cl::desc("Remove the change description files regardless of successful\n"
-             "merging/replacing."),
-    cl::init(false), cl::cat(ReplacementCategory));
-
-static cl::opt<bool> DoFormat(
-    "format",
-    cl::desc("Enable formatting of code changed by applying replacements.\n"
-             "Use -style to choose formatting style.\n"),
-    cl::cat(FormattingCategory));
-
-// FIXME: Consider making the default behaviour for finding a style
-// configuration file to start the search anew for every file being changed to
-// handle situations where the style is different for different parts of a
-// project.
-
-static cl::opt<std::string> FormatStyleConfig(
-    "style-config",
-    cl::desc("Path to a directory containing a .clang-format file\n"
-             "describing a formatting style to use for formatting\n"
-             "code when -style=file.\n"),
-    cl::init(""), cl::cat(FormattingCategory));
-
-static cl::opt<std::string>
-    FormatStyleOpt("style", cl::desc(format::StyleOptionHelpDescription),
-                   cl::init("LLVM"), cl::cat(FormattingCategory));
-
-namespace {
-// Helper object to remove the TUReplacement and TUDiagnostic (triggered by
-// "remove-change-desc-files" command line option) when exiting current scope.
-class ScopedFileRemover {
-public:
-  ScopedFileRemover(const TUReplacementFiles &Files,
-                    clang::DiagnosticsEngine &Diagnostics)
-      : TURFiles(Files), Diag(Diagnostics) {}
-
-  ~ScopedFileRemover() { deleteReplacementFiles(TURFiles, Diag); }
-
-private:
-  const TUReplacementFiles &TURFiles;
-  clang::DiagnosticsEngine &Diag;
-};
-} // namespace
-
-static void printVersion(raw_ostream &OS) {
-  OS << "clang-apply-replacements version " CLANG_VERSION_STRING << "\n";
-}
-
-int main(int argc, char **argv) {
-  cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories));
-
-  cl::SetVersionPrinter(printVersion);
-  cl::ParseCommandLineOptions(argc, argv);
-
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
-  DiagnosticsEngine Diagnostics(
-      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), DiagOpts.get());
-
-  // Determine a formatting style from options.
-  auto FormatStyleOrError = format::getStyle(FormatStyleOpt, FormatStyleConfig,
-                                             format::DefaultFallbackStyle);
-  if (!FormatStyleOrError) {
-    llvm::errs() << llvm::toString(FormatStyleOrError.takeError()) << "\n";
-    return 1;
-  }
-  format::FormatStyle FormatStyle = std::move(*FormatStyleOrError);
-
-  TUReplacements TURs;
-  TUReplacementFiles TUFiles;
-
-  std::error_code ErrorCode =
-      collectReplacementsFromDirectory(Directory, TURs, TUFiles, Diagnostics);
-
-  TUDiagnostics TUDs;
-  TUFiles.clear();
-  ErrorCode =
-      collectReplacementsFromDirectory(Directory, TUDs, TUFiles, Diagnostics);
-
-  if (ErrorCode) {
-    errs() << "Trouble iterating over directory '" << Directory
-           << "': " << ErrorCode.message() << "\n";
-    return 1;
-  }
-
-  // Remove the TUReplacementFiles (triggered by "remove-change-desc-files"
-  // command line option) when exiting main().
-  std::unique_ptr<ScopedFileRemover> Remover;
-  if (RemoveTUReplacementFiles)
-    Remover.reset(new ScopedFileRemover(TUFiles, Diagnostics));
-
-  FileManager Files((FileSystemOptions()));
-  SourceManager SM(Diagnostics, Files);
-
-  FileToChangesMap Changes;
-  if (!mergeAndDeduplicate(TURs, TUDs, Changes, SM))
-    return 1;
-
-  tooling::ApplyChangesSpec Spec;
-  Spec.Cleanup = true;
-  Spec.Style = FormatStyle;
-  Spec.Format = DoFormat ? tooling::ApplyChangesSpec::kAll
-                         : tooling::ApplyChangesSpec::kNone;
-
-  for (const auto &FileChange : Changes) {
-    const FileEntry *Entry = FileChange.first;
-    StringRef FileName = Entry->getName();
-    llvm::Expected<std::string> NewFileData =
-        applyChanges(FileName, FileChange.second, Spec, Diagnostics);
-    if (!NewFileData) {
-      errs() << llvm::toString(NewFileData.takeError()) << "\n";
-      continue;
-    }
-
-    // Write new file to disk
-    std::error_code EC;
-    llvm::raw_fd_ostream FileStream(FileName, EC, llvm::sys::fs::F_None);
-    if (EC) {
-      llvm::errs() << "Could not open " << FileName << " for writing\n";
-      continue;
-    }
-    FileStream << *NewFileData;
-  }
-
-  return 0;
-}

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

@@ -1,730 +0,0 @@
-//===--  BitcodeReader.cpp - ClangDoc Bitcode Reader ------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "BitcodeReader.h"
-#include "llvm/ADT/IndexedMap.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace clang {
-namespace doc {
-
-using Record = llvm::SmallVector<uint64_t, 1024>;
-
-llvm::Error decodeRecord(Record R, llvm::SmallVectorImpl<char> &Field,
-                         llvm::StringRef Blob) {
-  Field.assign(Blob.begin(), Blob.end());
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, SymbolID &Field, llvm::StringRef Blob) {
-  if (R[0] != BitCodeConstants::USRHashSize)
-    return llvm::make_error<llvm::StringError>("Incorrect USR size.\n",
-                                               llvm::inconvertibleErrorCode());
-
-  // First position in the record is the length of the following array, so we
-  // copy the following elements to the field.
-  for (int I = 0, E = R[0]; I < E; ++I)
-    Field[I] = R[I + 1];
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, bool &Field, llvm::StringRef Blob) {
-  Field = R[0] != 0;
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, int &Field, llvm::StringRef Blob) {
-  if (R[0] > INT_MAX)
-    return llvm::make_error<llvm::StringError>("Integer too large to parse.\n",
-                                               llvm::inconvertibleErrorCode());
-  Field = (int)R[0];
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, AccessSpecifier &Field,
-                         llvm::StringRef Blob) {
-  switch (R[0]) {
-  case AS_public:
-  case AS_private:
-  case AS_protected:
-  case AS_none:
-    Field = (AccessSpecifier)R[0];
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid value for AccessSpecifier.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error decodeRecord(Record R, TagTypeKind &Field, llvm::StringRef Blob) {
-  switch (R[0]) {
-  case TTK_Struct:
-  case TTK_Interface:
-  case TTK_Union:
-  case TTK_Class:
-  case TTK_Enum:
-    Field = (TagTypeKind)R[0];
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid value for TagTypeKind.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error decodeRecord(Record R, llvm::Optional<Location> &Field,
-                         llvm::StringRef Blob) {
-  if (R[0] > INT_MAX)
-    return llvm::make_error<llvm::StringError>("Integer too large to parse.\n",
-                                               llvm::inconvertibleErrorCode());
-  Field.emplace((int)R[0], Blob);
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, InfoType &Field, llvm::StringRef Blob) {
-  switch (auto IT = static_cast<InfoType>(R[0])) {
-  case InfoType::IT_namespace:
-  case InfoType::IT_record:
-  case InfoType::IT_function:
-  case InfoType::IT_default:
-  case InfoType::IT_enum:
-    Field = IT;
-    return llvm::Error::success();
-  }
-  return llvm::make_error<llvm::StringError>("Invalid value for InfoType.\n",
-                                             llvm::inconvertibleErrorCode());
-}
-
-llvm::Error decodeRecord(Record R, FieldId &Field, llvm::StringRef Blob) {
-  switch (auto F = static_cast<FieldId>(R[0])) {
-  case FieldId::F_namespace:
-  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 llvm::Error::success();
-  }
-  return llvm::make_error<llvm::StringError>("Invalid value for FieldId.\n",
-                                             llvm::inconvertibleErrorCode());
-}
-
-llvm::Error decodeRecord(Record R,
-                         llvm::SmallVectorImpl<llvm::SmallString<16>> &Field,
-                         llvm::StringRef Blob) {
-  Field.push_back(Blob);
-  return llvm::Error::success();
-}
-
-llvm::Error decodeRecord(Record R, llvm::SmallVectorImpl<Location> &Field,
-                         llvm::StringRef Blob) {
-  if (R[0] > INT_MAX)
-    return llvm::make_error<llvm::StringError>("Integer too large to parse.\n",
-                                               llvm::inconvertibleErrorCode());
-  Field.emplace_back((int)R[0], Blob);
-  return llvm::Error::success();
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        const unsigned VersionNo) {
-  if (ID == VERSION && R[0] == VersionNo)
-    return llvm::Error::success();
-  return llvm::make_error<llvm::StringError>(
-      "Mismatched bitcode version number.\n", llvm::inconvertibleErrorCode());
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        NamespaceInfo *I) {
-  switch (ID) {
-  case NAMESPACE_USR:
-    return decodeRecord(R, I->USR, Blob);
-  case NAMESPACE_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid field for NamespaceInfo.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        RecordInfo *I) {
-  switch (ID) {
-  case RECORD_USR:
-    return decodeRecord(R, I->USR, Blob);
-  case RECORD_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case RECORD_DEFLOCATION:
-    return decodeRecord(R, I->DefLoc, Blob);
-  case RECORD_LOCATION:
-    return decodeRecord(R, I->Loc, Blob);
-  case RECORD_TAG_TYPE:
-    return decodeRecord(R, I->TagType, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid field for RecordInfo.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        EnumInfo *I) {
-  switch (ID) {
-  case ENUM_USR:
-    return decodeRecord(R, I->USR, Blob);
-  case ENUM_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case ENUM_DEFLOCATION:
-    return decodeRecord(R, I->DefLoc, Blob);
-  case ENUM_LOCATION:
-    return decodeRecord(R, I->Loc, Blob);
-  case ENUM_MEMBER:
-    return decodeRecord(R, I->Members, Blob);
-  case ENUM_SCOPED:
-    return decodeRecord(R, I->Scoped, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>("Invalid field for EnumInfo.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        FunctionInfo *I) {
-  switch (ID) {
-  case FUNCTION_USR:
-    return decodeRecord(R, I->USR, Blob);
-  case FUNCTION_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case FUNCTION_DEFLOCATION:
-    return decodeRecord(R, I->DefLoc, Blob);
-  case FUNCTION_LOCATION:
-    return decodeRecord(R, I->Loc, Blob);
-  case FUNCTION_ACCESS:
-    return decodeRecord(R, I->Access, Blob);
-  case FUNCTION_IS_METHOD:
-    return decodeRecord(R, I->IsMethod, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid field for FunctionInfo.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        TypeInfo *I) {
-  return llvm::Error::success();
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        FieldTypeInfo *I) {
-  switch (ID) {
-  case FIELD_TYPE_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>("Invalid field for TypeInfo.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        MemberTypeInfo *I) {
-  switch (ID) {
-  case MEMBER_TYPE_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case MEMBER_TYPE_ACCESS:
-    return decodeRecord(R, I->Access, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid field for MemberTypeInfo.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        CommentInfo *I) {
-  switch (ID) {
-  case COMMENT_KIND:
-    return decodeRecord(R, I->Kind, Blob);
-  case COMMENT_TEXT:
-    return decodeRecord(R, I->Text, Blob);
-  case COMMENT_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case COMMENT_DIRECTION:
-    return decodeRecord(R, I->Direction, Blob);
-  case COMMENT_PARAMNAME:
-    return decodeRecord(R, I->ParamName, Blob);
-  case COMMENT_CLOSENAME:
-    return decodeRecord(R, I->CloseName, Blob);
-  case COMMENT_ATTRKEY:
-    return decodeRecord(R, I->AttrKeys, Blob);
-  case COMMENT_ATTRVAL:
-    return decodeRecord(R, I->AttrValues, Blob);
-  case COMMENT_ARG:
-    return decodeRecord(R, I->Args, Blob);
-  case COMMENT_SELFCLOSING:
-    return decodeRecord(R, I->SelfClosing, Blob);
-  case COMMENT_EXPLICIT:
-    return decodeRecord(R, I->Explicit, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid field for CommentInfo.\n", llvm::inconvertibleErrorCode());
-  }
-}
-
-llvm::Error parseRecord(Record R, unsigned ID, llvm::StringRef Blob,
-                        Reference *I, FieldId &F) {
-  switch (ID) {
-  case REFERENCE_USR:
-    return decodeRecord(R, I->USR, Blob);
-  case REFERENCE_NAME:
-    return decodeRecord(R, I->Name, Blob);
-  case REFERENCE_TYPE:
-    return decodeRecord(R, I->RefType, Blob);
-  case REFERENCE_FIELD:
-    return decodeRecord(R, F, Blob);
-  default:
-    return llvm::make_error<llvm::StringError>("Invalid field for Reference.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-template <typename T> llvm::Expected<CommentInfo *> getCommentInfo(T I) {
-  return llvm::make_error<llvm::StringError>(
-      "Invalid type cannot contain CommentInfo.\n",
-      llvm::inconvertibleErrorCode());
-}
-
-template <> llvm::Expected<CommentInfo *> getCommentInfo(FunctionInfo *I) {
-  I->Description.emplace_back();
-  return &I->Description.back();
-}
-
-template <> llvm::Expected<CommentInfo *> getCommentInfo(NamespaceInfo *I) {
-  I->Description.emplace_back();
-  return &I->Description.back();
-}
-
-template <> llvm::Expected<CommentInfo *> getCommentInfo(RecordInfo *I) {
-  I->Description.emplace_back();
-  return &I->Description.back();
-}
-
-template <> llvm::Expected<CommentInfo *> getCommentInfo(EnumInfo *I) {
-  I->Description.emplace_back();
-  return &I->Description.back();
-}
-
-template <> llvm::Expected<CommentInfo *> getCommentInfo(CommentInfo *I) {
-  I->Children.emplace_back(llvm::make_unique<CommentInfo>());
-  return I->Children.back().get();
-}
-
-template <>
-llvm::Expected<CommentInfo *> getCommentInfo(std::unique_ptr<CommentInfo> &I) {
-  return getCommentInfo(I.get());
-}
-
-template <typename T, typename TTypeInfo>
-llvm::Error addTypeInfo(T I, TTypeInfo &&TI) {
-  return llvm::make_error<llvm::StringError>(
-      "Invalid type cannot contain TypeInfo.\n",
-      llvm::inconvertibleErrorCode());
-}
-
-template <> llvm::Error addTypeInfo(RecordInfo *I, MemberTypeInfo &&T) {
-  I->Members.emplace_back(std::move(T));
-  return llvm::Error::success();
-}
-
-template <> llvm::Error addTypeInfo(FunctionInfo *I, TypeInfo &&T) {
-  I->ReturnType = std::move(T);
-  return llvm::Error::success();
-}
-
-template <> llvm::Error addTypeInfo(FunctionInfo *I, FieldTypeInfo &&T) {
-  I->Params.emplace_back(std::move(T));
-  return llvm::Error::success();
-}
-
-template <typename T> llvm::Error addReference(T I, Reference &&R, FieldId F) {
-  return llvm::make_error<llvm::StringError>(
-      "Invalid type cannot contain Reference\n",
-      llvm::inconvertibleErrorCode());
-}
-
-template <> llvm::Error addReference(TypeInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_type:
-    I->Type = std::move(R);
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <>
-llvm::Error addReference(FieldTypeInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_type:
-    I->Type = std::move(R);
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <>
-llvm::Error addReference(MemberTypeInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_type:
-    I->Type = std::move(R);
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <> llvm::Error addReference(EnumInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_namespace:
-    I->Namespace.emplace_back(std::move(R));
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <>
-llvm::Error addReference(NamespaceInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_namespace:
-    I->Namespace.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_child_namespace:
-    I->ChildNamespaces.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_child_record:
-    I->ChildRecords.emplace_back(std::move(R));
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <>
-llvm::Error addReference(FunctionInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_namespace:
-    I->Namespace.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_parent:
-    I->Parent = std::move(R);
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-template <> llvm::Error addReference(RecordInfo *I, Reference &&R, FieldId F) {
-  switch (F) {
-  case FieldId::F_namespace:
-    I->Namespace.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_parent:
-    I->Parents.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_vparent:
-    I->VirtualParents.emplace_back(std::move(R));
-    return llvm::Error::success();
-  case FieldId::F_child_record:
-    I->ChildRecords.emplace_back(std::move(R));
-    return llvm::Error::success();
-  default:
-    return llvm::make_error<llvm::StringError>(
-        "Invalid type cannot contain Reference.\n",
-        llvm::inconvertibleErrorCode());
-  }
-}
-
-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>
-llvm::Error ClangDocBitcodeReader::readRecord(unsigned ID, T I) {
-  Record R;
-  llvm::StringRef Blob;
-  unsigned RecID = Stream.readRecord(ID, R, &Blob);
-  return parseRecord(R, RecID, Blob, I);
-}
-
-template <>
-llvm::Error ClangDocBitcodeReader::readRecord(unsigned ID, Reference *I) {
-  Record R;
-  llvm::StringRef Blob;
-  unsigned RecID = Stream.readRecord(ID, R, &Blob);
-  return parseRecord(R, RecID, Blob, I, CurrentReferenceField);
-}
-
-// Read a block of records into a single info.
-template <typename T>
-llvm::Error ClangDocBitcodeReader::readBlock(unsigned ID, T I) {
-  if (Stream.EnterSubBlock(ID))
-    return llvm::make_error<llvm::StringError>("Unable to enter subblock.\n",
-                                               llvm::inconvertibleErrorCode());
-
-  while (true) {
-    unsigned BlockOrCode = 0;
-    Cursor Res = skipUntilRecordOrBlock(BlockOrCode);
-
-    switch (Res) {
-    case Cursor::BadBlock:
-      return llvm::make_error<llvm::StringError>(
-          "Bad block found.\n", llvm::inconvertibleErrorCode());
-    case Cursor::BlockEnd:
-      return llvm::Error::success();
-    case Cursor::BlockBegin:
-      if (auto Err = readSubBlock(BlockOrCode, I)) {
-        if (!Stream.SkipBlock())
-          continue;
-        return Err;
-      }
-      continue;
-    case Cursor::Record:
-      break;
-    }
-    if (auto Err = readRecord(BlockOrCode, I))
-      return Err;
-  }
-}
-
-template <typename T>
-llvm::Error ClangDocBitcodeReader::readSubBlock(unsigned ID, T I) {
-  switch (ID) {
-  // Blocks can only have Comment, Reference, TypeInfo, FunctionInfo, or
-  // EnumInfo subblocks
-  case BI_COMMENT_BLOCK_ID: {
-    auto Comment = getCommentInfo(I);
-    if (!Comment)
-      return Comment.takeError();
-    if (auto Err = readBlock(ID, Comment.get()))
-      return Err;
-    return llvm::Error::success();
-  }
-  case BI_TYPE_BLOCK_ID: {
-    TypeInfo TI;
-    if (auto Err = readBlock(ID, &TI))
-      return Err;
-    if (auto Err = addTypeInfo(I, std::move(TI)))
-      return Err;
-    return llvm::Error::success();
-  }
-  case BI_FIELD_TYPE_BLOCK_ID: {
-    FieldTypeInfo TI;
-    if (auto Err = readBlock(ID, &TI))
-      return Err;
-    if (auto Err = addTypeInfo(I, std::move(TI)))
-      return Err;
-    return llvm::Error::success();
-  }
-  case BI_MEMBER_TYPE_BLOCK_ID: {
-    MemberTypeInfo TI;
-    if (auto Err = readBlock(ID, &TI))
-      return Err;
-    if (auto Err = addTypeInfo(I, std::move(TI)))
-      return Err;
-    return llvm::Error::success();
-  }
-  case BI_REFERENCE_BLOCK_ID: {
-    Reference R;
-    if (auto Err = readBlock(ID, &R))
-      return Err;
-    if (auto Err = addReference(I, std::move(R), CurrentReferenceField))
-      return Err;
-    return llvm::Error::success();
-  }
-  case BI_FUNCTION_BLOCK_ID: {
-    FunctionInfo F;
-    if (auto Err = readBlock(ID, &F))
-      return Err;
-    addChild(I, std::move(F));
-    return llvm::Error::success();
-  }
-  case BI_ENUM_BLOCK_ID: {
-    EnumInfo E;
-    if (auto Err = readBlock(ID, &E))
-      return Err;
-    addChild(I, std::move(E));
-    return llvm::Error::success();
-  }
-  default:
-    return llvm::make_error<llvm::StringError>("Invalid subblock type.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-ClangDocBitcodeReader::Cursor
-ClangDocBitcodeReader::skipUntilRecordOrBlock(unsigned &BlockOrRecordID) {
-  BlockOrRecordID = 0;
-
-  while (!Stream.AtEndOfStream()) {
-    unsigned Code = Stream.ReadCode();
-
-    switch ((llvm::bitc::FixedAbbrevIDs)Code) {
-    case llvm::bitc::ENTER_SUBBLOCK:
-      BlockOrRecordID = Stream.ReadSubBlockID();
-      return Cursor::BlockBegin;
-    case llvm::bitc::END_BLOCK:
-      if (Stream.ReadBlockEnd())
-        return Cursor::BadBlock;
-      return Cursor::BlockEnd;
-    case llvm::bitc::DEFINE_ABBREV:
-      Stream.ReadAbbrevRecord();
-      continue;
-    case llvm::bitc::UNABBREV_RECORD:
-      return Cursor::BadBlock;
-    default:
-      BlockOrRecordID = Code;
-      return Cursor::Record;
-    }
-  }
-  llvm_unreachable("Premature stream end.");
-}
-
-llvm::Error ClangDocBitcodeReader::validateStream() {
-  if (Stream.AtEndOfStream())
-    return llvm::make_error<llvm::StringError>("Premature end of stream.\n",
-                                               llvm::inconvertibleErrorCode());
-
-  // Sniff for the signature.
-  if (Stream.Read(8) != BitCodeConstants::Signature[0] ||
-      Stream.Read(8) != BitCodeConstants::Signature[1] ||
-      Stream.Read(8) != BitCodeConstants::Signature[2] ||
-      Stream.Read(8) != BitCodeConstants::Signature[3])
-    return llvm::make_error<llvm::StringError>("Invalid bitcode signature.\n",
-                                               llvm::inconvertibleErrorCode());
-  return llvm::Error::success();
-}
-
-llvm::Error ClangDocBitcodeReader::readBlockInfoBlock() {
-  BlockInfo = Stream.ReadBlockInfoBlock();
-  if (!BlockInfo)
-    return llvm::make_error<llvm::StringError>(
-        "Unable to parse BlockInfoBlock.\n", llvm::inconvertibleErrorCode());
-  Stream.setBlockInfo(&*BlockInfo);
-  return llvm::Error::success();
-}
-
-template <typename T>
-llvm::Expected<std::unique_ptr<Info>>
-ClangDocBitcodeReader::createInfo(unsigned ID) {
-  std::unique_ptr<Info> I = llvm::make_unique<T>();
-  if (auto Err = readBlock(ID, static_cast<T *>(I.get())))
-    return std::move(Err);
-  return std::unique_ptr<Info>{std::move(I)};;
-}
-
-llvm::Expected<std::unique_ptr<Info>>
-ClangDocBitcodeReader::readBlockToInfo(unsigned ID) {
-  switch (ID) {
-  case BI_NAMESPACE_BLOCK_ID:
-    return createInfo<NamespaceInfo>(ID);
-  case BI_RECORD_BLOCK_ID:
-    return createInfo<RecordInfo>(ID);
-  case BI_ENUM_BLOCK_ID:
-    return createInfo<EnumInfo>(ID);
-  case BI_FUNCTION_BLOCK_ID:
-    return createInfo<FunctionInfo>(ID);
-  default:
-    return llvm::make_error<llvm::StringError>("Cannot create info.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-// Entry point
-llvm::Expected<std::vector<std::unique_ptr<Info>>>
-ClangDocBitcodeReader::readBitcode() {
-  std::vector<std::unique_ptr<Info>> Infos;
-  if (auto Err = validateStream())
-    return std::move(Err);
-
-  // Read the top level blocks.
-  while (!Stream.AtEndOfStream()) {
-    unsigned Code = Stream.ReadCode();
-    if (Code != llvm::bitc::ENTER_SUBBLOCK)
-      return llvm::make_error<llvm::StringError>(
-          "No blocks in input.\n", llvm::inconvertibleErrorCode());
-    unsigned ID = Stream.ReadSubBlockID();
-    switch (ID) {
-    // NamedType and Comment blocks should not appear at the top level
-    case BI_TYPE_BLOCK_ID:
-    case BI_FIELD_TYPE_BLOCK_ID:
-    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.\n", llvm::inconvertibleErrorCode());
-    case BI_NAMESPACE_BLOCK_ID:
-    case BI_RECORD_BLOCK_ID:
-    case BI_ENUM_BLOCK_ID:
-    case BI_FUNCTION_BLOCK_ID: {
-      auto InfoOrErr = readBlockToInfo(ID);
-      if (!InfoOrErr)
-        return InfoOrErr.takeError();
-      Infos.emplace_back(std::move(InfoOrErr.get()));
-      continue;
-    }
-    case BI_VERSION_BLOCK_ID:
-      if (auto Err = readBlock(ID, VersionNumber))
-        return std::move(Err);
-      continue;
-    case llvm::bitc::BLOCKINFO_BLOCK_ID:
-      if (auto Err = readBlockInfoBlock())
-        return std::move(Err);
-      continue;
-    default:
-      if (!Stream.SkipBlock())
-        continue;
-    }
-  }
-  return std::move(Infos);
-}
-
-} // namespace doc
-} // namespace clang

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

@@ -1,76 +0,0 @@
-//===--  BitcodeReader.h - ClangDoc Bitcode Reader --------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a reader for parsing the clang-doc internal
-// representation from LLVM bitcode. The reader takes in a stream of bits and
-// generates the set of infos that it represents.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEREADER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEREADER_H
-
-#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"
-#include "llvm/Support/Error.h"
-
-namespace clang {
-namespace doc {
-
-// Class to read bitstream into an InfoSet collection
-class ClangDocBitcodeReader {
-public:
-  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();
-
-private:
-  enum class Cursor { BadBlock = 1, Record, BlockEnd, BlockBegin };
-
-  // Top level parsing
-  llvm::Error validateStream();
-  llvm::Error readVersion();
-  llvm::Error readBlockInfoBlock();
-
-  // Read a block of records into a single Info struct, calls readRecord on each
-  // record found.
-  template <typename T> llvm::Error readBlock(unsigned ID, T I);
-
-  // Step through a block of records to find the next data field.
-  template <typename T> llvm::Error readSubBlock(unsigned ID, T I);
-
-  // Read record data into the given Info data field, calling the appropriate
-  // parseRecord functions to parse and store the data.
-  template <typename T> llvm::Error readRecord(unsigned ID, T I);
-
-  // Allocate the relevant type of info and add read data to the object.
-  template <typename T>
-  llvm::Expected<std::unique_ptr<Info>> createInfo(unsigned ID);
-
-  // Helper function to step through blocks to find and dispatch the next record
-  // or block to be read.
-  Cursor skipUntilRecordOrBlock(unsigned &BlockOrRecordID);
-
-  // Helper function to set up the approriate type of Info.
-  llvm::Expected<std::unique_ptr<Info>> readBlockToInfo(unsigned ID);
-
-  llvm::BitstreamCursor &Stream;
-  Optional<llvm::BitstreamBlockInfo> BlockInfo;
-  FieldId CurrentReferenceField;
-};
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEREADER_H

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

@@ -1,530 +0,0 @@
-//===--  BitcodeWriter.cpp - ClangDoc Bitcode Writer ------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "BitcodeWriter.h"
-#include "llvm/ADT/IndexedMap.h"
-#include <initializer_list>
-
-namespace clang {
-namespace doc {
-
-// Empty SymbolID for comparison, so we don't have to construct one every time.
-static const SymbolID EmptySID = SymbolID();
-
-// Since id enums are not zero-indexed, we need to transform the given id into
-// its associated index.
-struct BlockIdToIndexFunctor {
-  using argument_type = unsigned;
-  unsigned operator()(unsigned ID) const { return ID - BI_FIRST; }
-};
-
-struct RecordIdToIndexFunctor {
-  using argument_type = unsigned;
-  unsigned operator()(unsigned ID) const { return ID - RI_FIRST; }
-};
-
-using AbbrevDsc = void (*)(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev);
-
-static void AbbrevGen(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev,
-                      const std::initializer_list<llvm::BitCodeAbbrevOp> Ops) {
-  for (const auto &Op : Ops)
-    Abbrev->Add(Op);
-}
-
-static void BoolAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev) {
-  AbbrevGen(Abbrev,
-            {// 0. Boolean
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                                   BitCodeConstants::BoolSize)});
-}
-
-static void IntAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev) {
-  AbbrevGen(Abbrev,
-            {// 0. Fixed-size integer
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                                   BitCodeConstants::IntSize)});
-}
-
-static void SymbolIDAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev) {
-  AbbrevGen(Abbrev,
-            {// 0. Fixed-size integer (length of the sha1'd USR)
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                                   BitCodeConstants::USRLengthSize),
-             // 1. Fixed-size array of Char6 (USR)
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Array),
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                                   BitCodeConstants::USRBitLengthSize)});
-}
-
-static void StringAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev) {
-  AbbrevGen(Abbrev,
-            {// 0. Fixed-size integer (length of the following string)
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                                   BitCodeConstants::StringLengthSize),
-             // 1. The string blob
-             llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Blob)});
-}
-
-// Assumes that the file will not have more than 65535 lines.
-static void LocationAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> &Abbrev) {
-  AbbrevGen(
-      Abbrev,
-      {// 0. Fixed-size integer (line number)
-       llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                             BitCodeConstants::LineNumberSize),
-       // 1. Fixed-size integer (length of the following string (filename))
-       llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Fixed,
-                             BitCodeConstants::StringLengthSize),
-       // 2. The string blob
-       llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Blob)});
-}
-
-struct RecordIdDsc {
-  llvm::StringRef Name;
-  AbbrevDsc Abbrev = nullptr;
-
-  RecordIdDsc() = default;
-  RecordIdDsc(llvm::StringRef Name, AbbrevDsc Abbrev)
-      : Name(Name), Abbrev(Abbrev) {}
-
-  // Is this 'description' valid?
-  operator bool() const {
-    return Abbrev != nullptr && Name.data() != nullptr && !Name.empty();
-  }
-};
-
-static const llvm::IndexedMap<llvm::StringRef, BlockIdToIndexFunctor>
-    BlockIdNameMap = []() {
-      llvm::IndexedMap<llvm::StringRef, BlockIdToIndexFunctor> BlockIdNameMap;
-      BlockIdNameMap.resize(BlockIdCount);
-
-      // There is no init-list constructor for the IndexedMap, so have to
-      // improvise
-      static const std::vector<std::pair<BlockId, const char *const>> Inits = {
-          {BI_VERSION_BLOCK_ID, "VersionBlock"},
-          {BI_NAMESPACE_BLOCK_ID, "NamespaceBlock"},
-          {BI_ENUM_BLOCK_ID, "EnumBlock"},
-          {BI_TYPE_BLOCK_ID, "TypeBlock"},
-          {BI_FIELD_TYPE_BLOCK_ID, "FieldTypeBlock"},
-          {BI_MEMBER_TYPE_BLOCK_ID, "MemberTypeBlock"},
-          {BI_RECORD_BLOCK_ID, "RecordBlock"},
-          {BI_FUNCTION_BLOCK_ID, "FunctionBlock"},
-          {BI_COMMENT_BLOCK_ID, "CommentBlock"},
-          {BI_REFERENCE_BLOCK_ID, "ReferenceBlock"}};
-      assert(Inits.size() == BlockIdCount);
-      for (const auto &Init : Inits)
-        BlockIdNameMap[Init.first] = Init.second;
-      assert(BlockIdNameMap.size() == BlockIdCount);
-      return BlockIdNameMap;
-    }();
-
-static const llvm::IndexedMap<RecordIdDsc, RecordIdToIndexFunctor>
-    RecordIdNameMap = []() {
-      llvm::IndexedMap<RecordIdDsc, RecordIdToIndexFunctor> RecordIdNameMap;
-      RecordIdNameMap.resize(RecordIdCount);
-
-      // There is no init-list constructor for the IndexedMap, so have to
-      // improvise
-      static const std::vector<std::pair<RecordId, RecordIdDsc>> Inits = {
-          {VERSION, {"Version", &IntAbbrev}},
-          {COMMENT_KIND, {"Kind", &StringAbbrev}},
-          {COMMENT_TEXT, {"Text", &StringAbbrev}},
-          {COMMENT_NAME, {"Name", &StringAbbrev}},
-          {COMMENT_DIRECTION, {"Direction", &StringAbbrev}},
-          {COMMENT_PARAMNAME, {"ParamName", &StringAbbrev}},
-          {COMMENT_CLOSENAME, {"CloseName", &StringAbbrev}},
-          {COMMENT_SELFCLOSING, {"SelfClosing", &BoolAbbrev}},
-          {COMMENT_EXPLICIT, {"Explicit", &BoolAbbrev}},
-          {COMMENT_ATTRKEY, {"AttrKey", &StringAbbrev}},
-          {COMMENT_ATTRVAL, {"AttrVal", &StringAbbrev}},
-          {COMMENT_ARG, {"Arg", &StringAbbrev}},
-          {FIELD_TYPE_NAME, {"Name", &StringAbbrev}},
-          {MEMBER_TYPE_NAME, {"Name", &StringAbbrev}},
-          {MEMBER_TYPE_ACCESS, {"Access", &IntAbbrev}},
-          {NAMESPACE_USR, {"USR", &SymbolIDAbbrev}},
-          {NAMESPACE_NAME, {"Name", &StringAbbrev}},
-          {ENUM_USR, {"USR", &SymbolIDAbbrev}},
-          {ENUM_NAME, {"Name", &StringAbbrev}},
-          {ENUM_DEFLOCATION, {"DefLocation", &LocationAbbrev}},
-          {ENUM_LOCATION, {"Location", &LocationAbbrev}},
-          {ENUM_MEMBER, {"Member", &StringAbbrev}},
-          {ENUM_SCOPED, {"Scoped", &BoolAbbrev}},
-          {RECORD_USR, {"USR", &SymbolIDAbbrev}},
-          {RECORD_NAME, {"Name", &StringAbbrev}},
-          {RECORD_DEFLOCATION, {"DefLocation", &LocationAbbrev}},
-          {RECORD_LOCATION, {"Location", &LocationAbbrev}},
-          {RECORD_TAG_TYPE, {"TagType", &IntAbbrev}},
-          {FUNCTION_USR, {"USR", &SymbolIDAbbrev}},
-          {FUNCTION_NAME, {"Name", &StringAbbrev}},
-          {FUNCTION_DEFLOCATION, {"DefLocation", &LocationAbbrev}},
-          {FUNCTION_LOCATION, {"Location", &LocationAbbrev}},
-          {FUNCTION_ACCESS, {"Access", &IntAbbrev}},
-          {FUNCTION_IS_METHOD, {"IsMethod", &BoolAbbrev}},
-          {REFERENCE_USR, {"USR", &SymbolIDAbbrev}},
-          {REFERENCE_NAME, {"Name", &StringAbbrev}},
-          {REFERENCE_TYPE, {"RefType", &IntAbbrev}},
-          {REFERENCE_FIELD, {"Field", &IntAbbrev}}};
-      assert(Inits.size() == RecordIdCount);
-      for (const auto &Init : Inits) {
-        RecordIdNameMap[Init.first] = Init.second;
-        assert((Init.second.Name.size() + 1) <= BitCodeConstants::RecordSize);
-      }
-      assert(RecordIdNameMap.size() == RecordIdCount);
-      return RecordIdNameMap;
-    }();
-
-static const std::vector<std::pair<BlockId, std::vector<RecordId>>>
-    RecordsByBlock{
-        // Version Block
-        {BI_VERSION_BLOCK_ID, {VERSION}},
-        // Comment Block
-        {BI_COMMENT_BLOCK_ID,
-         {COMMENT_KIND, COMMENT_TEXT, COMMENT_NAME, COMMENT_DIRECTION,
-          COMMENT_PARAMNAME, COMMENT_CLOSENAME, COMMENT_SELFCLOSING,
-          COMMENT_EXPLICIT, COMMENT_ATTRKEY, COMMENT_ATTRVAL, COMMENT_ARG}},
-        // Type Block
-        {BI_TYPE_BLOCK_ID, {}},
-        // FieldType Block
-        {BI_FIELD_TYPE_BLOCK_ID, {FIELD_TYPE_NAME}},
-        // MemberType Block
-        {BI_MEMBER_TYPE_BLOCK_ID, {MEMBER_TYPE_NAME, MEMBER_TYPE_ACCESS}},
-        // Enum Block
-        {BI_ENUM_BLOCK_ID,
-         {ENUM_USR, ENUM_NAME, ENUM_DEFLOCATION, ENUM_LOCATION, ENUM_MEMBER,
-          ENUM_SCOPED}},
-        // Namespace Block
-        {BI_NAMESPACE_BLOCK_ID, {NAMESPACE_USR, NAMESPACE_NAME}},
-        // Record Block
-        {BI_RECORD_BLOCK_ID,
-         {RECORD_USR, RECORD_NAME, RECORD_DEFLOCATION, RECORD_LOCATION,
-          RECORD_TAG_TYPE}},
-        // Function Block
-        {BI_FUNCTION_BLOCK_ID,
-         {FUNCTION_USR, FUNCTION_NAME, FUNCTION_DEFLOCATION, FUNCTION_LOCATION,
-          FUNCTION_ACCESS, FUNCTION_IS_METHOD}},
-        // Reference Block
-        {BI_REFERENCE_BLOCK_ID,
-         {REFERENCE_USR, REFERENCE_NAME, REFERENCE_TYPE, REFERENCE_FIELD}}};
-
-// AbbreviationMap
-
-constexpr char BitCodeConstants::Signature[];
-
-void ClangDocBitcodeWriter::AbbreviationMap::add(RecordId RID,
-                                                 unsigned AbbrevID) {
-  assert(RecordIdNameMap[RID] && "Unknown RecordId.");
-  assert(Abbrevs.find(RID) == Abbrevs.end() && "Abbreviation already added.");
-  Abbrevs[RID] = AbbrevID;
-}
-
-unsigned ClangDocBitcodeWriter::AbbreviationMap::get(RecordId RID) const {
-  assert(RecordIdNameMap[RID] && "Unknown RecordId.");
-  assert(Abbrevs.find(RID) != Abbrevs.end() && "Unknown abbreviation.");
-  return Abbrevs.lookup(RID);
-}
-
-// Validation and Overview Blocks
-
-/// \brief Emits the magic number header to check that its the right format,
-/// in this case, 'DOCS'.
-void ClangDocBitcodeWriter::emitHeader() {
-  for (char C : BitCodeConstants::Signature)
-    Stream.Emit((unsigned)C, BitCodeConstants::SignatureBitSize);
-}
-
-void ClangDocBitcodeWriter::emitVersionBlock() {
-  StreamSubBlockGuard Block(Stream, BI_VERSION_BLOCK_ID);
-  emitRecord(VersionNumber, VERSION);
-}
-
-/// \brief Emits a block ID and the block name to the BLOCKINFO block.
-void ClangDocBitcodeWriter::emitBlockID(BlockId BID) {
-  const auto &BlockIdName = BlockIdNameMap[BID];
-  assert(BlockIdName.data() && BlockIdName.size() && "Unknown BlockId.");
-
-  Record.clear();
-  Record.push_back(BID);
-  Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETBID, Record);
-  Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_BLOCKNAME,
-                    ArrayRef<unsigned char>(BlockIdName.bytes_begin(),
-                                            BlockIdName.bytes_end()));
-}
-
-/// \brief Emits a record name to the BLOCKINFO block.
-void ClangDocBitcodeWriter::emitRecordID(RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  prepRecordData(ID);
-  Record.append(RecordIdNameMap[ID].Name.begin(),
-                RecordIdNameMap[ID].Name.end());
-  Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETRECORDNAME, Record);
-}
-
-// Abbreviations
-
-void ClangDocBitcodeWriter::emitAbbrev(RecordId ID, BlockId Block) {
-  assert(RecordIdNameMap[ID] && "Unknown abbreviation.");
-  auto Abbrev = std::make_shared<llvm::BitCodeAbbrev>();
-  Abbrev->Add(llvm::BitCodeAbbrevOp(ID));
-  RecordIdNameMap[ID].Abbrev(Abbrev);
-  Abbrevs.add(ID, Stream.EmitBlockInfoAbbrev(Block, std::move(Abbrev)));
-}
-
-// Records
-
-void ClangDocBitcodeWriter::emitRecord(const SymbolID &Sym, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &SymbolIDAbbrev &&
-         "Abbrev type mismatch.");
-  if (!prepRecordData(ID, Sym != EmptySID))
-    return;
-  assert(Sym.size() == 20);
-  Record.push_back(Sym.size());
-  Record.append(Sym.begin(), Sym.end());
-  Stream.EmitRecordWithAbbrev(Abbrevs.get(ID), Record);
-}
-
-void ClangDocBitcodeWriter::emitRecord(llvm::StringRef Str, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &StringAbbrev &&
-         "Abbrev type mismatch.");
-  if (!prepRecordData(ID, !Str.empty()))
-    return;
-  assert(Str.size() < (1U << BitCodeConstants::StringLengthSize));
-  Record.push_back(Str.size());
-  Stream.EmitRecordWithBlob(Abbrevs.get(ID), Record, Str);
-}
-
-void ClangDocBitcodeWriter::emitRecord(const Location &Loc, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &LocationAbbrev &&
-         "Abbrev type mismatch.");
-  if (!prepRecordData(ID, true))
-    return;
-  // FIXME: Assert that the line number is of the appropriate size.
-  Record.push_back(Loc.LineNumber);
-  assert(Loc.Filename.size() < (1U << BitCodeConstants::StringLengthSize));
-  Record.push_back(Loc.Filename.size());
-  Stream.EmitRecordWithBlob(Abbrevs.get(ID), Record, Loc.Filename);
-}
-
-void ClangDocBitcodeWriter::emitRecord(bool Val, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &BoolAbbrev && "Abbrev type mismatch.");
-  if (!prepRecordData(ID, Val))
-    return;
-  Record.push_back(Val);
-  Stream.EmitRecordWithAbbrev(Abbrevs.get(ID), Record);
-}
-
-void ClangDocBitcodeWriter::emitRecord(int Val, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &IntAbbrev && "Abbrev type mismatch.");
-  if (!prepRecordData(ID, Val))
-    return;
-  // FIXME: Assert that the integer is of the appropriate size.
-  Record.push_back(Val);
-  Stream.EmitRecordWithAbbrev(Abbrevs.get(ID), Record);
-}
-
-void ClangDocBitcodeWriter::emitRecord(unsigned Val, RecordId ID) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  assert(RecordIdNameMap[ID].Abbrev == &IntAbbrev && "Abbrev type mismatch.");
-  if (!prepRecordData(ID, Val))
-    return;
-  assert(Val < (1U << BitCodeConstants::IntSize));
-  Record.push_back(Val);
-  Stream.EmitRecordWithAbbrev(Abbrevs.get(ID), Record);
-}
-
-bool ClangDocBitcodeWriter::prepRecordData(RecordId ID, bool ShouldEmit) {
-  assert(RecordIdNameMap[ID] && "Unknown RecordId.");
-  if (!ShouldEmit)
-    return false;
-  Record.clear();
-  Record.push_back(ID);
-  return true;
-}
-
-// BlockInfo Block
-
-void ClangDocBitcodeWriter::emitBlockInfoBlock() {
-  Stream.EnterBlockInfoBlock();
-  for (const auto &Block : RecordsByBlock) {
-    assert(Block.second.size() < (1U << BitCodeConstants::SubblockIDSize));
-    emitBlockInfo(Block.first, Block.second);
-  }
-  Stream.ExitBlock();
-}
-
-void ClangDocBitcodeWriter::emitBlockInfo(BlockId BID,
-                                          const std::vector<RecordId> &RIDs) {
-  assert(RIDs.size() < (1U << BitCodeConstants::SubblockIDSize));
-  emitBlockID(BID);
-  for (RecordId RID : RIDs) {
-    emitRecordID(RID);
-    emitAbbrev(RID, BID);
-  }
-}
-
-// Block emission
-
-void ClangDocBitcodeWriter::emitBlock(const Reference &R, FieldId Field) {
-  if (R.USR == EmptySID && R.Name.empty())
-    return;
-  StreamSubBlockGuard Block(Stream, BI_REFERENCE_BLOCK_ID);
-  emitRecord(R.USR, REFERENCE_USR);
-  emitRecord(R.Name, REFERENCE_NAME);
-  emitRecord((unsigned)R.RefType, REFERENCE_TYPE);
-  emitRecord((unsigned)Field, REFERENCE_FIELD);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const TypeInfo &T) {
-  StreamSubBlockGuard Block(Stream, BI_TYPE_BLOCK_ID);
-  emitBlock(T.Type, FieldId::F_type);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const FieldTypeInfo &T) {
-  StreamSubBlockGuard Block(Stream, BI_FIELD_TYPE_BLOCK_ID);
-  emitBlock(T.Type, FieldId::F_type);
-  emitRecord(T.Name, FIELD_TYPE_NAME);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const MemberTypeInfo &T) {
-  StreamSubBlockGuard Block(Stream, BI_MEMBER_TYPE_BLOCK_ID);
-  emitBlock(T.Type, FieldId::F_type);
-  emitRecord(T.Name, MEMBER_TYPE_NAME);
-  emitRecord(T.Access, MEMBER_TYPE_ACCESS);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const CommentInfo &I) {
-  StreamSubBlockGuard Block(Stream, BI_COMMENT_BLOCK_ID);
-  for (const auto &L : std::vector<std::pair<llvm::StringRef, RecordId>>{
-           {I.Kind, COMMENT_KIND},
-           {I.Text, COMMENT_TEXT},
-           {I.Name, COMMENT_NAME},
-           {I.Direction, COMMENT_DIRECTION},
-           {I.ParamName, COMMENT_PARAMNAME},
-           {I.CloseName, COMMENT_CLOSENAME}})
-    emitRecord(L.first, L.second);
-  emitRecord(I.SelfClosing, COMMENT_SELFCLOSING);
-  emitRecord(I.Explicit, COMMENT_EXPLICIT);
-  for (const auto &A : I.AttrKeys)
-    emitRecord(A, COMMENT_ATTRKEY);
-  for (const auto &A : I.AttrValues)
-    emitRecord(A, COMMENT_ATTRVAL);
-  for (const auto &A : I.Args)
-    emitRecord(A, COMMENT_ARG);
-  for (const auto &C : I.Children)
-    emitBlock(*C);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const NamespaceInfo &I) {
-  StreamSubBlockGuard Block(Stream, BI_NAMESPACE_BLOCK_ID);
-  emitRecord(I.USR, NAMESPACE_USR);
-  emitRecord(I.Name, NAMESPACE_NAME);
-  for (const auto &N : I.Namespace)
-    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) {
-  StreamSubBlockGuard Block(Stream, BI_ENUM_BLOCK_ID);
-  emitRecord(I.USR, ENUM_USR);
-  emitRecord(I.Name, ENUM_NAME);
-  for (const auto &N : I.Namespace)
-    emitBlock(N, FieldId::F_namespace);
-  for (const auto &CI : I.Description)
-    emitBlock(CI);
-  if (I.DefLoc)
-    emitRecord(I.DefLoc.getValue(), ENUM_DEFLOCATION);
-  for (const auto &L : I.Loc)
-    emitRecord(L, ENUM_LOCATION);
-  emitRecord(I.Scoped, ENUM_SCOPED);
-  for (const auto &N : I.Members)
-    emitRecord(N, ENUM_MEMBER);
-}
-
-void ClangDocBitcodeWriter::emitBlock(const RecordInfo &I) {
-  StreamSubBlockGuard Block(Stream, BI_RECORD_BLOCK_ID);
-  emitRecord(I.USR, RECORD_USR);
-  emitRecord(I.Name, RECORD_NAME);
-  for (const auto &N : I.Namespace)
-    emitBlock(N, FieldId::F_namespace);
-  for (const auto &CI : I.Description)
-    emitBlock(CI);
-  if (I.DefLoc)
-    emitRecord(I.DefLoc.getValue(), RECORD_DEFLOCATION);
-  for (const auto &L : I.Loc)
-    emitRecord(L, RECORD_LOCATION);
-  emitRecord(I.TagType, RECORD_TAG_TYPE);
-  for (const auto &N : I.Members)
-    emitBlock(N);
-  for (const auto &P : I.Parents)
-    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) {
-  StreamSubBlockGuard Block(Stream, BI_FUNCTION_BLOCK_ID);
-  emitRecord(I.USR, FUNCTION_USR);
-  emitRecord(I.Name, FUNCTION_NAME);
-  for (const auto &N : I.Namespace)
-    emitBlock(N, FieldId::F_namespace);
-  for (const auto &CI : I.Description)
-    emitBlock(CI);
-  emitRecord(I.IsMethod, FUNCTION_IS_METHOD);
-  if (I.DefLoc)
-    emitRecord(I.DefLoc.getValue(), FUNCTION_DEFLOCATION);
-  for (const auto &L : I.Loc)
-    emitRecord(L, FUNCTION_LOCATION);
-  emitBlock(I.Parent, FieldId::F_parent);
-  emitBlock(I.ReturnType);
-  for (const auto &N : I.Params)
-    emitBlock(N);
-}
-
-bool ClangDocBitcodeWriter::dispatchInfoForWrite(Info *I) {
-  switch (I->IT) {
-  case InfoType::IT_namespace:
-    emitBlock(*static_cast<clang::doc::NamespaceInfo *>(I));
-    break;
-  case InfoType::IT_record:
-    emitBlock(*static_cast<clang::doc::RecordInfo *>(I));
-    break;
-  case InfoType::IT_enum:
-    emitBlock(*static_cast<clang::doc::EnumInfo *>(I));
-    break;
-  case InfoType::IT_function:
-    emitBlock(*static_cast<clang::doc::FunctionInfo *>(I));
-    break;
-  default:
-    llvm::errs() << "Unexpected info, unable to write.\n";
-    return true;
-  }
-  return false;
-}
-
-} // namespace doc
-} // namespace clang

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

@@ -1,209 +0,0 @@
-//===--  BitcodeWriter.h - ClangDoc Bitcode Writer --------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements a writer for serializing the clang-doc internal
-// representation to LLVM bitcode. The writer takes in a stream and emits the
-// generated bitcode to that stream.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEWRITER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEWRITER_H
-
-#include "Representation.h"
-#include "clang/AST/AST.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Bitcode/BitstreamWriter.h"
-#include <initializer_list>
-#include <vector>
-
-namespace clang {
-namespace doc {
-
-// Current version number of clang-doc bitcode.
-// Should be bumped when removing or changing BlockIds, RecordIds, or
-// BitCodeConstants, though they can be added without breaking it.
-static const unsigned VersionNumber = 2;
-
-struct BitCodeConstants {
-  static constexpr unsigned RecordSize = 32U;
-  static constexpr unsigned SignatureBitSize = 8U;
-  static constexpr unsigned SubblockIDSize = 4U;
-  static constexpr unsigned BoolSize = 1U;
-  static constexpr unsigned IntSize = 16U;
-  static constexpr unsigned StringLengthSize = 16U;
-  static constexpr unsigned FilenameLengthSize = 16U;
-  static constexpr unsigned LineNumberSize = 16U;
-  static constexpr unsigned ReferenceTypeSize = 8U;
-  static constexpr unsigned USRLengthSize = 6U;
-  static constexpr unsigned USRBitLengthSize = 8U;
-  static constexpr char Signature[4] = {'D', 'O', 'C', 'S'};
-  static constexpr int USRHashSize = 20;
-};
-
-// New Ids need to be added to both the enum here and the relevant IdNameMap in
-// the implementation file.
-enum BlockId {
-  BI_VERSION_BLOCK_ID = llvm::bitc::FIRST_APPLICATION_BLOCKID,
-  BI_NAMESPACE_BLOCK_ID,
-  BI_ENUM_BLOCK_ID,
-  BI_TYPE_BLOCK_ID,
-  BI_FIELD_TYPE_BLOCK_ID,
-  BI_MEMBER_TYPE_BLOCK_ID,
-  BI_RECORD_BLOCK_ID,
-  BI_FUNCTION_BLOCK_ID,
-  BI_COMMENT_BLOCK_ID,
-  BI_REFERENCE_BLOCK_ID,
-  BI_LAST,
-  BI_FIRST = BI_VERSION_BLOCK_ID
-};
-
-// New Ids need to be added to the enum here, and to the relevant IdNameMap and
-// initialization list in the implementation file.
-enum RecordId {
-  VERSION = 1,
-  FUNCTION_USR,
-  FUNCTION_NAME,
-  FUNCTION_DEFLOCATION,
-  FUNCTION_LOCATION,
-  FUNCTION_ACCESS,
-  FUNCTION_IS_METHOD,
-  COMMENT_KIND,
-  COMMENT_TEXT,
-  COMMENT_NAME,
-  COMMENT_DIRECTION,
-  COMMENT_PARAMNAME,
-  COMMENT_CLOSENAME,
-  COMMENT_SELFCLOSING,
-  COMMENT_EXPLICIT,
-  COMMENT_ATTRKEY,
-  COMMENT_ATTRVAL,
-  COMMENT_ARG,
-  FIELD_TYPE_NAME,
-  MEMBER_TYPE_NAME,
-  MEMBER_TYPE_ACCESS,
-  NAMESPACE_USR,
-  NAMESPACE_NAME,
-  ENUM_USR,
-  ENUM_NAME,
-  ENUM_DEFLOCATION,
-  ENUM_LOCATION,
-  ENUM_MEMBER,
-  ENUM_SCOPED,
-  RECORD_USR,
-  RECORD_NAME,
-  RECORD_DEFLOCATION,
-  RECORD_LOCATION,
-  RECORD_TAG_TYPE,
-  REFERENCE_USR,
-  REFERENCE_NAME,
-  REFERENCE_TYPE,
-  REFERENCE_FIELD,
-  RI_LAST,
-  RI_FIRST = VERSION
-};
-
-static constexpr unsigned BlockIdCount = BI_LAST - BI_FIRST;
-static constexpr unsigned RecordIdCount = RI_LAST - RI_FIRST;
-
-// Identifiers for differentiating between subblocks
-enum class FieldId {
-  F_default,
-  F_namespace,
-  F_parent,
-  F_vparent,
-  F_type,
-  F_child_namespace,
-  F_child_record
-};
-
-class ClangDocBitcodeWriter {
-public:
-  ClangDocBitcodeWriter(llvm::BitstreamWriter &Stream) : Stream(Stream) {
-    emitHeader();
-    emitBlockInfoBlock();
-    emitVersionBlock();
-  }
-
-  // Write a specific info to a bitcode stream.
-  bool dispatchInfoForWrite(Info *I);
-
-  // Block emission of different info types.
-  void emitBlock(const NamespaceInfo &I);
-  void emitBlock(const RecordInfo &I);
-  void emitBlock(const FunctionInfo &I);
-  void emitBlock(const EnumInfo &I);
-  void emitBlock(const TypeInfo &B);
-  void emitBlock(const FieldTypeInfo &B);
-  void emitBlock(const MemberTypeInfo &B);
-  void emitBlock(const CommentInfo &B);
-  void emitBlock(const Reference &B, FieldId F);
-
-private:
-  class AbbreviationMap {
-    llvm::DenseMap<unsigned, unsigned> Abbrevs;
-
-  public:
-    AbbreviationMap() : Abbrevs(RecordIdCount) {}
-
-    void add(RecordId RID, unsigned AbbrevID);
-    unsigned get(RecordId RID) const;
-  };
-
-  class StreamSubBlockGuard {
-    llvm::BitstreamWriter &Stream;
-
-  public:
-    StreamSubBlockGuard(llvm::BitstreamWriter &Stream_, BlockId ID)
-        : Stream(Stream_) {
-      // NOTE: SubBlockIDSize could theoretically be calculated on the fly,
-      // based on the initialization list of records in each block.
-      Stream.EnterSubblock(ID, BitCodeConstants::SubblockIDSize);
-    }
-
-    StreamSubBlockGuard(const StreamSubBlockGuard &) = delete;
-    StreamSubBlockGuard &operator=(const StreamSubBlockGuard &) = delete;
-
-    ~StreamSubBlockGuard() { Stream.ExitBlock(); }
-  };
-
-  // Emission of validation and overview blocks.
-  void emitHeader();
-  void emitVersionBlock();
-  void emitRecordID(RecordId ID);
-  void emitBlockID(BlockId ID);
-  void emitBlockInfoBlock();
-  void emitBlockInfo(BlockId BID, const std::vector<RecordId> &RIDs);
-
-  // Emission of individual record types.
-  void emitRecord(StringRef Str, RecordId ID);
-  void emitRecord(const SymbolID &Str, RecordId ID);
-  void emitRecord(const Location &Loc, RecordId ID);
-  void emitRecord(const Reference &Ref, RecordId ID);
-  void emitRecord(bool Value, RecordId ID);
-  void emitRecord(int Value, RecordId ID);
-  void emitRecord(unsigned Value, RecordId ID);
-  bool prepRecordData(RecordId ID, bool ShouldEmit = true);
-
-  // Emission of appropriate abbreviation type.
-  void emitAbbrev(RecordId ID, BlockId Block);
-
-  // Static size is the maximum length of the block/record names we're pushing
-  // to this + 1. Longest is currently `MemberTypeBlock` at 15 chars.
-  SmallVector<uint32_t, BitCodeConstants::RecordSize> Record;
-  llvm::BitstreamWriter &Stream;
-  AbbreviationMap Abbrevs;
-};
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEWRITER_H

clang-tools-extra/clang-doc/CMakeLists.txt

@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  BitReader
-  BitWriter
-  )
-
-add_clang_library(clangDoc
-  BitcodeReader.cpp
-  BitcodeWriter.cpp
-  ClangDoc.cpp
-  Generators.cpp
-  Mapper.cpp
-  MDGenerator.cpp
-  Representation.cpp
-  Serialize.cpp
-  YAMLGenerator.cpp
-
-  LINK_LIBS
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangIndex
-  clangLex
-  clangTooling
-  clangToolingCore
-  )
-
-add_subdirectory(tool)

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

@@ -1,62 +0,0 @@
-//===-- ClangDoc.cpp - ClangDoc ---------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the main entry point for the clang-doc tool. It runs
-// the clang-doc mapper on a given set of source code files using a
-// FrontendActionFactory.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangDoc.h"
-#include "Mapper.h"
-#include "Representation.h"
-#include "clang/AST/AST.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Frontend/ASTConsumers.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendActions.h"
-
-namespace clang {
-namespace doc {
-
-class MapperActionFactory : public tooling::FrontendActionFactory {
-public:
-  MapperActionFactory(ClangDocContext CDCtx) : CDCtx(CDCtx) {}
-  clang::FrontendAction *create() override;
-
-private:
-  ClangDocContext CDCtx;
-};
-
-clang::FrontendAction *MapperActionFactory::create() {
-  class ClangDocAction : public clang::ASTFrontendAction {
-  public:
-    ClangDocAction(ClangDocContext CDCtx) : CDCtx(CDCtx) {}
-
-    std::unique_ptr<clang::ASTConsumer>
-    CreateASTConsumer(clang::CompilerInstance &Compiler,
-                      llvm::StringRef InFile) override {
-      return llvm::make_unique<MapASTVisitor>(&Compiler.getASTContext(), CDCtx);
-    }
-
-  private:
-    ClangDocContext CDCtx;
-  };
-  return new ClangDocAction(CDCtx);
-}
-
-std::unique_ptr<tooling::FrontendActionFactory>
-newMapperActionFactory(ClangDocContext CDCtx) {
-  return llvm::make_unique<MapperActionFactory>(CDCtx);
-}
-
-} // namespace doc
-} // namespace clang

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

@@ -1,34 +0,0 @@
-//===-- ClangDoc.h - ClangDoc -----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file exposes a method to craete the FrontendActionFactory for the
-// clang-doc tool. The factory runs the clang-doc mapper on a given set of
-// source code files, storing the results key-value pairs in its
-// ExecutionContext.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H
-
-#include "Representation.h"
-#include "clang/Tooling/Execution.h"
-#include "clang/Tooling/StandaloneExecution.h"
-#include "clang/Tooling/Tooling.h"
-
-namespace clang {
-namespace doc {
-
-std::unique_ptr<tooling::FrontendActionFactory>
-newMapperActionFactory(ClangDocContext CDCtx);
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H

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

@@ -1,39 +0,0 @@
-//===---- Generator.cpp - Generator Registry ---------------------*- C++-*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Generators.h"
-
-LLVM_INSTANTIATE_REGISTRY(clang::doc::GeneratorRegistry)
-
-namespace clang {
-namespace doc {
-
-llvm::Expected<std::unique_ptr<Generator>>
-findGeneratorByName(llvm::StringRef Format) {
-  for (auto I = GeneratorRegistry::begin(), E = GeneratorRegistry::end();
-       I != E; ++I) {
-    if (I->getName() != Format)
-      continue;
-    return I->instantiate();
-  }
-  return llvm::make_error<llvm::StringError>("Can't find generator: " + Format,
-                                             llvm::inconvertibleErrorCode());
-}
-
-// This anchor is used to force the linker to link in the generated object file
-// and thus register the generators.
-extern volatile int YAMLGeneratorAnchorSource;
-extern volatile int MDGeneratorAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED YAMLGeneratorAnchorDest =
-    YAMLGeneratorAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED MDGeneratorAnchorDest =
-    MDGeneratorAnchorSource;
-
-} // namespace doc
-} // namespace clang

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

@@ -1,41 +0,0 @@
-//===-- Generators.h - ClangDoc Generator ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-// Generator classes for converting declaration information into documentation
-// in a specified format.
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_GENERATOR_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_GENERATOR_H
-
-#include "Representation.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/Registry.h"
-
-namespace clang {
-namespace doc {
-
-// Abstract base class for generators.
-// This is expected to be implemented and exposed via the GeneratorRegistry.
-class Generator {
-public:
-  virtual ~Generator() = default;
-
-  // Write out the decl info in the specified format.
-  virtual llvm::Error generateDocForInfo(Info *I, llvm::raw_ostream &OS) = 0;
-};
-
-typedef llvm::Registry<Generator> GeneratorRegistry;
-
-llvm::Expected<std::unique_ptr<Generator>>
-findGeneratorByName(llvm::StringRef Format);
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_GENERATOR_H

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

@@ -1,319 +0,0 @@
-//===-- MDGenerator.cpp - Markdown Generator --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Generators.h"
-#include "Representation.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include <string>
-
-using namespace llvm;
-
-namespace clang {
-namespace doc {
-
-// Enum conversion
-
-std::string getAccess(AccessSpecifier AS) {
-  switch (AS) {
-  case AccessSpecifier::AS_public:
-    return "public";
-  case AccessSpecifier::AS_protected:
-    return "protected";
-  case AccessSpecifier::AS_private:
-    return "private";
-  case AccessSpecifier::AS_none:
-    return {};
-  }
-  llvm_unreachable("Unknown AccessSpecifier");
-}
-
-std::string getTagType(TagTypeKind AS) {
-  switch (AS) {
-  case TagTypeKind::TTK_Class:
-    return "class";
-  case TagTypeKind::TTK_Union:
-    return "union";
-  case TagTypeKind::TTK_Interface:
-    return "interface";
-  case TagTypeKind::TTK_Struct:
-    return "struct";
-  case TagTypeKind::TTK_Enum:
-    return "enum";
-  }
-  llvm_unreachable("Unknown TagTypeKind");
-}
-
-// Markdown generation
-
-std::string genItalic(const Twine &Text) { return "*" + Text.str() + "*"; }
-
-std::string genEmphasis(const Twine &Text) { return "**" + Text.str() + "**"; }
-
-std::string genLink(const Twine &Text, const Twine &Link) {
-  return "[" + Text.str() + "](" + Link.str() + ")";
-}
-
-std::string genReferenceList(const llvm::SmallVectorImpl<Reference> &Refs) {
-  std::string Buffer;
-  llvm::raw_string_ostream Stream(Buffer);
-  bool First = true;
-  for (const auto &R : Refs) {
-    if (!First)
-      Stream << ", ";
-    Stream << R.Name;
-    First = false;
-  }
-  return Stream.str();
-}
-
-void writeLine(const Twine &Text, raw_ostream &OS) { OS << Text << "\n\n"; }
-
-void writeNewLine(raw_ostream &OS) { OS << "\n\n"; }
-
-void writeHeader(const Twine &Text, unsigned int Num, raw_ostream &OS) {
-  OS << std::string(Num, '#') + " " + Text << "\n\n";
-}
-
-void writeFileDefinition(const Location &L, raw_ostream &OS) {
-  OS << genItalic("Defined at line " + std::to_string(L.LineNumber) + " of " +
-                  L.Filename)
-     << "\n\n";
-}
-
-void writeDescription(const CommentInfo &I, raw_ostream &OS) {
-  if (I.Kind == "FullComment") {
-    for (const auto &Child : I.Children)
-      writeDescription(*Child, OS);
-  } else if (I.Kind == "ParagraphComment") {
-    for (const auto &Child : I.Children)
-      writeDescription(*Child, OS);
-    writeNewLine(OS);
-  } else if (I.Kind == "BlockCommandComment") {
-    OS << genEmphasis(I.Name);
-    for (const auto &Child : I.Children)
-      writeDescription(*Child, OS);
-  } else if (I.Kind == "InlineCommandComment") {
-    OS << genEmphasis(I.Name) << " " << I.Text;
-  } else if (I.Kind == "ParamCommandComment") {
-    std::string Direction = I.Explicit ? (" " + I.Direction).str() : "";
-    OS << genEmphasis(I.ParamName) << I.Text << Direction << "\n\n";
-  } else if (I.Kind == "TParamCommandComment") {
-    std::string Direction = I.Explicit ? (" " + I.Direction).str() : "";
-    OS << genEmphasis(I.ParamName) << I.Text << Direction << "\n\n";
-  } else if (I.Kind == "VerbatimBlockComment") {
-    for (const auto &Child : I.Children)
-      writeDescription(*Child, OS);
-  } else if (I.Kind == "VerbatimBlockLineComment") {
-    OS << I.Text;
-    writeNewLine(OS);
-  } else if (I.Kind == "VerbatimLineComment") {
-    OS << I.Text;
-    writeNewLine(OS);
-  } else if (I.Kind == "HTMLStartTagComment") {
-    if (I.AttrKeys.size() != I.AttrValues.size())
-      return;
-    std::string Buffer;
-    llvm::raw_string_ostream Attrs(Buffer);
-    for (unsigned Idx = 0; Idx < I.AttrKeys.size(); ++Idx)
-      Attrs << " \"" << I.AttrKeys[Idx] << "=" << I.AttrValues[Idx] << "\"";
-
-    std::string CloseTag = I.SelfClosing ? "/>" : ">";
-    writeLine("<" + I.Name + Attrs.str() + CloseTag, OS);
-  } else if (I.Kind == "HTMLEndTagComment") {
-    writeLine("</" + I.Name + ">", OS);
-  } else if (I.Kind == "TextComment") {
-    OS << I.Text;
-  } else {
-    OS << "Unknown comment kind: " << I.Kind << ".\n\n";
-  }
-}
-
-void genMarkdown(const EnumInfo &I, llvm::raw_ostream &OS) {
-  if (I.Scoped)
-    writeLine("| enum class " + I.Name + " |", OS);
-  else
-    writeLine("| enum " + I.Name + " |", OS);
-  writeLine("--", OS);
-
-  std::string Buffer;
-  llvm::raw_string_ostream Members(Buffer);
-  if (!I.Members.empty())
-    for (const auto &N : I.Members)
-      Members << "| " << N << " |\n";
-  writeLine(Members.str(), OS);
-  if (I.DefLoc)
-    writeFileDefinition(I.DefLoc.getValue(), OS);
-
-  for (const auto &C : I.Description)
-    writeDescription(C, OS);
-}
-
-void genMarkdown(const FunctionInfo &I, llvm::raw_ostream &OS) {
-  std::string Buffer;
-  llvm::raw_string_ostream Stream(Buffer);
-  bool First = true;
-  for (const auto &N : I.Params) {
-    if (!First)
-      Stream << ", ";
-    Stream << N.Type.Name + " " + N.Name;
-    First = false;
-  }
-  writeHeader(I.Name, 3, OS);
-  std::string Access = getAccess(I.Access);
-  if (Access != "")
-    writeLine(genItalic(Access + " " + I.ReturnType.Type.Name + " " + I.Name +
-                        "(" + Stream.str() + ")"),
-              OS);
-  else
-    writeLine(genItalic(I.ReturnType.Type.Name + " " + I.Name + "(" +
-                        Stream.str() + ")"),
-              OS);
-  if (I.DefLoc)
-    writeFileDefinition(I.DefLoc.getValue(), OS);
-
-  for (const auto &C : I.Description)
-    writeDescription(C, OS);
-}
-
-void genMarkdown(const NamespaceInfo &I, llvm::raw_ostream &OS) {
-  if (I.Name == "")
-    writeHeader("Global Namespace", 1, OS);
-  else
-    writeHeader("namespace " + I.Name, 1, OS);
-  writeNewLine(OS);
-
-  if (!I.Description.empty()) {
-    for (const auto &C : I.Description)
-      writeDescription(C, OS);
-    writeNewLine(OS);
-  }
-
-  if (!I.ChildNamespaces.empty()) {
-    writeHeader("Namespaces", 2, OS);
-    for (const auto &R : I.ChildNamespaces)
-      writeLine(R.Name, OS);
-    writeNewLine(OS);
-  }
-  if (!I.ChildRecords.empty()) {
-    writeHeader("Records", 2, OS);
-    for (const auto &R : I.ChildRecords)
-      writeLine(R.Name, OS);
-    writeNewLine(OS);
-  }
-  if (!I.ChildFunctions.empty()) {
-    writeHeader("Functions", 2, OS);
-    for (const auto &F : I.ChildFunctions)
-      genMarkdown(F, OS);
-    writeNewLine(OS);
-  }
-  if (!I.ChildEnums.empty()) {
-    writeHeader("Enums", 2, OS);
-    for (const auto &E : I.ChildEnums)
-      genMarkdown(E, OS);
-    writeNewLine(OS);
-  }
-}
-
-void genMarkdown(const RecordInfo &I, llvm::raw_ostream &OS) {
-  writeHeader(getTagType(I.TagType) + " " + I.Name, 1, OS);
-  if (I.DefLoc)
-    writeFileDefinition(I.DefLoc.getValue(), OS);
-
-  if (!I.Description.empty()) {
-    for (const auto &C : I.Description)
-      writeDescription(C, OS);
-    writeNewLine(OS);
-  }
-
-  std::string Parents = genReferenceList(I.Parents);
-  std::string VParents = genReferenceList(I.VirtualParents);
-  if (!Parents.empty() || !VParents.empty()) {
-    if (Parents.empty())
-      writeLine("Inherits from " + VParents, OS);
-    else if (VParents.empty())
-      writeLine("Inherits from " + Parents, OS);
-    else
-      writeLine("Inherits from " + Parents + ", " + VParents, OS);
-    writeNewLine(OS);
-  }
-
-  if (!I.Members.empty()) {
-    writeHeader("Members", 2, OS);
-    for (const auto Member : I.Members) {
-      std::string Access = getAccess(Member.Access);
-      if (Access != "")
-        writeLine(Access + " " + Member.Type.Name + " " + Member.Name, OS);
-      else
-        writeLine(Member.Type.Name + " " + Member.Name, OS);
-    }
-    writeNewLine(OS);
-  }
-
-  if (!I.ChildRecords.empty()) {
-    writeHeader("Records", 2, OS);
-    for (const auto &R : I.ChildRecords)
-      writeLine(R.Name, OS);
-    writeNewLine(OS);
-  }
-  if (!I.ChildFunctions.empty()) {
-    writeHeader("Functions", 2, OS);
-    for (const auto &F : I.ChildFunctions)
-      genMarkdown(F, OS);
-    writeNewLine(OS);
-  }
-  if (!I.ChildEnums.empty()) {
-    writeHeader("Enums", 2, OS);
-    for (const auto &E : I.ChildEnums)
-      genMarkdown(E, OS);
-    writeNewLine(OS);
-  }
-}
-
-/// Generator for Markdown documentation.
-class MDGenerator : public Generator {
-public:
-  static const char *Format;
-
-  llvm::Error generateDocForInfo(Info *I, llvm::raw_ostream &OS) override;
-};
-
-const char *MDGenerator::Format = "md";
-
-llvm::Error MDGenerator::generateDocForInfo(Info *I, llvm::raw_ostream &OS) {
-  switch (I->IT) {
-  case InfoType::IT_namespace:
-    genMarkdown(*static_cast<clang::doc::NamespaceInfo *>(I), OS);
-    break;
-  case InfoType::IT_record:
-    genMarkdown(*static_cast<clang::doc::RecordInfo *>(I), OS);
-    break;
-  case InfoType::IT_enum:
-    genMarkdown(*static_cast<clang::doc::EnumInfo *>(I), OS);
-    break;
-  case InfoType::IT_function:
-    genMarkdown(*static_cast<clang::doc::FunctionInfo *>(I), OS);
-    break;
-  case InfoType::IT_default:
-    return llvm::make_error<llvm::StringError>("Unexpected info type.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-  return llvm::Error::success();
-}
-
-static GeneratorRegistry::Add<MDGenerator> MD(MDGenerator::Format,
-                                              "Generator for MD output.");
-
-// This anchor is used to force the linker to link in the generated object file
-// and thus register the generator.
-volatile int MDGeneratorAnchorSource = 0;
-
-} // namespace doc
-} // namespace clang

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

@@ -1,96 +0,0 @@
-//===-- Mapper.cpp - ClangDoc Mapper ----------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Mapper.h"
-#include "BitcodeWriter.h"
-#include "Serialize.h"
-#include "clang/AST/Comment.h"
-#include "clang/Index/USRGeneration.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Error.h"
-
-using clang::comments::FullComment;
-
-namespace clang {
-namespace doc {
-
-void MapASTVisitor::HandleTranslationUnit(ASTContext &Context) {
-  TraverseDecl(Context.getTranslationUnitDecl());
-}
-
-template <typename T> bool MapASTVisitor::mapDecl(const T *D) {
-  // If we're looking a decl not in user files, skip this decl.
-  if (D->getASTContext().getSourceManager().isInSystemHeader(D->getLocation()))
-    return true;
-
-  // Skip function-internal decls.
-  if (D->getParentFunctionOrMethod())
-    return true;
-
-  llvm::SmallString<128> USR;
-  // If there is an error generating a USR for the decl, skip this decl.
-  if (index::generateUSRForDecl(D, USR))
-    return true;
-
-  auto I = 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));
-  return true;
-}
-
-bool MapASTVisitor::VisitNamespaceDecl(const NamespaceDecl *D) {
-  return mapDecl(D);
-}
-
-bool MapASTVisitor::VisitRecordDecl(const RecordDecl *D) { return mapDecl(D); }
-
-bool MapASTVisitor::VisitEnumDecl(const EnumDecl *D) { return mapDecl(D); }
-
-bool MapASTVisitor::VisitCXXMethodDecl(const CXXMethodDecl *D) {
-  return mapDecl(D);
-}
-
-bool MapASTVisitor::VisitFunctionDecl(const FunctionDecl *D) {
-  // Don't visit CXXMethodDecls twice
-  if (dyn_cast<CXXMethodDecl>(D))
-    return true;
-  return mapDecl(D);
-}
-
-comments::FullComment *
-MapASTVisitor::getComment(const NamedDecl *D, const ASTContext &Context) const {
-  RawComment *Comment = Context.getRawCommentForDeclNoCache(D);
-  // FIXME: Move setAttached to the initial comment parsing.
-  if (Comment) {
-    Comment->setAttached();
-    return Comment->parse(Context, nullptr, D);
-  }
-  return nullptr;
-}
-
-int MapASTVisitor::getLine(const NamedDecl *D,
-                           const ASTContext &Context) const {
-  return Context.getSourceManager().getPresumedLoc(D->getBeginLoc()).getLine();
-}
-
-llvm::StringRef MapASTVisitor::getFile(const NamedDecl *D,
-                                       const ASTContext &Context) const {
-  return Context.getSourceManager()
-      .getPresumedLoc(D->getBeginLoc())
-      .getFilename();
-}
-
-} // namespace doc
-} // namespace clang

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

@@ -1,58 +0,0 @@
-//===-- Mapper.h - ClangDoc Mapper ------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Mapper piece of the clang-doc tool. It implements
-// a RecursiveASTVisitor to look at each declaration and populate the info
-// into the internal representation. Each seen declaration is serialized to
-// to bitcode and written out to the ExecutionContext as a KV pair where the
-// key is the declaration's USR and the value is the serialized bitcode.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_MAPPER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_MAPPER_H
-
-#include "Representation.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Tooling/Execution.h"
-
-using namespace clang::comments;
-using namespace clang::tooling;
-
-namespace clang {
-namespace doc {
-
-class MapASTVisitor : public clang::RecursiveASTVisitor<MapASTVisitor>,
-                      public ASTConsumer {
-public:
-  explicit MapASTVisitor(ASTContext *Ctx, ClangDocContext CDCtx)
-      : CDCtx(CDCtx) {}
-
-  void HandleTranslationUnit(ASTContext &Context) override;
-  bool VisitNamespaceDecl(const NamespaceDecl *D);
-  bool VisitRecordDecl(const RecordDecl *D);
-  bool VisitEnumDecl(const EnumDecl *D);
-  bool VisitCXXMethodDecl(const CXXMethodDecl *D);
-  bool VisitFunctionDecl(const FunctionDecl *D);
-
-private:
-  template <typename T> bool mapDecl(const T *D);
-
-  int getLine(const NamedDecl *D, const ASTContext &Context) const;
-  StringRef getFile(const NamedDecl *D, const ASTContext &Context) const;
-  comments::FullComment *getComment(const NamedDecl *D,
-                                    const ASTContext &Context) const;
-
-  ClangDocContext CDCtx;
-};
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_MAPPER_H

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

@@ -1,193 +0,0 @@
-///===-- Representation.cpp - ClangDoc Representation -----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the merging of different types of infos. The data in the
-// calling Info is preserved during a merge unless that field is empty or
-// default. In that case, the data from the parameter Info is used to replace
-// the empty or default data.
-//
-// For most fields, the first decl seen provides the data. Exceptions to this
-// include the location and description fields, which are collections of data on
-// all decls related to a given definition. All other fields are ignored in new
-// decls unless the first seen decl didn't, for whatever reason, incorporate
-// data on that field (e.g. a forward declared class wouldn't have information
-// on members on the forward declaration, but would have the class name).
-//
-//===----------------------------------------------------------------------===//
-#include "Representation.h"
-#include "llvm/Support/Error.h"
-
-namespace clang {
-namespace doc {
-
-namespace {
-
-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);
-  T *Tmp = static_cast<T *>(Merged.get());
-  for (auto &I : Values)
-    Tmp->merge(std::move(*static_cast<T *>(I.get())));
-  return std::move(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) {
-  if (Values.empty())
-    return llvm::make_error<llvm::StringError>("No info values to merge.\n",
-                                               llvm::inconvertibleErrorCode());
-
-  switch (Values[0]->IT) {
-  case InfoType::IT_namespace:
-    return reduce<NamespaceInfo>(Values);
-  case InfoType::IT_record:
-    return reduce<RecordInfo>(Values);
-  case InfoType::IT_enum:
-    return reduce<EnumInfo>(Values);
-  case InfoType::IT_function:
-    return reduce<FunctionInfo>(Values);
-  default:
-    return llvm::make_error<llvm::StringError>("Unexpected info type.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-}
-
-void Info::mergeBase(Info &&Other) {
-  assert(mergeable(Other));
-  if (USR == EmptySID)
-    USR = Other.USR;
-  if (Name == "")
-    Name = Other.Name;
-  if (Namespace.empty())
-    Namespace = std::move(Other.Namespace);
-  // Unconditionally extend the description, since each decl may have a comment.
-  std::move(Other.Description.begin(), Other.Description.end(),
-            std::back_inserter(Description));
-}
-
-bool Info::mergeable(const Info &Other) {
-  return IT == Other.IT && USR == Other.USR;
-}
-
-void SymbolInfo::merge(SymbolInfo &&Other) {
-  assert(mergeable(Other));
-  if (!DefLoc)
-    DefLoc = std::move(Other.DefLoc);
-  // Unconditionally extend the list of locations, since we want all of them.
-  std::move(Other.Loc.begin(), Other.Loc.end(), std::back_inserter(Loc));
-  mergeBase(std::move(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));
-}
-
-void RecordInfo::merge(RecordInfo &&Other) {
-  assert(mergeable(Other));
-  if (!TagType)
-    TagType = Other.TagType;
-  if (Members.empty())
-    Members = std::move(Other.Members);
-  if (Parents.empty())
-    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));
-}
-
-void EnumInfo::merge(EnumInfo &&Other) {
-  assert(mergeable(Other));
-  if (!Scoped)
-    Scoped = Other.Scoped;
-  if (Members.empty())
-    Members = std::move(Other.Members);
-  SymbolInfo::merge(std::move(Other));
-}
-
-void FunctionInfo::merge(FunctionInfo &&Other) {
-  assert(mergeable(Other));
-  if (!IsMethod)
-    IsMethod = Other.IsMethod;
-  if (!Access)
-    Access = Other.Access;
-  if (ReturnType.Type.USR == EmptySID && ReturnType.Type.Name == "")
-    ReturnType = std::move(Other.ReturnType);
-  if (Parent.USR == EmptySID && Parent.Name == "")
-    Parent = std::move(Other.Parent);
-  if (Params.empty())
-    Params = std::move(Other.Params);
-  SymbolInfo::merge(std::move(Other));
-}
-
-} // namespace doc
-} // namespace clang

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

@@ -1,291 +0,0 @@
-///===-- Representation.h - ClangDoc Representation -------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the internal representations of different declaration
-// types for the clang-doc tool.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_REPRESENTATION_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_REPRESENTATION_H
-
-#include "clang/AST/Type.h"
-#include "clang/Basic/Specifiers.h"
-#include "clang/Tooling/StandaloneExecution.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include <array>
-#include <string>
-
-namespace clang {
-namespace doc {
-
-// SHA1'd hash of a USR.
-using SymbolID = std::array<uint8_t, 20>;
-
-struct Info;
-struct FunctionInfo;
-struct EnumInfo;
-
-enum class InfoType {
-  IT_default,
-  IT_namespace,
-  IT_record,
-  IT_function,
-  IT_enum
-};
-
-// A representation of a parsed comment.
-struct CommentInfo {
-  CommentInfo() = default;
-  CommentInfo(CommentInfo &Other) = delete;
-  CommentInfo(CommentInfo &&Other) = default;
-
-  SmallString<16>
-      Kind; // Kind of comment (FullComment, ParagraphComment, TextComment,
-            // InlineCommandComment, HTMLStartTagComment, HTMLEndTagComment,
-            // BlockCommandComment, ParamCommandComment,
-            // TParamCommandComment, VerbatimBlockComment,
-            // VerbatimBlockLineComment, VerbatimLineComment).
-  SmallString<64> Text;      // Text of the comment.
-  SmallString<16> Name;      // Name of the comment (for Verbatim and HTML).
-  SmallString<8> Direction;  // Parameter direction (for (T)ParamCommand).
-  SmallString<16> ParamName; // Parameter name (for (T)ParamCommand).
-  SmallString<16> CloseName; // Closing tag name (for VerbatimBlock).
-  bool SelfClosing = false;  // Indicates if tag is self-closing (for HTML).
-  bool Explicit = false; // Indicates if the direction of a param is explicit
-                         // (for (T)ParamCommand).
-  llvm::SmallVector<SmallString<16>, 4>
-      AttrKeys; // List of attribute keys (for HTML).
-  llvm::SmallVector<SmallString<16>, 4>
-      AttrValues; // List of attribute values for each key (for HTML).
-  llvm::SmallVector<SmallString<16>, 4>
-      Args; // List of arguments to commands (for InlineCommand).
-  std::vector<std::unique_ptr<CommentInfo>>
-      Children; // List of child comments for this CommentInfo.
-};
-
-struct Reference {
-  Reference() = default;
-  Reference(llvm::StringRef Name) : Name(Name) {}
-  Reference(SymbolID USR, StringRef Name, InfoType IT)
-      : USR(USR), Name(Name), RefType(IT) {}
-
-  bool operator==(const Reference &Other) const {
-    return std::tie(USR, Name, RefType) ==
-           std::tie(Other.USR, Other.Name, Other.RefType);
-  }
-
-  SymbolID USR = SymbolID(); // Unique identifer for referenced decl
-  SmallString<16> Name;      // Name of type (possibly unresolved).
-  InfoType RefType = InfoType::IT_default; // Indicates the type of this
-                                           // Reference (namespace, record,
-                                           // function, enum, default).
-};
-
-// A base struct for TypeInfos
-struct TypeInfo {
-  TypeInfo() = default;
-  TypeInfo(SymbolID Type, StringRef Field, InfoType IT)
-      : Type(Type, Field, IT) {}
-  TypeInfo(llvm::StringRef RefName) : Type(RefName) {}
-
-  bool operator==(const TypeInfo &Other) const { return Type == Other.Type; }
-
-  Reference Type; // Referenced type in this info.
-};
-
-// Info for field types.
-struct FieldTypeInfo : public TypeInfo {
-  FieldTypeInfo() = default;
-  FieldTypeInfo(SymbolID Type, StringRef Field, InfoType IT,
-                llvm::StringRef Name)
-      : TypeInfo(Type, Field, IT), Name(Name) {}
-  FieldTypeInfo(llvm::StringRef RefName, llvm::StringRef Name)
-      : TypeInfo(RefName), Name(Name) {}
-
-  bool operator==(const FieldTypeInfo &Other) const {
-    return std::tie(Type, Name) == std::tie(Other.Type, Other.Name);
-  }
-
-  SmallString<16> Name; // Name associated with this info.
-};
-
-// Info for member types.
-struct MemberTypeInfo : public FieldTypeInfo {
-  MemberTypeInfo() = default;
-  MemberTypeInfo(SymbolID Type, StringRef Field, InfoType IT,
-                 llvm::StringRef Name, AccessSpecifier Access)
-      : FieldTypeInfo(Type, Field, IT, Name), Access(Access) {}
-  MemberTypeInfo(llvm::StringRef RefName, llvm::StringRef Name,
-                 AccessSpecifier Access)
-      : FieldTypeInfo(RefName, Name), Access(Access) {}
-
-  bool operator==(const MemberTypeInfo &Other) const {
-    return std::tie(Type, Name, Access) ==
-           std::tie(Other.Type, Other.Name, Other.Access);
-  }
-
-  AccessSpecifier Access = AccessSpecifier::AS_none; // Access level associated
-                                                     // with this info (public,
-                                                     // protected, private,
-                                                     // none).
-};
-
-struct Location {
-  Location() = default;
-  Location(int LineNumber, SmallString<16> Filename)
-      : LineNumber(LineNumber), Filename(std::move(Filename)) {}
-
-  bool operator==(const Location &Other) const {
-    return std::tie(LineNumber, Filename) ==
-           std::tie(Other.LineNumber, Other.Filename);
-  }
-
-  int LineNumber;           // Line number of this Location.
-  SmallString<32> Filename; // File for this Location.
-};
-
-/// A base struct for Infos.
-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;
-
-  virtual ~Info() = default;
-
-  SymbolID USR =
-      SymbolID(); // Unique identifier for the decl described by this Info.
-  const InfoType IT = InfoType::IT_default; // InfoType of this particular Info.
-  SmallString<16> Name;                     // Unqualified name of the decl.
-  llvm::SmallVector<Reference, 4>
-      Namespace; // List of parent namespaces for this decl.
-  std::vector<CommentInfo> Description; // Comment description of this decl.
-
-  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);
-
-  // Namespaces and Records are references because they will be properly
-  // documented in their own info, while the entirety of Functions and Enums are
-  // included here because they should not have separate documentation from
-  // their scope.
-  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);
-
-  llvm::Optional<Location> DefLoc;    // Location where this decl is defined.
-  llvm::SmallVector<Location, 2> Loc; // Locations where this decl is declared.
-};
-
-// TODO: Expand to allow for documenting templating and default args.
-// Info for functions.
-struct FunctionInfo : public SymbolInfo {
-  FunctionInfo() : SymbolInfo(InfoType::IT_function) {}
-  FunctionInfo(SymbolID USR) : SymbolInfo(InfoType::IT_function, USR) {}
-
-  void merge(FunctionInfo &&I);
-
-  bool IsMethod = false; // Indicates whether this function is a class method.
-  Reference Parent;      // Reference to the parent class decl for this method.
-  TypeInfo ReturnType;   // Info about the return type of this function.
-  llvm::SmallVector<FieldTypeInfo, 4> Params; // List of parameters.
-  // Access level for this method (public, private, protected, none).
-  AccessSpecifier Access = AccessSpecifier::AS_none;
-};
-
-// TODO: Expand to allow for documenting templating, inheritance access,
-// friend classes
-// 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);
-
-  TagTypeKind TagType = TagTypeKind::TTK_Struct; // Type of this record
-                                                 // (struct, class, union,
-                                                 // interface).
-  llvm::SmallVector<MemberTypeInfo, 4>
-      Members;                             // List of info about record members.
-  llvm::SmallVector<Reference, 4> Parents; // List of base/parent records
-                                           // (does not include virtual
-                                           // parents).
-  llvm::SmallVector<Reference, 4>
-      VirtualParents; // List of virtual base/parent records.
-
-  // Records are references because they will be properly
-  // documented in their own info, while the entirety of Functions and Enums are
-  // included here because they should not have separate documentation from
-  // their scope.
-  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);
-
-  bool Scoped =
-      false; // Indicates whether this enum is scoped (e.g. enum class).
-  llvm::SmallVector<SmallString<16>, 4> Members; // List of enum members.
-};
-
-// TODO: Add functionality to include separate markdown pages.
-
-// A standalone function to call to merge a vector of infos into one.
-// This assumes that all infos in the vector are of the same type, and will fail
-// if they are different.
-llvm::Expected<std::unique_ptr<Info>>
-mergeInfos(std::vector<std::unique_ptr<Info>> &Values);
-
-struct ClangDocContext {
-  tooling::ExecutionContext *ECtx;
-  bool PublicOnly;
-};
-
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_REPRESENTATION_H

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

@@ -1,431 +0,0 @@
-//===-- Serializer.cpp - ClangDoc Serializer --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Serialize.h"
-#include "BitcodeWriter.h"
-#include "clang/AST/Comment.h"
-#include "clang/Index/USRGeneration.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/SHA1.h"
-
-using clang::comments::FullComment;
-
-namespace clang {
-namespace doc {
-namespace serialize {
-
-SymbolID hashUSR(llvm::StringRef USR) {
-  return llvm::SHA1::hash(arrayRefFromStringRef(USR));
-}
-
-class ClangDocCommentVisitor
-    : public ConstCommentVisitor<ClangDocCommentVisitor> {
-public:
-  ClangDocCommentVisitor(CommentInfo &CI) : CurrentCI(CI) {}
-
-  void parseComment(const comments::Comment *C);
-
-  void visitTextComment(const TextComment *C);
-  void visitInlineCommandComment(const InlineCommandComment *C);
-  void visitHTMLStartTagComment(const HTMLStartTagComment *C);
-  void visitHTMLEndTagComment(const HTMLEndTagComment *C);
-  void visitBlockCommandComment(const BlockCommandComment *C);
-  void visitParamCommandComment(const ParamCommandComment *C);
-  void visitTParamCommandComment(const TParamCommandComment *C);
-  void visitVerbatimBlockComment(const VerbatimBlockComment *C);
-  void visitVerbatimBlockLineComment(const VerbatimBlockLineComment *C);
-  void visitVerbatimLineComment(const VerbatimLineComment *C);
-
-private:
-  std::string getCommandName(unsigned CommandID) const;
-  bool isWhitespaceOnly(StringRef S) const;
-
-  CommentInfo &CurrentCI;
-};
-
-void ClangDocCommentVisitor::parseComment(const comments::Comment *C) {
-  CurrentCI.Kind = C->getCommentKindName();
-  ConstCommentVisitor<ClangDocCommentVisitor>::visit(C);
-  for (comments::Comment *Child :
-       llvm::make_range(C->child_begin(), C->child_end())) {
-    CurrentCI.Children.emplace_back(llvm::make_unique<CommentInfo>());
-    ClangDocCommentVisitor Visitor(*CurrentCI.Children.back());
-    Visitor.parseComment(Child);
-  }
-}
-
-void ClangDocCommentVisitor::visitTextComment(const TextComment *C) {
-  if (!isWhitespaceOnly(C->getText()))
-    CurrentCI.Text = C->getText();
-}
-
-void ClangDocCommentVisitor::visitInlineCommandComment(
-    const InlineCommandComment *C) {
-  CurrentCI.Name = getCommandName(C->getCommandID());
-  for (unsigned I = 0, E = C->getNumArgs(); I != E; ++I)
-    CurrentCI.Args.push_back(C->getArgText(I));
-}
-
-void ClangDocCommentVisitor::visitHTMLStartTagComment(
-    const HTMLStartTagComment *C) {
-  CurrentCI.Name = C->getTagName();
-  CurrentCI.SelfClosing = C->isSelfClosing();
-  for (unsigned I = 0, E = C->getNumAttrs(); I < E; ++I) {
-    const HTMLStartTagComment::Attribute &Attr = C->getAttr(I);
-    CurrentCI.AttrKeys.push_back(Attr.Name);
-    CurrentCI.AttrValues.push_back(Attr.Value);
-  }
-}
-
-void ClangDocCommentVisitor::visitHTMLEndTagComment(
-    const HTMLEndTagComment *C) {
-  CurrentCI.Name = C->getTagName();
-  CurrentCI.SelfClosing = true;
-}
-
-void ClangDocCommentVisitor::visitBlockCommandComment(
-    const BlockCommandComment *C) {
-  CurrentCI.Name = getCommandName(C->getCommandID());
-  for (unsigned I = 0, E = C->getNumArgs(); I < E; ++I)
-    CurrentCI.Args.push_back(C->getArgText(I));
-}
-
-void ClangDocCommentVisitor::visitParamCommandComment(
-    const ParamCommandComment *C) {
-  CurrentCI.Direction =
-      ParamCommandComment::getDirectionAsString(C->getDirection());
-  CurrentCI.Explicit = C->isDirectionExplicit();
-  if (C->hasParamName())
-    CurrentCI.ParamName = C->getParamNameAsWritten();
-}
-
-void ClangDocCommentVisitor::visitTParamCommandComment(
-    const TParamCommandComment *C) {
-  if (C->hasParamName())
-    CurrentCI.ParamName = C->getParamNameAsWritten();
-}
-
-void ClangDocCommentVisitor::visitVerbatimBlockComment(
-    const VerbatimBlockComment *C) {
-  CurrentCI.Name = getCommandName(C->getCommandID());
-  CurrentCI.CloseName = C->getCloseName();
-}
-
-void ClangDocCommentVisitor::visitVerbatimBlockLineComment(
-    const VerbatimBlockLineComment *C) {
-  if (!isWhitespaceOnly(C->getText()))
-    CurrentCI.Text = C->getText();
-}
-
-void ClangDocCommentVisitor::visitVerbatimLineComment(
-    const VerbatimLineComment *C) {
-  if (!isWhitespaceOnly(C->getText()))
-    CurrentCI.Text = C->getText();
-}
-
-bool ClangDocCommentVisitor::isWhitespaceOnly(llvm::StringRef S) const {
-  return std::all_of(S.begin(), S.end(), isspace);
-}
-
-std::string ClangDocCommentVisitor::getCommandName(unsigned CommandID) const {
-  const CommandInfo *Info = CommandTraits::getBuiltinCommandInfo(CommandID);
-  if (Info)
-    return Info->Name;
-  // TODO: Add parsing for \file command.
-  return "<not a builtin command>";
-}
-
-// Serializing functions.
-
-template <typename T> static std::string serialize(T &I) {
-  SmallString<2048> Buffer;
-  llvm::BitstreamWriter Stream(Buffer);
-  ClangDocBitcodeWriter Writer(Stream);
-  Writer.emitBlock(I);
-  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);
-}
-
-static SymbolID getUSRForDecl(const Decl *D) {
-  llvm::SmallString<128> USR;
-  if (index::generateUSRForDecl(D, USR))
-    return SymbolID();
-  return hashUSR(USR);
-}
-
-static RecordDecl *getDeclForType(const QualType &T) {
-  auto *Ty = T->getAs<RecordType>();
-  if (!Ty)
-    return nullptr;
-  return Ty->getDecl()->getDefinition();
-}
-
-static bool isPublic(const clang::AccessSpecifier AS,
-                     const clang::Linkage Link) {
-  if (AS == clang::AccessSpecifier::AS_private)
-    return false;
-  else if ((Link == clang::Linkage::ModuleLinkage) ||
-           (Link == clang::Linkage::ExternalLinkage))
-    return true;
-  return false; // otherwise, linkage is some form of internal linkage
-}
-
-static void parseFields(RecordInfo &I, const RecordDecl *D, bool PublicOnly) {
-  for (const FieldDecl *F : D->fields()) {
-    if (PublicOnly && !isPublic(F->getAccessUnsafe(), F->getLinkageInternal()))
-      continue;
-    if (const auto *T = getDeclForType(F->getTypeSourceInfo()->getType())) {
-      // Use getAccessUnsafe so that we just get the default AS_none if it's not
-      // valid, as opposed to an assert.
-      if (const auto *N = dyn_cast<EnumDecl>(T)) {
-        I.Members.emplace_back(getUSRForDecl(T), N->getNameAsString(),
-                               InfoType::IT_enum, F->getNameAsString(),
-                               N->getAccessUnsafe());
-        continue;
-      } else if (const auto *N = dyn_cast<RecordDecl>(T)) {
-        I.Members.emplace_back(getUSRForDecl(T), N->getNameAsString(),
-                               InfoType::IT_record, F->getNameAsString(),
-                               N->getAccessUnsafe());
-        continue;
-      }
-    }
-    I.Members.emplace_back(F->getTypeSourceInfo()->getType().getAsString(),
-                           F->getNameAsString(), F->getAccessUnsafe());
-  }
-}
-
-static void parseEnumerators(EnumInfo &I, const EnumDecl *D) {
-  for (const EnumConstantDecl *E : D->enumerators())
-    I.Members.emplace_back(E->getNameAsString());
-}
-
-static void parseParameters(FunctionInfo &I, const FunctionDecl *D) {
-  for (const ParmVarDecl *P : D->parameters()) {
-    if (const auto *T = getDeclForType(P->getOriginalType())) {
-      if (const auto *N = dyn_cast<EnumDecl>(T)) {
-        I.Params.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_enum, P->getNameAsString());
-        continue;
-      } else if (const auto *N = dyn_cast<RecordDecl>(T)) {
-        I.Params.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_record, P->getNameAsString());
-        continue;
-      }
-    }
-    I.Params.emplace_back(P->getOriginalType().getAsString(),
-                          P->getNameAsString());
-  }
-}
-
-static void parseBases(RecordInfo &I, const CXXRecordDecl *D) {
-  // Don't parse bases if this isn't a definition.
-  if (!D->isThisDeclarationADefinition())
-    return;
-  for (const CXXBaseSpecifier &B : D->bases()) {
-    if (B.isVirtual())
-      continue;
-    if (const auto *P = getDeclForType(B.getType()))
-      I.Parents.emplace_back(getUSRForDecl(P), P->getNameAsString(),
-                             InfoType::IT_record);
-    else
-      I.Parents.emplace_back(B.getType().getAsString());
-  }
-  for (const CXXBaseSpecifier &B : D->vbases()) {
-    if (const auto *P = getDeclForType(B.getType()))
-      I.VirtualParents.emplace_back(getUSRForDecl(P), P->getNameAsString(),
-                                    InfoType::IT_record);
-    else
-      I.VirtualParents.emplace_back(B.getType().getAsString());
-  }
-}
-
-template <typename T>
-static void
-populateParentNamespaces(llvm::SmallVector<Reference, 4> &Namespaces,
-                         const T *D) {
-  const auto *DC = dyn_cast<DeclContext>(D);
-  while ((DC = DC->getParent())) {
-    if (const auto *N = dyn_cast<NamespaceDecl>(DC))
-      Namespaces.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_namespace);
-    else if (const auto *N = dyn_cast<RecordDecl>(DC))
-      Namespaces.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_record);
-    else if (const auto *N = dyn_cast<FunctionDecl>(DC))
-      Namespaces.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_function);
-    else if (const auto *N = dyn_cast<EnumDecl>(DC))
-      Namespaces.emplace_back(getUSRForDecl(N), N->getNameAsString(),
-                              InfoType::IT_enum);
-  }
-}
-
-template <typename T>
-static void populateInfo(Info &I, const T *D, const FullComment *C) {
-  I.USR = getUSRForDecl(D);
-  I.Name = D->getNameAsString();
-  populateParentNamespaces(I.Namespace, D);
-  if (C) {
-    I.Description.emplace_back();
-    parseFullComment(C, I.Description.back());
-  }
-}
-
-template <typename T>
-static void populateSymbolInfo(SymbolInfo &I, const T *D, const FullComment *C,
-                               int LineNumber, StringRef Filename) {
-  populateInfo(I, D, C);
-  if (D->isThisDeclarationADefinition())
-    I.DefLoc.emplace(LineNumber, Filename);
-  else
-    I.Loc.emplace_back(LineNumber, Filename);
-}
-
-static void populateFunctionInfo(FunctionInfo &I, const FunctionDecl *D,
-                                 const FullComment *FC, int LineNumber,
-                                 StringRef Filename) {
-  populateSymbolInfo(I, D, FC, LineNumber, Filename);
-  if (const auto *T = getDeclForType(D->getReturnType())) {
-    if (dyn_cast<EnumDecl>(T))
-      I.ReturnType =
-          TypeInfo(getUSRForDecl(T), T->getNameAsString(), InfoType::IT_enum);
-    else if (dyn_cast<RecordDecl>(T))
-      I.ReturnType =
-          TypeInfo(getUSRForDecl(T), T->getNameAsString(), InfoType::IT_record);
-  } else {
-    I.ReturnType = TypeInfo(D->getReturnType().getAsString());
-  }
-  parseParameters(I, D);
-}
-
-std::unique_ptr<Info> emitInfo(const NamespaceDecl *D, const FullComment *FC,
-                               int LineNumber, llvm::StringRef File,
-                               bool PublicOnly) {
-  if (PublicOnly && ((D->isAnonymousNamespace()) ||
-                     !isPublic(D->getAccess(), D->getLinkageInternal())))
-    return nullptr;
-  auto I = llvm::make_unique<NamespaceInfo>();
-  populateInfo(*I, D, FC);
-  return std::unique_ptr<Info>{std::move(I)};
-}
-
-std::unique_ptr<Info> emitInfo(const RecordDecl *D, const FullComment *FC,
-                               int LineNumber, llvm::StringRef File,
-                               bool PublicOnly) {
-  if (PublicOnly && !isPublic(D->getAccess(), D->getLinkageInternal()))
-    return nullptr;
-  auto I = llvm::make_unique<RecordInfo>();
-  populateSymbolInfo(*I, D, FC, LineNumber, File);
-  I->TagType = D->getTagKind();
-  parseFields(*I, D, PublicOnly);
-  if (const auto *C = dyn_cast<CXXRecordDecl>(D))
-    parseBases(*I, C);
-  return std::unique_ptr<Info>{std::move(I)};
-}
-
-std::unique_ptr<Info> emitInfo(const FunctionDecl *D, const FullComment *FC,
-                               int LineNumber, llvm::StringRef File,
-                               bool PublicOnly) {
-  if (PublicOnly && !isPublic(D->getAccess(), D->getLinkageInternal()))
-    return nullptr;
-  FunctionInfo Func;
-  populateFunctionInfo(Func, D, FC, LineNumber, File);
-  Func.Access = clang::AccessSpecifier::AS_none;
-
-  // Wrap in enclosing scope
-  auto I = llvm::make_unique<NamespaceInfo>();
-  if (!Func.Namespace.empty())
-    I->USR = Func.Namespace[0].USR;
-  else
-    I->USR = SymbolID();
-  I->ChildFunctions.emplace_back(std::move(Func));
-  return std::unique_ptr<Info>{std::move(I)};
-}
-
-std::unique_ptr<Info> emitInfo(const CXXMethodDecl *D, const FullComment *FC,
-                               int LineNumber, llvm::StringRef File,
-                               bool PublicOnly) {
-  if (PublicOnly && !isPublic(D->getAccess(), D->getLinkageInternal()))
-    return nullptr;
-  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
-  auto I = llvm::make_unique<RecordInfo>();
-  I->USR = ParentUSR;
-  I->ChildFunctions.emplace_back(std::move(Func));
-  return std::unique_ptr<Info>{std::move(I)};
-}
-
-std::unique_ptr<Info> emitInfo(const EnumDecl *D, const FullComment *FC,
-                               int LineNumber, llvm::StringRef File,
-                               bool PublicOnly) {
-  if (PublicOnly && !isPublic(D->getAccess(), D->getLinkageInternal()))
-    return nullptr;
-  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: {
-      auto I = llvm::make_unique<NamespaceInfo>();
-      I->USR = Enum.Namespace[0].USR;
-      I->ChildEnums.emplace_back(std::move(Enum));
-      return std::unique_ptr<Info>{std::move(I)};
-    }
-    case InfoType::IT_record: {
-      auto I = llvm::make_unique<RecordInfo>();
-      I->USR = Enum.Namespace[0].USR;
-      I->ChildEnums.emplace_back(std::move(Enum));
-      return std::unique_ptr<Info>{std::move(I)};
-    }
-    default:
-      break;
-    }
-  }
-
-  // Put in global namespace
-  auto I = llvm::make_unique<NamespaceInfo>();
-  I->USR = SymbolID();
-  I->ChildEnums.emplace_back(std::move(Enum));
-  return std::unique_ptr<Info>{std::move(I)};
-}
-
-} // namespace serialize
-} // namespace doc
-} // namespace clang

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

@@ -1,55 +0,0 @@
-//===-- Serializer.h - ClangDoc Serializer ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the serializing functions fro the clang-doc tool. Given
-// a particular declaration, it collects the appropriate information and returns
-// a serialized bitcode string for the declaration.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SERIALIZE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SERIALIZE_H
-
-#include "Representation.h"
-#include "clang/AST/AST.h"
-#include "clang/AST/CommentVisitor.h"
-#include <string>
-#include <vector>
-
-using namespace clang::comments;
-
-namespace clang {
-namespace doc {
-namespace serialize {
-
-std::unique_ptr<Info> emitInfo(const NamespaceDecl *D, const FullComment *FC,
-                               int LineNumber, StringRef File, bool PublicOnly);
-std::unique_ptr<Info> emitInfo(const RecordDecl *D, const FullComment *FC,
-                               int LineNumber, StringRef File, bool PublicOnly);
-std::unique_ptr<Info> emitInfo(const EnumDecl *D, const FullComment *FC,
-                               int LineNumber, StringRef File, bool PublicOnly);
-std::unique_ptr<Info> emitInfo(const FunctionDecl *D, const FullComment *FC,
-                               int LineNumber, StringRef File, bool PublicOnly);
-std::unique_ptr<Info> emitInfo(const CXXMethodDecl *D, const FullComment *FC,
-                               int LineNumber, StringRef File, bool PublicOnly);
-
-// Function to hash a given USR value for storage.
-// As USRs (Unified Symbol Resolution) could be large, especially for functions
-// with long type arguments, we use 160-bits SHA1(USR) values to
-// guarantee the uniqueness of symbols while using a relatively small amount of
-// memory (vs storing USRs directly).
-SymbolID hashUSR(llvm::StringRef USR);
-
-std::string serialize(std::unique_ptr<Info> &I);
-
-} // namespace serialize
-} // namespace doc
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SERIALIZE_H

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

@@ -1,280 +0,0 @@
-//===--  ClangDocYAML.cpp - ClangDoc YAML -----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-// Implementation of the YAML generator, converting decl info into YAML output.
-//===----------------------------------------------------------------------===//
-
-#include "Generators.h"
-#include "llvm/Support/YAMLTraits.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace clang::doc;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(FieldTypeInfo)
-LLVM_YAML_IS_SEQUENCE_VECTOR(MemberTypeInfo)
-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>)
-
-namespace llvm {
-namespace yaml {
-
-// Enumerations to YAML output.
-
-template <> struct ScalarEnumerationTraits<clang::AccessSpecifier> {
-  static void enumeration(IO &IO, clang::AccessSpecifier &Value) {
-    IO.enumCase(Value, "Public", clang::AccessSpecifier::AS_public);
-    IO.enumCase(Value, "Protected", clang::AccessSpecifier::AS_protected);
-    IO.enumCase(Value, "Private", clang::AccessSpecifier::AS_private);
-    IO.enumCase(Value, "None", clang::AccessSpecifier::AS_none);
-  }
-};
-
-template <> struct ScalarEnumerationTraits<clang::TagTypeKind> {
-  static void enumeration(IO &IO, clang::TagTypeKind &Value) {
-    IO.enumCase(Value, "Struct", clang::TagTypeKind::TTK_Struct);
-    IO.enumCase(Value, "Interface", clang::TagTypeKind::TTK_Interface);
-    IO.enumCase(Value, "Union", clang::TagTypeKind::TTK_Union);
-    IO.enumCase(Value, "Class", clang::TagTypeKind::TTK_Class);
-    IO.enumCase(Value, "Enum", clang::TagTypeKind::TTK_Enum);
-  }
-};
-
-template <> struct ScalarEnumerationTraits<InfoType> {
-  static void enumeration(IO &IO, InfoType &Value) {
-    IO.enumCase(Value, "Namespace", InfoType::IT_namespace);
-    IO.enumCase(Value, "Record", InfoType::IT_record);
-    IO.enumCase(Value, "Function", InfoType::IT_function);
-    IO.enumCase(Value, "Enum", InfoType::IT_enum);
-    IO.enumCase(Value, "Default", InfoType::IT_default);
-  }
-};
-
-// Scalars to YAML output.
-template <unsigned U> struct ScalarTraits<SmallString<U>> {
-
-  static void output(const SmallString<U> &S, void *, llvm::raw_ostream &OS) {
-    for (const auto &C : S)
-      OS << C;
-  }
-
-  static StringRef input(StringRef Scalar, void *, SmallString<U> &Value) {
-    Value.assign(Scalar.begin(), Scalar.end());
-    return StringRef();
-  }
-
-  static QuotingType mustQuote(StringRef) { return QuotingType::Single; }
-};
-
-template <> struct ScalarTraits<std::array<unsigned char, 20>> {
-
-  static void output(const std::array<unsigned char, 20> &S, void *,
-                     llvm::raw_ostream &OS) {
-    OS << toHex(toStringRef(S));
-  }
-
-  static StringRef input(StringRef Scalar, void *,
-                         std::array<unsigned char, 20> &Value) {
-    if (Scalar.size() != 40)
-      return "Error: Incorrect scalar size for USR.";
-    Value = StringToSymbol(Scalar);
-    return StringRef();
-  }
-
-  static SymbolID StringToSymbol(llvm::StringRef Value) {
-    SymbolID USR;
-    std::string HexString = fromHex(Value);
-    std::copy(HexString.begin(), HexString.end(), USR.begin());
-    return SymbolID(USR);
-  }
-
-  static QuotingType mustQuote(StringRef) { return QuotingType::Single; }
-};
-
-// Helper functions to map infos to YAML.
-
-static void TypeInfoMapping(IO &IO, TypeInfo &I) {
-  IO.mapOptional("Type", I.Type, Reference());
-}
-
-static void FieldTypeInfoMapping(IO &IO, FieldTypeInfo &I) {
-  TypeInfoMapping(IO, I);
-  IO.mapOptional("Name", I.Name, SmallString<16>());
-}
-
-static void InfoMapping(IO &IO, Info &I) {
-  IO.mapRequired("USR", I.USR);
-  IO.mapOptional("Name", I.Name, SmallString<16>());
-  IO.mapOptional("Namespace", I.Namespace, llvm::SmallVector<Reference, 4>());
-  IO.mapOptional("Description", I.Description);
-}
-
-static void SymbolInfoMapping(IO &IO, SymbolInfo &I) {
-  InfoMapping(IO, I);
-  IO.mapOptional("DefLocation", I.DefLoc, Optional<Location>());
-  IO.mapOptional("Location", I.Loc, llvm::SmallVector<Location, 2>());
-}
-
-static void CommentInfoMapping(IO &IO, CommentInfo &I) {
-  IO.mapOptional("Kind", I.Kind, SmallString<16>());
-  IO.mapOptional("Text", I.Text, SmallString<64>());
-  IO.mapOptional("Name", I.Name, SmallString<16>());
-  IO.mapOptional("Direction", I.Direction, SmallString<8>());
-  IO.mapOptional("ParamName", I.ParamName, SmallString<16>());
-  IO.mapOptional("CloseName", I.CloseName, SmallString<16>());
-  IO.mapOptional("SelfClosing", I.SelfClosing, false);
-  IO.mapOptional("Explicit", I.Explicit, false);
-  IO.mapOptional("Args", I.Args, llvm::SmallVector<SmallString<16>, 4>());
-  IO.mapOptional("AttrKeys", I.AttrKeys,
-                 llvm::SmallVector<SmallString<16>, 4>());
-  IO.mapOptional("AttrValues", I.AttrValues,
-                 llvm::SmallVector<SmallString<16>, 4>());
-  IO.mapOptional("Children", I.Children);
-}
-
-// Template specialization to YAML traits for Infos.
-
-template <> struct MappingTraits<Location> {
-  static void mapping(IO &IO, Location &Loc) {
-    IO.mapOptional("LineNumber", Loc.LineNumber, 0);
-    IO.mapOptional("Filename", Loc.Filename, SmallString<32>());
-  }
-};
-
-template <> struct MappingTraits<Reference> {
-  static void mapping(IO &IO, Reference &Ref) {
-    IO.mapOptional("Type", Ref.RefType, InfoType::IT_default);
-    IO.mapOptional("Name", Ref.Name, SmallString<16>());
-    IO.mapOptional("USR", Ref.USR, SymbolID());
-  }
-};
-
-template <> struct MappingTraits<TypeInfo> {
-  static void mapping(IO &IO, TypeInfo &I) { TypeInfoMapping(IO, I); }
-};
-
-template <> struct MappingTraits<FieldTypeInfo> {
-  static void mapping(IO &IO, FieldTypeInfo &I) {
-    TypeInfoMapping(IO, I);
-    IO.mapOptional("Name", I.Name, SmallString<16>());
-  }
-};
-
-template <> struct MappingTraits<MemberTypeInfo> {
-  static void mapping(IO &IO, MemberTypeInfo &I) {
-    FieldTypeInfoMapping(IO, I);
-    IO.mapOptional("Access", I.Access, clang::AccessSpecifier::AS_none);
-  }
-};
-
-template <> struct MappingTraits<NamespaceInfo> {
-  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> {
-  static void mapping(IO &IO, RecordInfo &I) {
-    SymbolInfoMapping(IO, I);
-    IO.mapOptional("TagType", I.TagType, clang::TagTypeKind::TTK_Struct);
-    IO.mapOptional("Members", I.Members);
-    IO.mapOptional("Parents", I.Parents, llvm::SmallVector<Reference, 4>());
-    IO.mapOptional("VirtualParents", I.VirtualParents,
-                   llvm::SmallVector<Reference, 4>());
-    IO.mapOptional("ChildRecords", I.ChildRecords, std::vector<Reference>());
-    IO.mapOptional("ChildFunctions", I.ChildFunctions);
-    IO.mapOptional("ChildEnums", I.ChildEnums);
-  }
-};
-
-template <> struct MappingTraits<EnumInfo> {
-  static void mapping(IO &IO, EnumInfo &I) {
-    SymbolInfoMapping(IO, I);
-    IO.mapOptional("Scoped", I.Scoped, false);
-    IO.mapOptional("Members", I.Members);
-  }
-};
-
-template <> struct MappingTraits<FunctionInfo> {
-  static void mapping(IO &IO, FunctionInfo &I) {
-    SymbolInfoMapping(IO, I);
-    IO.mapOptional("IsMethod", I.IsMethod, false);
-    IO.mapOptional("Parent", I.Parent, Reference());
-    IO.mapOptional("Params", I.Params);
-    IO.mapOptional("ReturnType", I.ReturnType);
-    IO.mapOptional("Access", I.Access, clang::AccessSpecifier::AS_none);
-  }
-};
-
-template <> struct MappingTraits<CommentInfo> {
-  static void mapping(IO &IO, CommentInfo &I) { CommentInfoMapping(IO, I); }
-};
-
-template <> struct MappingTraits<std::unique_ptr<CommentInfo>> {
-  static void mapping(IO &IO, std::unique_ptr<CommentInfo> &I) {
-    if (I)
-      CommentInfoMapping(IO, *I);
-  }
-};
-
-} // end namespace yaml
-} // end namespace llvm
-
-namespace clang {
-namespace doc {
-
-/// Generator for YAML documentation.
-class YAMLGenerator : public Generator {
-public:
-  static const char *Format;
-
-  llvm::Error generateDocForInfo(Info *I, llvm::raw_ostream &OS) override;
-};
-
-const char *YAMLGenerator::Format = "yaml";
-
-llvm::Error YAMLGenerator::generateDocForInfo(Info *I, llvm::raw_ostream &OS) {
-  llvm::yaml::Output InfoYAML(OS);
-  switch (I->IT) {
-  case InfoType::IT_namespace:
-    InfoYAML << *static_cast<clang::doc::NamespaceInfo *>(I);
-    break;
-  case InfoType::IT_record:
-    InfoYAML << *static_cast<clang::doc::RecordInfo *>(I);
-    break;
-  case InfoType::IT_enum:
-    InfoYAML << *static_cast<clang::doc::EnumInfo *>(I);
-    break;
-  case InfoType::IT_function:
-    InfoYAML << *static_cast<clang::doc::FunctionInfo *>(I);
-    break;
-  case InfoType::IT_default:
-    return llvm::make_error<llvm::StringError>("Unexpected info type.\n",
-                                               llvm::inconvertibleErrorCode());
-  }
-  return llvm::Error::success();
-}
-
-static GeneratorRegistry::Add<YAMLGenerator> YAML(YAMLGenerator::Format,
-                                                  "Generator for YAML output.");
-
-// This anchor is used to force the linker to link in the generated object file
-// and thus register the generator.
-volatile int YAMLGeneratorAnchorSource = 0;
-
-} // namespace doc
-} // namespace clang

clang-tools-extra/clang-doc/tool/CMakeLists.txt

@@ -1,17 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_clang_executable(clang-doc
-  ClangDocMain.cpp
-  )
-
-target_link_libraries(clang-doc
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangDoc
-  clangTooling
-  clangToolingCore
-  )
-  

clang-tools-extra/clang-doc/tool/ClangDocMain.cpp

@@ -1,244 +0,0 @@
-//===-- ClangDocMain.cpp - ClangDoc -----------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This tool for generating C and C++ documenation from source code
-// and comments. Generally, it runs a LibTooling FrontendAction on source files,
-// mapping each declaration in those files to its USR and serializing relevant
-// information into LLVM bitcode. It then runs a pass over the collected
-// declaration information, reducing by USR. There is an option to dump this
-// intermediate result to bitcode. Finally, it hands the reduced information
-// off to a generator, which does the final parsing from the intermediate
-// representation to the desired output format.
-//
-//===----------------------------------------------------------------------===//
-
-#include "BitcodeReader.h"
-#include "BitcodeWriter.h"
-#include "ClangDoc.h"
-#include "Generators.h"
-#include "Representation.h"
-#include "clang/AST/AST.h"
-#include "clang/AST/Decl.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchersInternal.h"
-#include "clang/Driver/Options.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Tooling/CommonOptionsParser.h"
-#include "clang/Tooling/Execution.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/APFloat.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/raw_ostream.h"
-#include <string>
-
-using namespace clang::ast_matchers;
-using namespace clang::tooling;
-using namespace clang;
-
-static llvm::cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage);
-static llvm::cl::OptionCategory ClangDocCategory("clang-doc options");
-
-static llvm::cl::opt<std::string>
-    OutDirectory("output",
-                 llvm::cl::desc("Directory for outputting generated files."),
-                 llvm::cl::init("docs"), llvm::cl::cat(ClangDocCategory));
-
-static llvm::cl::opt<bool>
-    PublicOnly("public", llvm::cl::desc("Document only public declarations."),
-               llvm::cl::init(false), llvm::cl::cat(ClangDocCategory));
-
-static llvm::cl::opt<bool> DoxygenOnly(
-    "doxygen",
-    llvm::cl::desc("Use only doxygen-style comments to generate docs."),
-    llvm::cl::init(false), llvm::cl::cat(ClangDocCategory));
-
-enum OutputFormatTy {
-  md,
-  yaml,
-};
-
-static llvm::cl::opt<OutputFormatTy>
-    FormatEnum("format", llvm::cl::desc("Format for outputted docs."),
-               llvm::cl::values(clEnumValN(OutputFormatTy::yaml, "yaml",
-                                           "Documentation in YAML format."),
-                                clEnumValN(OutputFormatTy::md, "md",
-                                           "Documentation in MD format.")),
-               llvm::cl::init(OutputFormatTy::yaml),
-               llvm::cl::cat(ClangDocCategory));
-
-std::string getFormatString() {
-  switch (FormatEnum) {
-  case OutputFormatTy::yaml:
-    return "yaml";
-  case OutputFormatTy::md:
-    return "md";
-  }
-  llvm_unreachable("Unknown OutputFormatTy");
-}
-
-bool CreateDirectory(const Twine &DirName, bool ClearDirectory = false) {
-  std::error_code OK;
-  llvm::SmallString<128> DocsRootPath;
-  if (ClearDirectory) {
-    std::error_code RemoveStatus = llvm::sys::fs::remove_directories(DirName);
-    if (RemoveStatus != OK) {
-      llvm::errs() << "Unable to remove existing documentation directory for "
-                   << DirName << ".\n";
-      return true;
-    }
-  }
-  std::error_code DirectoryStatus = llvm::sys::fs::create_directories(DirName);
-  if (DirectoryStatus != OK) {
-    llvm::errs() << "Unable to create documentation directories.\n";
-    return true;
-  }
-  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>>
-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);
-  for (auto R = Namespaces.rbegin(), E = Namespaces.rend(); R != E; ++R)
-    llvm::sys::path::append(Path, R->Name);
-
-  if (CreateDirectory(Path))
-    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;
-}
-
-// 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;
-
-  ExecutorName.setInitialValue("all-TUs");
-  auto Exec = clang::tooling::createExecutorFromCommandLineArgs(
-      argc, argv, ClangDocCategory);
-
-  if (!Exec) {
-    llvm::errs() << toString(Exec.takeError()) << "\n";
-    return 1;
-  }
-
-  // Fail early if an invalid format was provided.
-  std::string Format = getFormatString();
-  llvm::outs() << "Emiting docs in " << Format << " format.\n";
-  auto G = doc::findGeneratorByName(Format);
-  if (!G) {
-    llvm::errs() << toString(G.takeError()) << "\n";
-    return 1;
-  }
-
-  ArgumentsAdjuster ArgAdjuster;
-  if (!DoxygenOnly)
-    ArgAdjuster = combineAdjusters(
-        getInsertArgumentAdjuster("-fparse-all-comments",
-                                  tooling::ArgumentInsertPosition::END),
-        ArgAdjuster);
-
-  // Mapping phase
-  llvm::outs() << "Mapping decls...\n";
-  clang::doc::ClangDocContext CDCtx = {Exec->get()->getExecutionContext(),
-                                       PublicOnly};
-  auto Err =
-      Exec->get()->execute(doc::newMapperActionFactory(CDCtx), ArgAdjuster);
-  if (Err) {
-    llvm::errs() << toString(std::move(Err)) << "\n";
-    return 1;
-  }
-
-  // Collect values into output by key.
-  // In ToolResults, the Key is the hashed USR and the value is the
-  // bitcode-encoded representation of the Info object.
-  llvm::outs() << "Collecting infos...\n";
-  llvm::StringMap<std::vector<std::unique_ptr<doc::Info>>> USRToInfos;
-  if (bitcodeResultsToInfos(*Exec->get()->getToolResults(), USRToInfos))
-    return 1;
-
-  // 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) {
-      llvm::errs() << llvm::toString(Reduced.takeError());
-      continue;
-    }
-
-    doc::Info *I = Reduced.get().get();
-
-    auto InfoPath =
-        getInfoOutputFile(OutDirectory, I->Namespace, I->Name, "." + Format);
-    if (!InfoPath) {
-      llvm::errs() << toString(InfoPath.takeError()) << "\n";
-      continue;
-    }
-    std::error_code FileErr;
-    llvm::raw_fd_ostream InfoOS(InfoPath.get(), FileErr, llvm::sys::fs::F_None);
-    if (FileErr != OK) {
-      llvm::errs() << "Error opening info file: " << FileErr.message() << "\n";
-      continue;
-    }
-
-    if (auto Err = G->get()->generateDocForInfo(I, InfoOS))
-      llvm::errs() << toString(std::move(Err)) << "\n";
-  }
-
-  return 0;
-}

clang-tools-extra/clang-move/CMakeLists.txt

@@ -1,22 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  )
-
-add_clang_library(clangMove
-  ClangMove.cpp
-  HelperDeclRefGraph.cpp
-
-  LINK_LIBS
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangLex
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )
-
-add_subdirectory(tool)

clang-tools-extra/clang-move/ClangMove.cpp

@@ -1,938 +0,0 @@
-//===-- ClangMove.cpp - Implement ClangMove functationalities ---*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangMove.h"
-#include "HelperDeclRefGraph.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Format/Format.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/Core/Replacement.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Path.h"
-
-#define DEBUG_TYPE "clang-move"
-
-using namespace clang::ast_matchers;
-
-namespace clang {
-namespace move {
-namespace {
-
-// FIXME: Move to ASTMatchers.
-AST_MATCHER(VarDecl, isStaticDataMember) { return Node.isStaticDataMember(); }
-
-AST_MATCHER(NamedDecl, notInMacro) { return !Node.getLocation().isMacroID(); }
-
-AST_MATCHER_P(Decl, hasOutermostEnclosingClass,
-              ast_matchers::internal::Matcher<Decl>, InnerMatcher) {
-  const auto *Context = Node.getDeclContext();
-  if (!Context)
-    return false;
-  while (const auto *NextContext = Context->getParent()) {
-    if (isa<NamespaceDecl>(NextContext) ||
-        isa<TranslationUnitDecl>(NextContext))
-      break;
-    Context = NextContext;
-  }
-  return InnerMatcher.matches(*Decl::castFromDeclContext(Context), Finder,
-                              Builder);
-}
-
-AST_MATCHER_P(CXXMethodDecl, ofOutermostEnclosingClass,
-              ast_matchers::internal::Matcher<CXXRecordDecl>, InnerMatcher) {
-  const CXXRecordDecl *Parent = Node.getParent();
-  if (!Parent)
-    return false;
-  while (const auto *NextParent =
-             dyn_cast<CXXRecordDecl>(Parent->getParent())) {
-    Parent = NextParent;
-  }
-
-  return InnerMatcher.matches(*Parent, Finder, Builder);
-}
-
-std::string CleanPath(StringRef PathRef) {
-  llvm::SmallString<128> Path(PathRef);
-  llvm::sys::path::remove_dots(Path, /*remove_dot_dot=*/true);
-  // FIXME: figure out why this is necessary.
-  llvm::sys::path::native(Path);
-  return Path.str();
-}
-
-// Make the Path absolute using the CurrentDir if the Path is not an absolute
-// path. An empty Path will result in an empty string.
-std::string MakeAbsolutePath(StringRef CurrentDir, StringRef Path) {
-  if (Path.empty())
-    return "";
-  llvm::SmallString<128> InitialDirectory(CurrentDir);
-  llvm::SmallString<128> AbsolutePath(Path);
-  llvm::sys::fs::make_absolute(InitialDirectory, AbsolutePath);
-  return CleanPath(std::move(AbsolutePath));
-}
-
-// Make the Path absolute using the current working directory of the given
-// SourceManager if the Path is not an absolute path.
-//
-// The Path can be a path relative to the build directory, or retrieved from
-// the SourceManager.
-std::string MakeAbsolutePath(const SourceManager &SM, StringRef Path) {
-  llvm::SmallString<128> AbsolutePath(Path);
-  if (std::error_code EC =
-          SM.getFileManager().getVirtualFileSystem()->makeAbsolute(
-              AbsolutePath))
-    llvm::errs() << "Warning: could not make absolute file: '" << EC.message()
-                 << '\n';
-  // Handle symbolic link path cases.
-  // We are trying to get the real file path of the symlink.
-  const DirectoryEntry *Dir = SM.getFileManager().getDirectory(
-      llvm::sys::path::parent_path(AbsolutePath.str()));
-  if (Dir) {
-    StringRef DirName = SM.getFileManager().getCanonicalName(Dir);
-    // FIXME: getCanonicalName might fail to get real path on VFS.
-    if (llvm::sys::path::is_absolute(DirName)) {
-      SmallString<128> AbsoluteFilename;
-      llvm::sys::path::append(AbsoluteFilename, DirName,
-                              llvm::sys::path::filename(AbsolutePath.str()));
-      return CleanPath(AbsoluteFilename);
-    }
-  }
-  return CleanPath(AbsolutePath);
-}
-
-// Matches AST nodes that are expanded within the given AbsoluteFilePath.
-AST_POLYMORPHIC_MATCHER_P(isExpansionInFile,
-                          AST_POLYMORPHIC_SUPPORTED_TYPES(Decl, Stmt, TypeLoc),
-                          std::string, AbsoluteFilePath) {
-  auto &SourceManager = Finder->getASTContext().getSourceManager();
-  auto ExpansionLoc = SourceManager.getExpansionLoc(Node.getBeginLoc());
-  if (ExpansionLoc.isInvalid())
-    return false;
-  auto FileEntry =
-      SourceManager.getFileEntryForID(SourceManager.getFileID(ExpansionLoc));
-  if (!FileEntry)
-    return false;
-  return MakeAbsolutePath(SourceManager, FileEntry->getName()) ==
-         AbsoluteFilePath;
-}
-
-class FindAllIncludes : public PPCallbacks {
-public:
-  explicit FindAllIncludes(SourceManager *SM, ClangMoveTool *const MoveTool)
-      : SM(*SM), MoveTool(MoveTool) {}
-
-  void InclusionDirective(SourceLocation HashLoc, const Token & /*IncludeTok*/,
-                          StringRef FileName, bool IsAngled,
-                          CharSourceRange FilenameRange,
-                          const FileEntry * /*File*/, StringRef SearchPath,
-                          StringRef /*RelativePath*/,
-                          const Module * /*Imported*/,
-                          SrcMgr::CharacteristicKind /*FileType*/) override {
-    if (const auto *FileEntry = SM.getFileEntryForID(SM.getFileID(HashLoc)))
-      MoveTool->addIncludes(FileName, IsAngled, SearchPath,
-                            FileEntry->getName(), FilenameRange, SM);
-  }
-
-private:
-  const SourceManager &SM;
-  ClangMoveTool *const MoveTool;
-};
-
-/// Add a declatration being moved to new.h/cc. Note that the declaration will
-/// also be deleted in old.h/cc.
-void MoveDeclFromOldFileToNewFile(ClangMoveTool *MoveTool, const NamedDecl *D) {
-  MoveTool->getMovedDecls().push_back(D);
-  MoveTool->addRemovedDecl(D);
-  MoveTool->getUnremovedDeclsInOldHeader().erase(D);
-}
-
-class FunctionDeclarationMatch : public MatchFinder::MatchCallback {
-public:
-  explicit FunctionDeclarationMatch(ClangMoveTool *MoveTool)
-      : MoveTool(MoveTool) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    const auto *FD = Result.Nodes.getNodeAs<FunctionDecl>("function");
-    assert(FD);
-    const NamedDecl *D = FD;
-    if (const auto *FTD = FD->getDescribedFunctionTemplate())
-      D = FTD;
-    MoveDeclFromOldFileToNewFile(MoveTool, D);
-  }
-
-private:
-  ClangMoveTool *MoveTool;
-};
-
-class VarDeclarationMatch : public MatchFinder::MatchCallback {
-public:
-  explicit VarDeclarationMatch(ClangMoveTool *MoveTool)
-      : MoveTool(MoveTool) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    const auto *VD = Result.Nodes.getNodeAs<VarDecl>("var");
-    assert(VD);
-    MoveDeclFromOldFileToNewFile(MoveTool, VD);
-  }
-
-private:
-  ClangMoveTool *MoveTool;
-};
-
-class TypeAliasMatch : public MatchFinder::MatchCallback {
-public:
-  explicit TypeAliasMatch(ClangMoveTool *MoveTool)
-      : MoveTool(MoveTool) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    if (const auto *TD = Result.Nodes.getNodeAs<TypedefDecl>("typedef"))
-      MoveDeclFromOldFileToNewFile(MoveTool, TD);
-    else if (const auto *TAD =
-                 Result.Nodes.getNodeAs<TypeAliasDecl>("type_alias")) {
-      const NamedDecl * D = TAD;
-      if (const auto * TD = TAD->getDescribedAliasTemplate())
-        D = TD;
-      MoveDeclFromOldFileToNewFile(MoveTool, D);
-    }
-  }
-
-private:
-  ClangMoveTool *MoveTool;
-};
-
-class EnumDeclarationMatch : public MatchFinder::MatchCallback {
-public:
-  explicit EnumDeclarationMatch(ClangMoveTool *MoveTool)
-      : MoveTool(MoveTool) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    const auto *ED = Result.Nodes.getNodeAs<EnumDecl>("enum");
-    assert(ED);
-    MoveDeclFromOldFileToNewFile(MoveTool, ED);
-  }
-
-private:
-  ClangMoveTool *MoveTool;
-};
-
-class ClassDeclarationMatch : public MatchFinder::MatchCallback {
-public:
-  explicit ClassDeclarationMatch(ClangMoveTool *MoveTool)
-      : MoveTool(MoveTool) {}
-  void run(const MatchFinder::MatchResult &Result) override {
-    SourceManager *SM = &Result.Context->getSourceManager();
-    if (const auto *CMD = Result.Nodes.getNodeAs<CXXMethodDecl>("class_method"))
-      MatchClassMethod(CMD, SM);
-    else if (const auto *VD =
-                 Result.Nodes.getNodeAs<VarDecl>("class_static_var_decl"))
-      MatchClassStaticVariable(VD, SM);
-    else if (const auto *CD =
-                 Result.Nodes.getNodeAs<CXXRecordDecl>("moved_class"))
-      MatchClassDeclaration(CD, SM);
-  }
-
-private:
-  void MatchClassMethod(const CXXMethodDecl *CMD, SourceManager *SM) {
-    // Skip inline class methods. isInline() ast matcher doesn't ignore this
-    // case.
-    if (!CMD->isInlined()) {
-      MoveTool->getMovedDecls().push_back(CMD);
-      MoveTool->addRemovedDecl(CMD);
-      // Get template class method from its method declaration as
-      // UnremovedDecls stores template class method.
-      if (const auto *FTD = CMD->getDescribedFunctionTemplate())
-        MoveTool->getUnremovedDeclsInOldHeader().erase(FTD);
-      else
-        MoveTool->getUnremovedDeclsInOldHeader().erase(CMD);
-    }
-  }
-
-  void MatchClassStaticVariable(const NamedDecl *VD, SourceManager *SM) {
-    MoveDeclFromOldFileToNewFile(MoveTool, VD);
-  }
-
-  void MatchClassDeclaration(const CXXRecordDecl *CD, SourceManager *SM) {
-    // Get class template from its class declaration as UnremovedDecls stores
-    // class template.
-    if (const auto *TC = CD->getDescribedClassTemplate())
-      MoveTool->getMovedDecls().push_back(TC);
-    else
-      MoveTool->getMovedDecls().push_back(CD);
-    MoveTool->addRemovedDecl(MoveTool->getMovedDecls().back());
-    MoveTool->getUnremovedDeclsInOldHeader().erase(
-        MoveTool->getMovedDecls().back());
-  }
-
-  ClangMoveTool *MoveTool;
-};
-
-// Expand to get the end location of the line where the EndLoc of the given
-// Decl.
-SourceLocation getLocForEndOfDecl(const Decl *D,
-                                  const LangOptions &LangOpts = LangOptions()) {
-  const auto &SM = D->getASTContext().getSourceManager();
-  // If the expansion range is a character range, this is the location of
-  // the first character past the end. Otherwise it's the location of the
-  // first character in the final token in the range.
-  auto EndExpansionLoc = SM.getExpansionRange(D->getEndLoc()).getEnd();
-  std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(EndExpansionLoc);
-  // Try to load the file buffer.
-  bool InvalidTemp = false;
-  llvm::StringRef File = SM.getBufferData(LocInfo.first, &InvalidTemp);
-  if (InvalidTemp)
-    return SourceLocation();
-
-  const char *TokBegin = File.data() + LocInfo.second;
-  // Lex from the start of the given location.
-  Lexer Lex(SM.getLocForStartOfFile(LocInfo.first), LangOpts, File.begin(),
-            TokBegin, File.end());
-
-  llvm::SmallVector<char, 16> Line;
-  // FIXME: this is a bit hacky to get ReadToEndOfLine work.
-  Lex.setParsingPreprocessorDirective(true);
-  Lex.ReadToEndOfLine(&Line);
-  SourceLocation EndLoc = EndExpansionLoc.getLocWithOffset(Line.size());
-  // If we already reach EOF, just return the EOF SourceLocation;
-  // otherwise, move 1 offset ahead to include the trailing newline character
-  // '\n'.
-  return SM.getLocForEndOfFile(LocInfo.first) == EndLoc
-             ? EndLoc
-             : EndLoc.getLocWithOffset(1);
-}
-
-// Get full range of a Decl including the comments associated with it.
-CharSourceRange getFullRange(const Decl *D,
-                             const LangOptions &options = LangOptions()) {
-  const auto &SM = D->getASTContext().getSourceManager();
-  SourceRange Full(SM.getExpansionLoc(D->getBeginLoc()), getLocForEndOfDecl(D));
-  // Expand to comments that are associated with the Decl.
-  if (const auto *Comment = D->getASTContext().getRawCommentForDeclNoCache(D)) {
-    if (SM.isBeforeInTranslationUnit(Full.getEnd(), Comment->getEndLoc()))
-      Full.setEnd(Comment->getEndLoc());
-    // FIXME: Don't delete a preceding comment, if there are no other entities
-    // it could refer to.
-    if (SM.isBeforeInTranslationUnit(Comment->getBeginLoc(), Full.getBegin()))
-      Full.setBegin(Comment->getBeginLoc());
-  }
-
-  return CharSourceRange::getCharRange(Full);
-}
-
-std::string getDeclarationSourceText(const Decl *D) {
-  const auto &SM = D->getASTContext().getSourceManager();
-  llvm::StringRef SourceText =
-      Lexer::getSourceText(getFullRange(D), SM, LangOptions());
-  return SourceText.str();
-}
-
-bool isInHeaderFile(const Decl *D, llvm::StringRef OriginalRunningDirectory,
-                    llvm::StringRef OldHeader) {
-  const auto &SM = D->getASTContext().getSourceManager();
-  if (OldHeader.empty())
-    return false;
-  auto ExpansionLoc = SM.getExpansionLoc(D->getBeginLoc());
-  if (ExpansionLoc.isInvalid())
-    return false;
-
-  if (const auto *FE = SM.getFileEntryForID(SM.getFileID(ExpansionLoc))) {
-    return MakeAbsolutePath(SM, FE->getName()) ==
-           MakeAbsolutePath(OriginalRunningDirectory, OldHeader);
-  }
-
-  return false;
-}
-
-std::vector<std::string> getNamespaces(const Decl *D) {
-  std::vector<std::string> Namespaces;
-  for (const auto *Context = D->getDeclContext(); Context;
-       Context = Context->getParent()) {
-    if (llvm::isa<TranslationUnitDecl>(Context) ||
-        llvm::isa<LinkageSpecDecl>(Context))
-      break;
-
-    if (const auto *ND = llvm::dyn_cast<NamespaceDecl>(Context))
-      Namespaces.push_back(ND->getName().str());
-  }
-  std::reverse(Namespaces.begin(), Namespaces.end());
-  return Namespaces;
-}
-
-tooling::Replacements
-createInsertedReplacements(const std::vector<std::string> &Includes,
-                           const std::vector<const NamedDecl *> &Decls,
-                           llvm::StringRef FileName, bool IsHeader = false,
-                           StringRef OldHeaderInclude = "") {
-  std::string NewCode;
-  std::string GuardName(FileName);
-  if (IsHeader) {
-    for (size_t i = 0; i < GuardName.size(); ++i) {
-      if (!isAlphanumeric(GuardName[i]))
-        GuardName[i] = '_';
-    }
-    GuardName = StringRef(GuardName).upper();
-    NewCode += "#ifndef " + GuardName + "\n";
-    NewCode += "#define " + GuardName + "\n\n";
-  }
-
-  NewCode += OldHeaderInclude;
-  // Add #Includes.
-  for (const auto &Include : Includes)
-    NewCode += Include;
-
-  if (!Includes.empty())
-    NewCode += "\n";
-
-  // Add moved class definition and its related declarations. All declarations
-  // in same namespace are grouped together.
-  //
-  // Record namespaces where the current position is in.
-  std::vector<std::string> CurrentNamespaces;
-  for (const auto *MovedDecl : Decls) {
-    // The namespaces of the declaration being moved.
-    std::vector<std::string> DeclNamespaces = getNamespaces(MovedDecl);
-    auto CurrentIt = CurrentNamespaces.begin();
-    auto DeclIt = DeclNamespaces.begin();
-    // Skip the common prefix.
-    while (CurrentIt != CurrentNamespaces.end() &&
-           DeclIt != DeclNamespaces.end()) {
-      if (*CurrentIt != *DeclIt)
-        break;
-      ++CurrentIt;
-      ++DeclIt;
-    }
-    // Calculate the new namespaces after adding MovedDecl in CurrentNamespace,
-    // which is used for next iteration of this loop.
-    std::vector<std::string> NextNamespaces(CurrentNamespaces.begin(),
-                                            CurrentIt);
-    NextNamespaces.insert(NextNamespaces.end(), DeclIt, DeclNamespaces.end());
-
-
-    // End with CurrentNamespace.
-    bool HasEndCurrentNamespace = false;
-    auto RemainingSize = CurrentNamespaces.end() - CurrentIt;
-    for (auto It = CurrentNamespaces.rbegin(); RemainingSize > 0;
-         --RemainingSize, ++It) {
-      assert(It < CurrentNamespaces.rend());
-      NewCode += "} // namespace " + *It + "\n";
-      HasEndCurrentNamespace = true;
-    }
-    // Add trailing '\n' after the nested namespace definition.
-    if (HasEndCurrentNamespace)
-      NewCode += "\n";
-
-    // If the moved declaration is not in CurrentNamespace, add extra namespace
-    // definitions.
-    bool IsInNewNamespace = false;
-    while (DeclIt != DeclNamespaces.end()) {
-      NewCode += "namespace " + *DeclIt + " {\n";
-      IsInNewNamespace = true;
-      ++DeclIt;
-    }
-    // If the moved declaration is in same namespace CurrentNamespace, add
-    // a preceeding `\n' before the moved declaration.
-    // FIXME: Don't add empty lines between using declarations.
-    if (!IsInNewNamespace)
-      NewCode += "\n";
-    NewCode += getDeclarationSourceText(MovedDecl);
-    CurrentNamespaces = std::move(NextNamespaces);
-  }
-  std::reverse(CurrentNamespaces.begin(), CurrentNamespaces.end());
-  for (const auto &NS : CurrentNamespaces)
-    NewCode += "} // namespace " + NS + "\n";
-
-  if (IsHeader)
-    NewCode += "\n#endif // " + GuardName + "\n";
-  return tooling::Replacements(tooling::Replacement(FileName, 0, 0, NewCode));
-}
-
-// Return a set of all decls which are used/referenced by the given Decls.
-// Specically, given a class member declaration, this method will return all
-// decls which are used by the whole class.
-llvm::DenseSet<const Decl *>
-getUsedDecls(const HelperDeclRefGraph *RG,
-             const std::vector<const NamedDecl *> &Decls) {
-  assert(RG);
-  llvm::DenseSet<const CallGraphNode *> Nodes;
-  for (const auto *D : Decls) {
-    auto Result = RG->getReachableNodes(
-        HelperDeclRGBuilder::getOutmostClassOrFunDecl(D));
-    Nodes.insert(Result.begin(), Result.end());
-  }
-  llvm::DenseSet<const Decl *> Results;
-  for (const auto *Node : Nodes)
-    Results.insert(Node->getDecl());
-  return Results;
-}
-
-} // namespace
-
-std::unique_ptr<ASTConsumer>
-ClangMoveAction::CreateASTConsumer(CompilerInstance &Compiler,
-                                   StringRef /*InFile*/) {
-  Compiler.getPreprocessor().addPPCallbacks(llvm::make_unique<FindAllIncludes>(
-      &Compiler.getSourceManager(), &MoveTool));
-  return MatchFinder.newASTConsumer();
-}
-
-ClangMoveTool::ClangMoveTool(ClangMoveContext *const Context,
-                             DeclarationReporter *const Reporter)
-    : Context(Context), Reporter(Reporter) {
-  if (!Context->Spec.NewHeader.empty())
-    CCIncludes.push_back("#include \"" + Context->Spec.NewHeader + "\"\n");
-}
-
-void ClangMoveTool::addRemovedDecl(const NamedDecl *Decl) {
-  const auto &SM = Decl->getASTContext().getSourceManager();
-  auto Loc = Decl->getLocation();
-  StringRef FilePath = SM.getFilename(Loc);
-  FilePathToFileID[FilePath] = SM.getFileID(Loc);
-  RemovedDecls.push_back(Decl);
-}
-
-void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) {
-  auto InOldHeader =
-      isExpansionInFile(makeAbsolutePath(Context->Spec.OldHeader));
-  auto InOldCC = isExpansionInFile(makeAbsolutePath(Context->Spec.OldCC));
-  auto InOldFiles = anyOf(InOldHeader, InOldCC);
-  auto classTemplateForwardDecls =
-      classTemplateDecl(unless(has(cxxRecordDecl(isDefinition()))));
-  auto ForwardClassDecls = namedDecl(
-      anyOf(cxxRecordDecl(unless(anyOf(isImplicit(), isDefinition()))),
-            classTemplateForwardDecls));
-  auto TopLevelDecl =
-      hasDeclContext(anyOf(namespaceDecl(), translationUnitDecl()));
-
-  //============================================================================
-  // Matchers for old header
-  //============================================================================
-  // Match all top-level named declarations (e.g. function, variable, enum) in
-  // old header, exclude forward class declarations and namespace declarations.
-  //
-  // We consider declarations inside a class belongs to the class. So these
-  // declarations will be ignored.
-  auto AllDeclsInHeader = namedDecl(
-      unless(ForwardClassDecls), unless(namespaceDecl()),
-      unless(usingDirectiveDecl()), // using namespace decl.
-      notInMacro(),
-      InOldHeader,
-      hasParent(decl(anyOf(namespaceDecl(), translationUnitDecl()))),
-      hasDeclContext(decl(anyOf(namespaceDecl(), translationUnitDecl()))));
-  Finder->addMatcher(AllDeclsInHeader.bind("decls_in_header"), this);
-
-  // Don't register other matchers when dumping all declarations in header.
-  if (Context->DumpDeclarations)
-    return;
-
-  // Match forward declarations in old header.
-  Finder->addMatcher(namedDecl(ForwardClassDecls, InOldHeader).bind("fwd_decl"),
-                     this);
-
-  //============================================================================
-  // Matchers for old cc
-  //============================================================================
-  auto IsOldCCTopLevelDecl = allOf(
-      hasParent(decl(anyOf(namespaceDecl(), translationUnitDecl()))), InOldCC);
-  // Matching using decls/type alias decls which are in named/anonymous/global
-  // namespace, these decls are always copied to new.h/cc. Those in classes,
-  // functions are covered in other matchers.
-  Finder->addMatcher(namedDecl(anyOf(usingDecl(IsOldCCTopLevelDecl),
-                                     usingDirectiveDecl(unless(isImplicit()),
-                                                        IsOldCCTopLevelDecl),
-                                     typeAliasDecl(IsOldCCTopLevelDecl)),
-                               notInMacro())
-                         .bind("using_decl"),
-                     this);
-
-  // Match static functions/variable definitions which are defined in named
-  // namespaces.
-  Optional<ast_matchers::internal::Matcher<NamedDecl>> HasAnySymbolNames;
-  for (StringRef SymbolName : Context->Spec.Names) {
-    llvm::StringRef GlobalSymbolName = SymbolName.trim().ltrim(':');
-    const auto HasName = hasName(("::" + GlobalSymbolName).str());
-    HasAnySymbolNames =
-        HasAnySymbolNames ? anyOf(*HasAnySymbolNames, HasName) : HasName;
-  }
-
-  if (!HasAnySymbolNames) {
-    llvm::errs() << "No symbols being moved.\n";
-    return;
-  }
-  auto InMovedClass =
-      hasOutermostEnclosingClass(cxxRecordDecl(*HasAnySymbolNames));
-
-  // Matchers for helper declarations in old.cc.
-  auto InAnonymousNS = hasParent(namespaceDecl(isAnonymous()));
-  auto NotInMovedClass= allOf(unless(InMovedClass), InOldCC);
-  auto IsOldCCHelper =
-      allOf(NotInMovedClass, anyOf(isStaticStorageClass(), InAnonymousNS));
-  // Match helper classes separately with helper functions/variables since we
-  // want to reuse these matchers in finding helpers usage below.
-  //
-  // There could be forward declarations usage for helpers, especially for
-  // classes and functions. We need include these forward declarations.
-  //
-  // Forward declarations for variable helpers will be excluded as these
-  // declarations (with "extern") are not supposed in cpp file.
-   auto HelperFuncOrVar =
-      namedDecl(notInMacro(), anyOf(functionDecl(IsOldCCHelper),
-                                    varDecl(isDefinition(), IsOldCCHelper)));
-  auto HelperClasses =
-      cxxRecordDecl(notInMacro(), NotInMovedClass, InAnonymousNS);
-  // Save all helper declarations in old.cc.
-  Finder->addMatcher(
-      namedDecl(anyOf(HelperFuncOrVar, HelperClasses)).bind("helper_decls"),
-      this);
-
-  // Construct an AST-based call graph of helper declarations in old.cc.
-  // In the following matcheres, "dc" is a caller while "helper_decls" and
-  // "used_class" is a callee, so a new edge starting from caller to callee will
-  // be add in the graph.
-  //
-  // Find helper function/variable usages.
-  Finder->addMatcher(
-      declRefExpr(to(HelperFuncOrVar), hasAncestor(decl().bind("dc")))
-          .bind("func_ref"),
-      &RGBuilder);
-  // Find helper class usages.
-  Finder->addMatcher(
-      typeLoc(loc(recordType(hasDeclaration(HelperClasses.bind("used_class")))),
-              hasAncestor(decl().bind("dc"))),
-      &RGBuilder);
-
-  //============================================================================
-  // Matchers for old files, including old.h/old.cc
-  //============================================================================
-  // Create a MatchCallback for class declarations.
-  MatchCallbacks.push_back(llvm::make_unique<ClassDeclarationMatch>(this));
-  // Match moved class declarations.
-  auto MovedClass = cxxRecordDecl(InOldFiles, *HasAnySymbolNames,
-                                  isDefinition(), TopLevelDecl)
-                        .bind("moved_class");
-  Finder->addMatcher(MovedClass, MatchCallbacks.back().get());
-  // Match moved class methods (static methods included) which are defined
-  // outside moved class declaration.
-  Finder->addMatcher(
-      cxxMethodDecl(InOldFiles, ofOutermostEnclosingClass(*HasAnySymbolNames),
-                    isDefinition())
-          .bind("class_method"),
-      MatchCallbacks.back().get());
-  // Match static member variable definition of the moved class.
-  Finder->addMatcher(
-      varDecl(InMovedClass, InOldFiles, isDefinition(), isStaticDataMember())
-          .bind("class_static_var_decl"),
-      MatchCallbacks.back().get());
-
-  MatchCallbacks.push_back(llvm::make_unique<FunctionDeclarationMatch>(this));
-  Finder->addMatcher(functionDecl(InOldFiles, *HasAnySymbolNames, TopLevelDecl)
-                         .bind("function"),
-                     MatchCallbacks.back().get());
-
-  MatchCallbacks.push_back(llvm::make_unique<VarDeclarationMatch>(this));
-  Finder->addMatcher(
-      varDecl(InOldFiles, *HasAnySymbolNames, TopLevelDecl).bind("var"),
-      MatchCallbacks.back().get());
-
-  // Match enum definition in old.h. Enum helpers (which are defined in old.cc)
-  // will not be moved for now no matter whether they are used or not.
-  MatchCallbacks.push_back(llvm::make_unique<EnumDeclarationMatch>(this));
-  Finder->addMatcher(
-      enumDecl(InOldHeader, *HasAnySymbolNames, isDefinition(), TopLevelDecl)
-          .bind("enum"),
-      MatchCallbacks.back().get());
-
-  // Match type alias in old.h, this includes "typedef" and "using" type alias
-  // declarations. Type alias helpers (which are defined in old.cc) will not be
-  // moved for now no matter whether they are used or not.
-  MatchCallbacks.push_back(llvm::make_unique<TypeAliasMatch>(this));
-  Finder->addMatcher(namedDecl(anyOf(typedefDecl().bind("typedef"),
-                                     typeAliasDecl().bind("type_alias")),
-                               InOldHeader, *HasAnySymbolNames, TopLevelDecl),
-                     MatchCallbacks.back().get());
-}
-
-void ClangMoveTool::run(const ast_matchers::MatchFinder::MatchResult &Result) {
-  if (const auto *D = Result.Nodes.getNodeAs<NamedDecl>("decls_in_header")) {
-    UnremovedDeclsInOldHeader.insert(D);
-  } else if (const auto *FWD =
-                 Result.Nodes.getNodeAs<CXXRecordDecl>("fwd_decl")) {
-    // Skip all forward declarations which appear after moved class declaration.
-    if (RemovedDecls.empty()) {
-      if (const auto *DCT = FWD->getDescribedClassTemplate())
-        MovedDecls.push_back(DCT);
-      else
-        MovedDecls.push_back(FWD);
-    }
-  } else if (const auto *ND =
-                 Result.Nodes.getNodeAs<NamedDecl>("helper_decls")) {
-    MovedDecls.push_back(ND);
-    HelperDeclarations.push_back(ND);
-    LLVM_DEBUG(llvm::dbgs() << "Add helper : " << ND->getNameAsString() << " ("
-                            << ND << ")\n");
-  } else if (const auto *UD = Result.Nodes.getNodeAs<NamedDecl>("using_decl")) {
-    MovedDecls.push_back(UD);
-  }
-}
-
-std::string ClangMoveTool::makeAbsolutePath(StringRef Path) {
-  return MakeAbsolutePath(Context->OriginalRunningDirectory, Path);
-}
-
-void ClangMoveTool::addIncludes(llvm::StringRef IncludeHeader, bool IsAngled,
-                                llvm::StringRef SearchPath,
-                                llvm::StringRef FileName,
-                                CharSourceRange IncludeFilenameRange,
-                                const SourceManager &SM) {
-  SmallVector<char, 128> HeaderWithSearchPath;
-  llvm::sys::path::append(HeaderWithSearchPath, SearchPath, IncludeHeader);
-  std::string AbsoluteIncludeHeader =
-      MakeAbsolutePath(SM, llvm::StringRef(HeaderWithSearchPath.data(),
-                                           HeaderWithSearchPath.size()));
-  std::string IncludeLine =
-      IsAngled ? ("#include <" + IncludeHeader + ">\n").str()
-               : ("#include \"" + IncludeHeader + "\"\n").str();
-
-  std::string AbsoluteOldHeader = makeAbsolutePath(Context->Spec.OldHeader);
-  std::string AbsoluteCurrentFile = MakeAbsolutePath(SM, FileName);
-  if (AbsoluteOldHeader == AbsoluteCurrentFile) {
-    // Find old.h includes "old.h".
-    if (AbsoluteOldHeader == AbsoluteIncludeHeader) {
-      OldHeaderIncludeRangeInHeader = IncludeFilenameRange;
-      return;
-    }
-    HeaderIncludes.push_back(IncludeLine);
-  } else if (makeAbsolutePath(Context->Spec.OldCC) == AbsoluteCurrentFile) {
-    // Find old.cc includes "old.h".
-    if (AbsoluteOldHeader == AbsoluteIncludeHeader) {
-      OldHeaderIncludeRangeInCC = IncludeFilenameRange;
-      return;
-    }
-    CCIncludes.push_back(IncludeLine);
-  }
-}
-
-void ClangMoveTool::removeDeclsInOldFiles() {
-  if (RemovedDecls.empty()) return;
-
-  // If old_header is not specified (only move declarations from old.cc), remain
-  // all the helper function declarations in old.cc as UnremovedDeclsInOldHeader
-  // is empty in this case, there is no way to verify unused/used helpers.
-  if (!Context->Spec.OldHeader.empty()) {
-    std::vector<const NamedDecl *> UnremovedDecls;
-    for (const auto *D : UnremovedDeclsInOldHeader)
-      UnremovedDecls.push_back(D);
-
-    auto UsedDecls = getUsedDecls(RGBuilder.getGraph(), UnremovedDecls);
-
-    // We remove the helper declarations which are not used in the old.cc after
-    // moving the given declarations.
-    for (const auto *D : HelperDeclarations) {
-      LLVM_DEBUG(llvm::dbgs() << "Check helper is used: "
-                              << D->getNameAsString() << " (" << D << ")\n");
-      if (!UsedDecls.count(HelperDeclRGBuilder::getOutmostClassOrFunDecl(
-              D->getCanonicalDecl()))) {
-        LLVM_DEBUG(llvm::dbgs() << "Helper removed in old.cc: "
-                                << D->getNameAsString() << " (" << D << ")\n");
-        RemovedDecls.push_back(D);
-      }
-    }
-  }
-
-  for (const auto *RemovedDecl : RemovedDecls) {
-    const auto &SM = RemovedDecl->getASTContext().getSourceManager();
-    auto Range = getFullRange(RemovedDecl);
-    tooling::Replacement RemoveReplacement(
-        SM, CharSourceRange::getCharRange(Range.getBegin(), Range.getEnd()),
-        "");
-    std::string FilePath = RemoveReplacement.getFilePath().str();
-    auto Err = Context->FileToReplacements[FilePath].add(RemoveReplacement);
-    if (Err)
-      llvm::errs() << llvm::toString(std::move(Err)) << "\n";
-  }
-  const auto &SM = RemovedDecls[0]->getASTContext().getSourceManager();
-
-  // Post process of cleanup around all the replacements.
-  for (auto &FileAndReplacements : Context->FileToReplacements) {
-    StringRef FilePath = FileAndReplacements.first;
-    // Add #include of new header to old header.
-    if (Context->Spec.OldDependOnNew &&
-        MakeAbsolutePath(SM, FilePath) ==
-            makeAbsolutePath(Context->Spec.OldHeader)) {
-      // FIXME: Minimize the include path like include-fixer.
-      std::string IncludeNewH =
-          "#include \"" + Context->Spec.NewHeader + "\"\n";
-      // This replacment for inserting header will be cleaned up at the end.
-      auto Err = FileAndReplacements.second.add(
-          tooling::Replacement(FilePath, UINT_MAX, 0, IncludeNewH));
-      if (Err)
-        llvm::errs() << llvm::toString(std::move(Err)) << "\n";
-    }
-
-    auto SI = FilePathToFileID.find(FilePath);
-    // Ignore replacements for new.h/cc.
-    if (SI == FilePathToFileID.end()) continue;
-    llvm::StringRef Code = SM.getBufferData(SI->second);
-    auto Style = format::getStyle(format::DefaultFormatStyle, FilePath,
-                                  Context->FallbackStyle);
-    if (!Style) {
-      llvm::errs() << llvm::toString(Style.takeError()) << "\n";
-      continue;
-    }
-    auto CleanReplacements = format::cleanupAroundReplacements(
-        Code, Context->FileToReplacements[FilePath], *Style);
-
-    if (!CleanReplacements) {
-      llvm::errs() << llvm::toString(CleanReplacements.takeError()) << "\n";
-      continue;
-    }
-    Context->FileToReplacements[FilePath] = *CleanReplacements;
-  }
-}
-
-void ClangMoveTool::moveDeclsToNewFiles() {
-  std::vector<const NamedDecl *> NewHeaderDecls;
-  std::vector<const NamedDecl *> NewCCDecls;
-  for (const auto *MovedDecl : MovedDecls) {
-    if (isInHeaderFile(MovedDecl, Context->OriginalRunningDirectory,
-                       Context->Spec.OldHeader))
-      NewHeaderDecls.push_back(MovedDecl);
-    else
-      NewCCDecls.push_back(MovedDecl);
-  }
-
-  auto UsedDecls = getUsedDecls(RGBuilder.getGraph(), RemovedDecls);
-  std::vector<const NamedDecl *> ActualNewCCDecls;
-
-  // Filter out all unused helpers in NewCCDecls.
-  // We only move the used helpers (including transively used helpers) and the
-  // given symbols being moved.
-  for (const auto *D : NewCCDecls) {
-    if (llvm::is_contained(HelperDeclarations, D) &&
-        !UsedDecls.count(HelperDeclRGBuilder::getOutmostClassOrFunDecl(
-            D->getCanonicalDecl())))
-      continue;
-
-    LLVM_DEBUG(llvm::dbgs() << "Helper used in new.cc: " << D->getNameAsString()
-                            << " " << D << "\n");
-    ActualNewCCDecls.push_back(D);
-  }
-
-  if (!Context->Spec.NewHeader.empty()) {
-    std::string OldHeaderInclude =
-        Context->Spec.NewDependOnOld
-            ? "#include \"" + Context->Spec.OldHeader + "\"\n"
-            : "";
-    Context->FileToReplacements[Context->Spec.NewHeader] =
-        createInsertedReplacements(HeaderIncludes, NewHeaderDecls,
-                                   Context->Spec.NewHeader, /*IsHeader=*/true,
-                                   OldHeaderInclude);
-  }
-  if (!Context->Spec.NewCC.empty())
-    Context->FileToReplacements[Context->Spec.NewCC] =
-        createInsertedReplacements(CCIncludes, ActualNewCCDecls,
-                                   Context->Spec.NewCC);
-}
-
-// Move all contents from OldFile to NewFile.
-void ClangMoveTool::moveAll(SourceManager &SM, StringRef OldFile,
-                            StringRef NewFile) {
-  const FileEntry *FE = SM.getFileManager().getFile(makeAbsolutePath(OldFile));
-  if (!FE) {
-    llvm::errs() << "Failed to get file: " << OldFile << "\n";
-    return;
-  }
-  FileID ID = SM.getOrCreateFileID(FE, SrcMgr::C_User);
-  auto Begin = SM.getLocForStartOfFile(ID);
-  auto End = SM.getLocForEndOfFile(ID);
-  tooling::Replacement RemoveAll(SM, CharSourceRange::getCharRange(Begin, End),
-                                 "");
-  std::string FilePath = RemoveAll.getFilePath().str();
-  Context->FileToReplacements[FilePath] = tooling::Replacements(RemoveAll);
-
-  StringRef Code = SM.getBufferData(ID);
-  if (!NewFile.empty()) {
-    auto AllCode =
-        tooling::Replacements(tooling::Replacement(NewFile, 0, 0, Code));
-    auto ReplaceOldInclude = [&](CharSourceRange OldHeaderIncludeRange) {
-      AllCode = AllCode.merge(tooling::Replacements(tooling::Replacement(
-          SM, OldHeaderIncludeRange, '"' + Context->Spec.NewHeader + '"')));
-    };
-    // Fix the case where old.h/old.cc includes "old.h", we replace the
-    // `#include "old.h"` with `#include "new.h"`.
-    if (Context->Spec.NewCC == NewFile && OldHeaderIncludeRangeInCC.isValid())
-      ReplaceOldInclude(OldHeaderIncludeRangeInCC);
-    else if (Context->Spec.NewHeader == NewFile &&
-             OldHeaderIncludeRangeInHeader.isValid())
-      ReplaceOldInclude(OldHeaderIncludeRangeInHeader);
-    Context->FileToReplacements[NewFile] = std::move(AllCode);
-  }
-}
-
-void ClangMoveTool::onEndOfTranslationUnit() {
-  if (Context->DumpDeclarations) {
-    assert(Reporter);
-    for (const auto *Decl : UnremovedDeclsInOldHeader) {
-      auto Kind = Decl->getKind();
-      bool Templated = Decl->isTemplated();
-      const std::string QualifiedName = Decl->getQualifiedNameAsString();
-      if (Kind == Decl::Kind::Var)
-        Reporter->reportDeclaration(QualifiedName, "Variable", Templated);
-      else if (Kind == Decl::Kind::Function ||
-               Kind == Decl::Kind::FunctionTemplate)
-        Reporter->reportDeclaration(QualifiedName, "Function", Templated);
-      else if (Kind == Decl::Kind::ClassTemplate ||
-               Kind == Decl::Kind::CXXRecord)
-        Reporter->reportDeclaration(QualifiedName, "Class", Templated);
-      else if (Kind == Decl::Kind::Enum)
-        Reporter->reportDeclaration(QualifiedName, "Enum", Templated);
-      else if (Kind == Decl::Kind::Typedef || Kind == Decl::Kind::TypeAlias ||
-               Kind == Decl::Kind::TypeAliasTemplate)
-        Reporter->reportDeclaration(QualifiedName, "TypeAlias", Templated);
-    }
-    return;
-  }
-
-  if (RemovedDecls.empty())
-    return;
-  // Ignore symbols that are not supported when checking if there is unremoved
-  // symbol in old header. This makes sure that we always move old files to new
-  // files when all symbols produced from dump_decls are moved.
-  auto IsSupportedKind = [](const NamedDecl *Decl) {
-    switch (Decl->getKind()) {
-    case Decl::Kind::Function:
-    case Decl::Kind::FunctionTemplate:
-    case Decl::Kind::ClassTemplate:
-    case Decl::Kind::CXXRecord:
-    case Decl::Kind::Enum:
-    case Decl::Kind::Typedef:
-    case Decl::Kind::TypeAlias:
-    case Decl::Kind::TypeAliasTemplate:
-    case Decl::Kind::Var:
-      return true;
-    default:
-      return false;
-    }
-  };
-  if (std::none_of(UnremovedDeclsInOldHeader.begin(),
-                   UnremovedDeclsInOldHeader.end(), IsSupportedKind) &&
-      !Context->Spec.OldHeader.empty()) {
-    auto &SM = RemovedDecls[0]->getASTContext().getSourceManager();
-    moveAll(SM, Context->Spec.OldHeader, Context->Spec.NewHeader);
-    moveAll(SM, Context->Spec.OldCC, Context->Spec.NewCC);
-    return;
-  }
-  LLVM_DEBUG(RGBuilder.getGraph()->dump());
-  moveDeclsToNewFiles();
-  removeDeclsInOldFiles();
-}
-
-} // namespace move
-} // namespace clang

clang-tools-extra/clang-move/ClangMove.h

@@ -1,241 +0,0 @@
-//===-- ClangMove.h - Clang move  -----------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_CLANGMOVE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_CLANGMOVE_H
-
-#include "HelperDeclRefGraph.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Tooling/Core/Replacement.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace clang {
-namespace move {
-
-// A reporter which collects and reports declarations in old header.
-class DeclarationReporter {
-public:
-  DeclarationReporter() = default;
-  ~DeclarationReporter() = default;
-
-  void reportDeclaration(llvm::StringRef DeclarationName, llvm::StringRef Type,
-                         bool Templated) {
-    DeclarationList.emplace_back(DeclarationName, Type, Templated);
-  };
-
-  struct Declaration {
-    Declaration(llvm::StringRef QName, llvm::StringRef Kind, bool Templated)
-        : QualifiedName(QName), Kind(Kind), Templated(Templated) {}
-
-    friend bool operator==(const Declaration &LHS, const Declaration &RHS) {
-      return std::tie(LHS.QualifiedName, LHS.Kind, LHS.Templated) ==
-             std::tie(RHS.QualifiedName, RHS.Kind, RHS.Templated);
-    }
-    std::string QualifiedName; // E.g. A::B::Foo.
-    std::string Kind;          // E.g. Function, Class
-    bool Templated = false;    // Whether the declaration is templated.
-  };
-
-  const std::vector<Declaration> getDeclarationList() const {
-    return DeclarationList;
-  }
-
-private:
-  std::vector<Declaration> DeclarationList;
-};
-
-// Specify declarations being moved. It contains all information of the moved
-// declarations.
-struct MoveDefinitionSpec {
-  // The list of fully qualified names, e.g. Foo, a::Foo, b::Foo.
-  SmallVector<std::string, 4> Names;
-  // The file path of old header, can be relative path and absolute path.
-  std::string OldHeader;
-  // The file path of old cc, can be relative path and absolute path.
-  std::string OldCC;
-  // The file path of new header, can be relative path and absolute path.
-  std::string NewHeader;
-  // The file path of new cc, can be relative path and absolute path.
-  std::string NewCC;
-  // Whether old.h depends on new.h. If true, #include "new.h" will be added
-  // in old.h.
-  bool OldDependOnNew = false;
-  // Whether new.h depends on old.h. If true, #include "old.h" will be added
-  // in new.h.
-  bool NewDependOnOld = false;
-};
-
-// A Context which contains extra options which are used in ClangMoveTool.
-struct ClangMoveContext {
-  MoveDefinitionSpec Spec;
-  // The Key is file path, value is the replacements being applied to the file.
-  std::map<std::string, tooling::Replacements> &FileToReplacements;
-  // The original working directory where the local clang-move binary runs.
-  //
-  // clang-move will change its current working directory to the build
-  // directory when analyzing the source file. We save the original working
-  // directory in order to get the absolute file path for the fields in Spec.
-  std::string OriginalRunningDirectory;
-  // The name of a predefined code style.
-  std::string FallbackStyle;
-  // Whether dump all declarations in old header.
-  bool DumpDeclarations;
-};
-
-// This tool is used to move class/function definitions from the given source
-// files (old.h/cc) to new files (new.h/cc).
-// The goal of this tool is to make the new/old files as compilable as possible.
-//
-// When moving a symbol,all used helper declarations (e.g. static
-// functions/variables definitions in global/named namespace,
-// functions/variables/classes definitions in anonymous namespace) used by the
-// moved symbol in old.cc are moved to the new.cc. In addition, all
-// using-declarations in old.cc are also moved to new.cc; forward class
-// declarations in old.h are also moved to new.h.
-//
-// The remaining helper declarations which are unused by non-moved symbols in
-// old.cc will be removed.
-//
-// Note: When all declarations in old header are being moved, all code in
-// old.h/cc will be moved, which means old.h/cc are empty. This ignores symbols
-// that are not supported (e.g. typedef and enum) so that we always move old
-// files to new files when all symbols produced from dump_decls are moved.
-class ClangMoveTool : public ast_matchers::MatchFinder::MatchCallback {
-public:
-  ClangMoveTool(ClangMoveContext *const Context,
-                DeclarationReporter *const Reporter);
-
-  void registerMatchers(ast_matchers::MatchFinder *Finder);
-
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override;
-
-  void onEndOfTranslationUnit() override;
-
-  /// Add #includes from old.h/cc files.
-  ///
-  /// \param IncludeHeader The name of the file being included, as written in
-  /// the source code.
-  /// \param IsAngled Whether the file name was enclosed in angle brackets.
-  /// \param SearchPath The search path which was used to find the IncludeHeader
-  /// in the file system. It can be a relative path or an absolute path.
-  /// \param FileName The name of file where the IncludeHeader comes from.
-  /// \param IncludeFilenameRange The source range for the written file name in
-  /// #include (i.e. "old.h" for #include "old.h") in old.cc.
-  /// \param SM The SourceManager.
-  void addIncludes(llvm::StringRef IncludeHeader, bool IsAngled,
-                   llvm::StringRef SearchPath, llvm::StringRef FileName,
-                   clang::CharSourceRange IncludeFilenameRange,
-                   const SourceManager &SM);
-
-  std::vector<const NamedDecl *> &getMovedDecls() { return MovedDecls; }
-
-  /// Add declarations being removed from old.h/cc. For each declarations, the
-  /// method also records the mapping relationship between the corresponding
-  /// FilePath and its FileID.
-  void addRemovedDecl(const NamedDecl *Decl);
-
-  llvm::SmallPtrSet<const NamedDecl *, 8> &getUnremovedDeclsInOldHeader() {
-    return UnremovedDeclsInOldHeader;
-  }
-
-private:
-  // Make the Path absolute using the OrignalRunningDirectory if the Path is not
-  // an absolute path. An empty Path will result in an empty string.
-  std::string makeAbsolutePath(StringRef Path);
-
-  void removeDeclsInOldFiles();
-  void moveDeclsToNewFiles();
-  void moveAll(SourceManager& SM, StringRef OldFile, StringRef NewFile);
-
-  // Stores all MatchCallbacks created by this tool.
-  std::vector<std::unique_ptr<ast_matchers::MatchFinder::MatchCallback>>
-      MatchCallbacks;
-  // Store all potential declarations (decls being moved, forward decls) that
-  // might need to move to new.h/cc. It includes all helper declarations
-  // (include unused ones) by default. The unused ones will be filtered out in
-  // the last stage. Saving in an AST-visited order.
-  std::vector<const NamedDecl *> MovedDecls;
-  // The declarations that needs to be removed in old.cc/h.
-  std::vector<const NamedDecl *> RemovedDecls;
-  // The #includes in old_header.h.
-  std::vector<std::string> HeaderIncludes;
-  // The #includes in old_cc.cc.
-  std::vector<std::string> CCIncludes;
-  // Records all helper declarations (function/variable/class definitions in
-  // anonymous namespaces, static function/variable definitions in global/named
-  // namespaces) in old.cc. saving in an AST-visited order.
-  std::vector<const NamedDecl *> HelperDeclarations;
-  // The unmoved named declarations in old header.
-  llvm::SmallPtrSet<const NamedDecl*, 8> UnremovedDeclsInOldHeader;
-  /// The source range for the written file name in #include (i.e. "old.h" for
-  /// #include "old.h") in old.cc,  including the enclosing quotes or angle
-  /// brackets.
-  clang::CharSourceRange OldHeaderIncludeRangeInCC;
-  /// The source range for the written file name in #include (i.e. "old.h" for
-  /// #include "old.h") in old.h,  including the enclosing quotes or angle
-  /// brackets.
-  clang::CharSourceRange OldHeaderIncludeRangeInHeader;
-  /// Mapping from FilePath to FileID, which can be used in post processes like
-  /// cleanup around replacements.
-  llvm::StringMap<FileID> FilePathToFileID;
-  /// A context contains all running options. It is not owned.
-  ClangMoveContext *const Context;
-  /// A reporter to report all declarations from old header. It is not owned.
-  DeclarationReporter *const Reporter;
-  /// Builder for helper declarations reference graph.
-  HelperDeclRGBuilder RGBuilder;
-};
-
-class ClangMoveAction : public clang::ASTFrontendAction {
-public:
-  ClangMoveAction(ClangMoveContext *const Context,
-                  DeclarationReporter *const Reporter)
-      : MoveTool(Context, Reporter) {
-    MoveTool.registerMatchers(&MatchFinder);
-  }
-
-  ~ClangMoveAction() override = default;
-
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &Compiler,
-                    llvm::StringRef InFile) override;
-
-private:
-  ast_matchers::MatchFinder MatchFinder;
-  ClangMoveTool MoveTool;
-};
-
-class ClangMoveActionFactory : public tooling::FrontendActionFactory {
-public:
-  ClangMoveActionFactory(ClangMoveContext *const Context,
-                         DeclarationReporter *const Reporter = nullptr)
-      : Context(Context), Reporter(Reporter) {}
-
-  clang::FrontendAction *create() override {
-    return new ClangMoveAction(Context, Reporter);
-  }
-
-private:
-  // Not owned.
-  ClangMoveContext *const Context;
-  DeclarationReporter *const Reporter;
-};
-
-} // namespace move
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_CLANGMOVE_H

clang-tools-extra/clang-move/HelperDeclRefGraph.cpp

@@ -1,137 +0,0 @@
-//===-- UsedHelperDeclFinder.cpp - AST-based call graph for helper decls --===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HelperDeclRefGraph.h"
-#include "ClangMove.h"
-#include "clang/AST/Decl.h"
-#include "llvm/Support/Debug.h"
-#include <vector>
-
-#define DEBUG_TYPE "clang-move"
-
-namespace clang {
-namespace move {
-
-void HelperDeclRefGraph::print(raw_ostream &OS) const {
-  OS << " --- Call graph Dump --- \n";
-  for (auto I = DeclMap.begin(); I != DeclMap.end(); ++I) {
-    const CallGraphNode *N = (I->second).get();
-
-    OS << "  Declarations: ";
-    N->print(OS);
-    OS << " (" << N << ") ";
-    OS << " calls: ";
-    for (auto CI = N->begin(), CE = N->end(); CI != CE; ++CI) {
-      (*CI)->print(OS);
-      OS << " (" << CI << ") ";
-    }
-    OS << '\n';
-  }
-  OS.flush();
-}
-
-void HelperDeclRefGraph::addEdge(const Decl *Caller, const Decl *Callee) {
-  assert(Caller);
-  assert(Callee);
-
-  // Ignore the case where Caller equals Callee. This happens in the static
-  // class member definitions in global namespace like "int CLASS::static_var =
-  // 1;", its DC is a VarDel whose outmost enclosing declaration is the "CLASS"
-  // CXXRecordDecl.
-  if (Caller == Callee) return;
-
-  // Allocate a new node, mark it as root, and process it's calls.
-  CallGraphNode *CallerNode = getOrInsertNode(const_cast<Decl *>(Caller));
-  CallGraphNode *CalleeNode = getOrInsertNode(const_cast<Decl *>(Callee));
-  CallerNode->addCallee(CalleeNode);
-}
-
-void HelperDeclRefGraph::dump() const { print(llvm::errs()); }
-
-CallGraphNode *HelperDeclRefGraph::getOrInsertNode(Decl *F) {
-  F = F->getCanonicalDecl();
-  std::unique_ptr<CallGraphNode> &Node = DeclMap[F];
-  if (Node)
-    return Node.get();
-
-  Node = llvm::make_unique<CallGraphNode>(F);
-  return Node.get();
-}
-
-CallGraphNode *HelperDeclRefGraph::getNode(const Decl *D) const {
-  auto I = DeclMap.find(D->getCanonicalDecl());
-  return I == DeclMap.end() ? nullptr : I->second.get();
-}
-
-llvm::DenseSet<const CallGraphNode *>
-HelperDeclRefGraph::getReachableNodes(const Decl *Root) const {
-  const auto *RootNode = getNode(Root);
-  if (!RootNode)
-    return {};
-  llvm::DenseSet<const CallGraphNode *> ConnectedNodes;
-  std::function<void(const CallGraphNode *)> VisitNode =
-      [&](const CallGraphNode *Node) {
-        if (ConnectedNodes.count(Node))
-          return;
-        ConnectedNodes.insert(Node);
-        for (auto It = Node->begin(), End = Node->end(); It != End; ++It)
-          VisitNode(*It);
-      };
-
-  VisitNode(RootNode);
-  return ConnectedNodes;
-}
-
-const Decl *HelperDeclRGBuilder::getOutmostClassOrFunDecl(const Decl *D) {
-  const auto *DC = D->getDeclContext();
-  const auto *Result = D;
-  while (DC) {
-    if (const auto *RD = dyn_cast<CXXRecordDecl>(DC))
-      Result = RD;
-    else if (const auto *FD = dyn_cast<FunctionDecl>(DC))
-      Result = FD;
-    DC = DC->getParent();
-  }
-  return Result;
-}
-
-void HelperDeclRGBuilder::run(
-    const ast_matchers::MatchFinder::MatchResult &Result) {
-  // Construct the graph by adding a directed edge from caller to callee.
-  //
-  // "dc" is the closest ancestor declaration of "func_ref" or "used_class", it
-  // might be not the targetted Caller Decl, we always use the outmost enclosing
-  // FunctionDecl/CXXRecordDecl of "dc". For example,
-  //
-  //   int MoveClass::F() { int a = helper(); return a; }
-  //
-  // The matched "dc" of "helper" DeclRefExpr is a VarDecl, we traverse up AST
-  // to find the outmost "MoveClass" CXXRecordDecl and use it as Caller.
-  if (const auto *FuncRef = Result.Nodes.getNodeAs<DeclRefExpr>("func_ref")) {
-    const auto *DC = Result.Nodes.getNodeAs<Decl>("dc");
-    assert(DC);
-    LLVM_DEBUG(llvm::dbgs() << "Find helper function usage: "
-                            << FuncRef->getDecl()->getNameAsString() << " ("
-                            << FuncRef->getDecl() << ")\n");
-    RG->addEdge(
-        getOutmostClassOrFunDecl(DC->getCanonicalDecl()),
-        getOutmostClassOrFunDecl(FuncRef->getDecl()->getCanonicalDecl()));
-  } else if (const auto *UsedClass =
-                 Result.Nodes.getNodeAs<CXXRecordDecl>("used_class")) {
-    const auto *DC = Result.Nodes.getNodeAs<Decl>("dc");
-    assert(DC);
-    LLVM_DEBUG(llvm::dbgs()
-               << "Find helper class usage: " << UsedClass->getNameAsString()
-               << " (" << UsedClass << ")\n");
-    RG->addEdge(getOutmostClassOrFunDecl(DC->getCanonicalDecl()), UsedClass);
-  }
-}
-
-} // namespace move
-} // namespace clang

clang-tools-extra/clang-move/HelperDeclRefGraph.h

@@ -1,99 +0,0 @@
-//===-- UsedHelperDeclFinder.h - AST-based call graph for helper decls ----===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_USED_HELPER_DECL_FINDER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_USED_HELPER_DECL_FINDER_H
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Analysis/CallGraph.h"
-#include "llvm/ADT/DenseSet.h"
-#include <memory>
-#include <vector>
-
-namespace clang {
-namespace move {
-
-// A reference graph for finding used/unused helper declarations in a single
-// translation unit (e.g. old.cc). We don't reuse CallGraph in clang/Analysis
-// because that CallGraph only supports function declarations.
-//
-// Helper declarations include following types:
-//   * function/variable/class definitions in an anonymous namespace.
-//   * static function/variable definitions in a global/named namespace.
-//
-// The reference graph is a directed graph. Each node in the graph represents a
-// helper declaration in old.cc or a non-moved/moved declaration (e.g. class,
-// function) in old.h, which means each node is associated with a Decl.
-//
-// To construct the graph, we use AST matcher to find interesting Decls (usually
-// a pair of Caller and Callee), and add an edge from the Caller node to the
-// Callee node.
-//
-// Specially, for a class, it might have multiple declarations such methods
-// and member variables. We only use a single node to present this class, and
-// this node is associated with the class declaration (CXXRecordDecl).
-//
-// The graph has 3 types of edges:
-//   1. moved_decl => helper_decl
-//   2. non_moved_decl => helper_decl
-//   3. helper_decl => helper_decl
-class HelperDeclRefGraph {
-public:
-  HelperDeclRefGraph() = default;
-  ~HelperDeclRefGraph() = default;
-
-  // Add a directed edge from the caller node to the callee node.
-  // A new node will be created if the node for Caller/Callee doesn't exist.
-  //
-  // Note that, all class member declarations are represented by a single node
-  // in the graph. The corresponding Decl of this node is the class declaration.
-  void addEdge(const Decl *Caller, const Decl *Callee);
-  CallGraphNode *getNode(const Decl *D) const;
-
-  // Get all reachable nodes in the graph from the given declaration D's node,
-  // including D.
-  llvm::DenseSet<const CallGraphNode *> getReachableNodes(const Decl *D) const;
-
-  // Dump the call graph for debug purpose.
-  void dump() const;
-
-private:
-  void print(raw_ostream &OS) const;
-  // Lookup a node for the given declaration D. If not found, insert a new
-  // node into the graph.
-  CallGraphNode *getOrInsertNode(Decl *D);
-
-  typedef llvm::DenseMap<const Decl *, std::unique_ptr<CallGraphNode>>
-      DeclMapTy;
-
-  // DeclMap owns all CallGraphNodes.
-  DeclMapTy DeclMap;
-};
-
-// A builder helps to construct a call graph of helper declarations.
-class HelperDeclRGBuilder : public ast_matchers::MatchFinder::MatchCallback {
-public:
-  HelperDeclRGBuilder() : RG(new HelperDeclRefGraph) {}
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override;
-  const HelperDeclRefGraph *getGraph() const { return RG.get(); }
-
-  // Find out the outmost enclosing class/function declaration of a given D.
-  // For a CXXMethodDecl, get its CXXRecordDecl; For a VarDecl/FunctionDecl, get
-  // its outmost enclosing FunctionDecl or CXXRecordDecl.
-  // Return D if not found.
-  static const Decl *getOutmostClassOrFunDecl(const Decl *D);
-
-private:
-  std::unique_ptr<HelperDeclRefGraph> RG;
-};
-
-} // namespace move
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_MOVE_USED_HELPER_DECL_FINDER_H

clang-tools-extra/clang-move/tool/CMakeLists.txt

@@ -1,19 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_clang_executable(clang-move
-  ClangMoveMain.cpp
-  )
-
-target_link_libraries(clang-move
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangMove
-  clangRewrite
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )

clang-tools-extra/clang-move/tool/ClangMoveMain.cpp

@@ -1,213 +0,0 @@
-//===-- ClangMoveMain.cpp - move defintion to new file ----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangMove.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/ArgumentsAdjusters.h"
-#include "clang/Tooling/CommonOptionsParser.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/YAMLTraits.h"
-#include <set>
-#include <string>
-
-using namespace clang;
-using namespace llvm;
-
-namespace {
-
-std::error_code CreateNewFile(const llvm::Twine &path) {
-  int fd = 0;
-  if (std::error_code ec = llvm::sys::fs::openFileForWrite(
-          path, fd, llvm::sys::fs::CD_CreateAlways, llvm::sys::fs::F_Text))
-    return ec;
-
-  return llvm::sys::Process::SafelyCloseFileDescriptor(fd);
-}
-
-cl::OptionCategory ClangMoveCategory("clang-move options");
-
-cl::list<std::string> Names("names", cl::CommaSeparated,
-                            cl::desc("The list of the names of classes being "
-                                     "moved, e.g. \"Foo,a::Foo,b::Foo\"."),
-                            cl::cat(ClangMoveCategory));
-
-cl::opt<std::string>
-    OldHeader("old_header",
-              cl::desc("The relative/absolute file path of old header."),
-              cl::cat(ClangMoveCategory));
-
-cl::opt<std::string>
-    OldCC("old_cc", cl::desc("The relative/absolute file path of old cc."),
-          cl::cat(ClangMoveCategory));
-
-cl::opt<std::string>
-    NewHeader("new_header",
-              cl::desc("The relative/absolute file path of new header."),
-              cl::cat(ClangMoveCategory));
-
-cl::opt<std::string>
-    NewCC("new_cc", cl::desc("The relative/absolute file path of new cc."),
-          cl::cat(ClangMoveCategory));
-
-cl::opt<bool>
-    OldDependOnNew("old_depend_on_new",
-                   cl::desc("Whether old header will depend on new header. If "
-                            "true, clang-move will "
-                            "add #include of new header to old header."),
-                   cl::init(false), cl::cat(ClangMoveCategory));
-
-cl::opt<bool>
-    NewDependOnOld("new_depend_on_old",
-                   cl::desc("Whether new header will depend on old header. If "
-                            "true, clang-move will "
-                            "add #include of old header to new header."),
-                   cl::init(false), cl::cat(ClangMoveCategory));
-
-cl::opt<std::string>
-    Style("style",
-          cl::desc("The style name used for reformatting. Default is \"llvm\""),
-          cl::init("llvm"), cl::cat(ClangMoveCategory));
-
-cl::opt<bool> Dump("dump_result",
-                   cl::desc("Dump results in JSON format to stdout."),
-                   cl::cat(ClangMoveCategory));
-
-cl::opt<bool> DumpDecls(
-    "dump_decls",
-    cl::desc("Dump all declarations in old header (JSON format) to stdout. If "
-             "the option is specified, other command options will be ignored. "
-             "An empty JSON will be returned if old header isn't specified."),
-    cl::cat(ClangMoveCategory));
-
-} // namespace
-
-int main(int argc, const char **argv) {
-  llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
-  tooling::CommonOptionsParser OptionsParser(argc, argv, ClangMoveCategory);
-
-  if (OldDependOnNew && NewDependOnOld) {
-    llvm::errs() << "Provide either --old_depend_on_new or "
-                    "--new_depend_on_old. clang-move doesn't support these two "
-                    "options at same time (It will introduce include cycle).\n";
-    return 1;
-  }
-
-  tooling::RefactoringTool Tool(OptionsParser.getCompilations(),
-                                OptionsParser.getSourcePathList());
-  // Add "-fparse-all-comments" compile option to make clang parse all comments.
-  Tool.appendArgumentsAdjuster(tooling::getInsertArgumentAdjuster(
-      "-fparse-all-comments", tooling::ArgumentInsertPosition::BEGIN));
-  move::MoveDefinitionSpec Spec;
-  Spec.Names = {Names.begin(), Names.end()};
-  Spec.OldHeader = OldHeader;
-  Spec.NewHeader = NewHeader;
-  Spec.OldCC = OldCC;
-  Spec.NewCC = NewCC;
-  Spec.OldDependOnNew = OldDependOnNew;
-  Spec.NewDependOnOld = NewDependOnOld;
-
-  llvm::SmallString<128> InitialDirectory;
-  if (std::error_code EC = llvm::sys::fs::current_path(InitialDirectory))
-    llvm::report_fatal_error("Cannot detect current path: " +
-                             Twine(EC.message()));
-
-  move::ClangMoveContext Context{Spec, Tool.getReplacements(),
-                                 InitialDirectory.str(), Style, DumpDecls};
-  move::DeclarationReporter Reporter;
-  move::ClangMoveActionFactory Factory(&Context, &Reporter);
-
-  int CodeStatus = Tool.run(&Factory);
-  if (CodeStatus)
-    return CodeStatus;
-
-  if (DumpDecls) {
-    llvm::outs() << "[\n";
-    const auto &Declarations = Reporter.getDeclarationList();
-    for (auto I = Declarations.begin(), E = Declarations.end(); I != E; ++I) {
-      llvm::outs() << "  {\n";
-      llvm::outs() << "    \"DeclarationName\": \"" << I->QualifiedName
-                   << "\",\n";
-      llvm::outs() << "    \"DeclarationType\": \"" << I->Kind << "\",\n";
-      llvm::outs() << "    \"Templated\": " << (I->Templated ? "true" : "false")
-                   << "\n";
-      llvm::outs() << "  }";
-      // Don't print trailing "," at the end of last element.
-      if (I != std::prev(E))
-        llvm::outs() << ",\n";
-    }
-    llvm::outs() << "\n]\n";
-    return 0;
-  }
-
-  if (!NewCC.empty()) {
-    std::error_code EC = CreateNewFile(NewCC);
-    if (EC) {
-      llvm::errs() << "Failed to create " << NewCC << ": " << EC.message()
-                   << "\n";
-      return EC.value();
-    }
-  }
-  if (!NewHeader.empty()) {
-    std::error_code EC = CreateNewFile(NewHeader);
-    if (EC) {
-      llvm::errs() << "Failed to create " << NewHeader << ": " << EC.message()
-                   << "\n";
-      return EC.value();
-    }
-  }
-
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
-  clang::TextDiagnosticPrinter DiagnosticPrinter(errs(), &*DiagOpts);
-  DiagnosticsEngine Diagnostics(
-      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
-      &DiagnosticPrinter, false);
-  auto &FileMgr = Tool.getFiles();
-  SourceManager SM(Diagnostics, FileMgr);
-  Rewriter Rewrite(SM, LangOptions());
-
-  if (!formatAndApplyAllReplacements(Tool.getReplacements(), Rewrite, Style)) {
-    llvm::errs() << "Failed applying all replacements.\n";
-    return 1;
-  }
-
-  if (Dump) {
-    std::set<llvm::StringRef> Files;
-    for (const auto &it : Tool.getReplacements())
-      Files.insert(it.first);
-    auto WriteToJson = [&](llvm::raw_ostream &OS) {
-      OS << "[\n";
-      for (auto I = Files.begin(), E = Files.end(); I != E; ++I) {
-        OS << "  {\n";
-        OS << "    \"FilePath\": \"" << *I << "\",\n";
-        const auto *Entry = FileMgr.getFile(*I);
-        auto ID = SM.translateFile(Entry);
-        std::string Content;
-        llvm::raw_string_ostream ContentStream(Content);
-        Rewrite.getEditBuffer(ID).write(ContentStream);
-        OS << "    \"SourceText\": \""
-           << llvm::yaml::escape(ContentStream.str()) << "\"\n";
-        OS << "  }";
-        if (I != std::prev(E))
-          OS << ",\n";
-      }
-      OS << "\n]\n";
-    };
-    WriteToJson(llvm::outs());
-    return 0;
-  }
-
-  return Rewrite.overwriteChangedFiles();
-}

clang-tools-extra/clang-query/CMakeLists.txt

@@ -1,19 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  lineeditor
-  support
-  )
-
-add_clang_library(clangQuery
-  Query.cpp
-  QueryParser.cpp
-
-  LINK_LIBS
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangDynamicASTMatchers
-  clangFrontend
-  clangSerialization
-  )
-
-add_subdirectory(tool)

clang-tools-extra/clang-query/Query.cpp

@@ -1,161 +0,0 @@
-//===---- Query.cpp - clang-query query -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Query.h"
-#include "QuerySession.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/TextDiagnostic.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace clang::ast_matchers;
-using namespace clang::ast_matchers::dynamic;
-
-namespace clang {
-namespace query {
-
-Query::~Query() {}
-
-bool InvalidQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  OS << ErrStr << "\n";
-  return false;
-}
-
-bool NoOpQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  return true;
-}
-
-bool HelpQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  OS << "Available commands:\n\n"
-        "  match MATCHER, m MATCHER          "
-        "Match the loaded ASTs against the given matcher.\n"
-        "  let NAME MATCHER, l NAME MATCHER  "
-        "Give a matcher expression a name, to be used later\n"
-        "                                    "
-        "as part of other expressions.\n"
-        "  set bind-root (true|false)        "
-        "Set whether to bind the root matcher to \"root\".\n"
-        "  set print-matcher (true|false)    "
-        "Set whether to print the current matcher,\n"
-        "  set output <feature>              "
-        "Set whether to output only <feature> content.\n"
-        "  enable output <feature>           "
-        "Enable <feature> content non-exclusively.\n"
-        "  disable output <feature>          "
-        "Disable <feature> content non-exclusively.\n"
-        "  quit, q                           "
-        "Terminates the query session.\n\n"
-        "Several commands accept a <feature> parameter. The available features "
-        "are:\n\n"
-        "  print                             "
-        "Pretty-print bound nodes.\n"
-        "  diag                              "
-        "Diagnostic location for bound nodes.\n"
-        "  detailed-ast                      "
-        "Detailed AST output for bound nodes.\n"
-        "  dump                              "
-        "Detailed AST output for bound nodes (alias of detailed-ast).\n\n";
-  return true;
-}
-
-bool QuitQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  QS.Terminate = true;
-  return true;
-}
-
-namespace {
-
-struct CollectBoundNodes : MatchFinder::MatchCallback {
-  std::vector<BoundNodes> &Bindings;
-  CollectBoundNodes(std::vector<BoundNodes> &Bindings) : Bindings(Bindings) {}
-  void run(const MatchFinder::MatchResult &Result) override {
-    Bindings.push_back(Result.Nodes);
-  }
-};
-
-} // namespace
-
-bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  unsigned MatchCount = 0;
-
-  for (auto &AST : QS.ASTs) {
-    MatchFinder Finder;
-    std::vector<BoundNodes> Matches;
-    DynTypedMatcher MaybeBoundMatcher = Matcher;
-    if (QS.BindRoot) {
-      llvm::Optional<DynTypedMatcher> M = Matcher.tryBind("root");
-      if (M)
-        MaybeBoundMatcher = *M;
-    }
-    CollectBoundNodes Collect(Matches);
-    if (!Finder.addDynamicMatcher(MaybeBoundMatcher, &Collect)) {
-      OS << "Not a valid top-level matcher.\n";
-      return false;
-    }
-    Finder.matchAST(AST->getASTContext());
-
-    if (QS.PrintMatcher) {
-      std::string prefixText = "Matcher: ";
-      OS << "\n  " << prefixText << Source << "\n";
-      OS << "  " << std::string(prefixText.size() + Source.size(), '=') << '\n';
-    }
-
-    for (auto MI = Matches.begin(), ME = Matches.end(); MI != ME; ++MI) {
-      OS << "\nMatch #" << ++MatchCount << ":\n\n";
-
-      for (auto BI = MI->getMap().begin(), BE = MI->getMap().end(); BI != BE;
-           ++BI) {
-        if (QS.DiagOutput) {
-          clang::SourceRange R = BI->second.getSourceRange();
-          if (R.isValid()) {
-            TextDiagnostic TD(OS, AST->getASTContext().getLangOpts(),
-                              &AST->getDiagnostics().getDiagnosticOptions());
-            TD.emitDiagnostic(
-                FullSourceLoc(R.getBegin(), AST->getSourceManager()),
-                DiagnosticsEngine::Note, "\"" + BI->first + "\" binds here",
-                CharSourceRange::getTokenRange(R), None);
-          }
-        }
-        if (QS.PrintOutput) {
-          OS << "Binding for \"" << BI->first << "\":\n";
-          BI->second.print(OS, AST->getASTContext().getPrintingPolicy());
-          OS << "\n";
-        }
-        if (QS.DetailedASTOutput) {
-          OS << "Binding for \"" << BI->first << "\":\n";
-          BI->second.dump(OS, AST->getSourceManager());
-          OS << "\n";
-        }
-      }
-
-      if (MI->getMap().empty())
-        OS << "No bindings.\n";
-    }
-  }
-
-  OS << MatchCount << (MatchCount == 1 ? " match.\n" : " matches.\n");
-  return true;
-}
-
-bool LetQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
-  if (Value) {
-    QS.NamedValues[Name] = Value;
-  } else {
-    QS.NamedValues.erase(Name);
-  }
-  return true;
-}
-
-#ifndef _MSC_VER
-const QueryKind SetQueryKind<bool>::value;
-const QueryKind SetQueryKind<OutputKind>::value;
-#endif
-
-} // namespace query
-} // namespace clang

clang-tools-extra/clang-query/Query.h

@@ -1,189 +0,0 @@
-//===--- Query.h - clang-query ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_H
-
-#include "QuerySession.h"
-#include "clang/ASTMatchers/Dynamic/VariantValue.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/Optional.h"
-#include <string>
-
-namespace clang {
-namespace query {
-
-enum OutputKind { OK_Diag, OK_Print, OK_DetailedAST };
-
-enum QueryKind {
-  QK_Invalid,
-  QK_NoOp,
-  QK_Help,
-  QK_Let,
-  QK_Match,
-  QK_SetBool,
-  QK_SetOutputKind,
-  QK_EnableOutputKind,
-  QK_DisableOutputKind,
-  QK_Quit
-};
-
-class QuerySession;
-
-struct Query : llvm::RefCountedBase<Query> {
-  Query(QueryKind Kind) : Kind(Kind) {}
-  virtual ~Query();
-
-  /// Perform the query on \p QS and print output to \p OS.
-  ///
-  /// \return false if an error occurs, otherwise return true.
-  virtual bool run(llvm::raw_ostream &OS, QuerySession &QS) const = 0;
-
-  const QueryKind Kind;
-};
-
-typedef llvm::IntrusiveRefCntPtr<Query> QueryRef;
-
-/// Any query which resulted in a parse error.  The error message is in ErrStr.
-struct InvalidQuery : Query {
-  InvalidQuery(const Twine &ErrStr) : Query(QK_Invalid), ErrStr(ErrStr.str()) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  std::string ErrStr;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_Invalid; }
-};
-
-/// No-op query (i.e. a blank line).
-struct NoOpQuery : Query {
-  NoOpQuery() : Query(QK_NoOp) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_NoOp; }
-};
-
-/// Query for "help".
-struct HelpQuery : Query {
-  HelpQuery() : Query(QK_Help) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_Help; }
-};
-
-/// Query for "quit".
-struct QuitQuery : Query {
-  QuitQuery() : Query(QK_Quit) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_Quit; }
-};
-
-/// Query for "match MATCHER".
-struct MatchQuery : Query {
-  MatchQuery(StringRef Source,
-             const ast_matchers::dynamic::DynTypedMatcher &Matcher)
-      : Query(QK_Match), Matcher(Matcher), Source(Source) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  ast_matchers::dynamic::DynTypedMatcher Matcher;
-
-  StringRef Source;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_Match; }
-};
-
-struct LetQuery : Query {
-  LetQuery(StringRef Name, const ast_matchers::dynamic::VariantValue &Value)
-      : Query(QK_Let), Name(Name), Value(Value) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override;
-
-  std::string Name;
-  ast_matchers::dynamic::VariantValue Value;
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_Let; }
-};
-
-template <typename T> struct SetQueryKind {};
-
-template <> struct SetQueryKind<bool> {
-  static const QueryKind value = QK_SetBool;
-};
-
-template <> struct SetQueryKind<OutputKind> {
-  static const QueryKind value = QK_SetOutputKind;
-};
-
-/// Query for "set VAR VALUE".
-template <typename T> struct SetQuery : Query {
-  SetQuery(T QuerySession::*Var, T Value)
-      : Query(SetQueryKind<T>::value), Var(Var), Value(Value) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override {
-    QS.*Var = Value;
-    return true;
-  }
-
-  static bool classof(const Query *Q) {
-    return Q->Kind == SetQueryKind<T>::value;
-  }
-
-  T QuerySession::*Var;
-  T Value;
-};
-
-// Implements the exclusive 'set output dump|diag|print' options.
-struct SetExclusiveOutputQuery : Query {
-  SetExclusiveOutputQuery(bool QuerySession::*Var)
-      : Query(QK_SetOutputKind), Var(Var) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override {
-    QS.DiagOutput = false;
-    QS.DetailedASTOutput = false;
-    QS.PrintOutput = false;
-    QS.*Var = true;
-    return true;
-  }
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_SetOutputKind; }
-
-  bool QuerySession::*Var;
-};
-
-// Implements the non-exclusive 'set output dump|diag|print' options.
-struct SetNonExclusiveOutputQuery : Query {
-  SetNonExclusiveOutputQuery(QueryKind Kind, bool QuerySession::*Var,
-                             bool Value)
-      : Query(Kind), Var(Var), Value(Value) {}
-  bool run(llvm::raw_ostream &OS, QuerySession &QS) const override {
-    QS.*Var = Value;
-    return true;
-  }
-
-  bool QuerySession::*Var;
-  bool Value;
-};
-
-struct EnableOutputQuery : SetNonExclusiveOutputQuery {
-  EnableOutputQuery(bool QuerySession::*Var)
-      : SetNonExclusiveOutputQuery(QK_EnableOutputKind, Var, true) {}
-
-  static bool classof(const Query *Q) { return Q->Kind == QK_EnableOutputKind; }
-};
-
-struct DisableOutputQuery : SetNonExclusiveOutputQuery {
-  DisableOutputQuery(bool QuerySession::*Var)
-      : SetNonExclusiveOutputQuery(QK_DisableOutputKind, Var, false) {}
-
-  static bool classof(const Query *Q) {
-    return Q->Kind == QK_DisableOutputKind;
-  }
-};
-
-} // namespace query
-} // namespace clang
-
-#endif

clang-tools-extra/clang-query/QueryParser.cpp

@@ -1,321 +0,0 @@
-//===---- QueryParser.cpp - clang-query command parser --------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "QueryParser.h"
-#include "Query.h"
-#include "QuerySession.h"
-#include "clang/ASTMatchers/Dynamic/Parser.h"
-#include "clang/Basic/CharInfo.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
-#include <set>
-
-using namespace llvm;
-using namespace clang::ast_matchers::dynamic;
-
-namespace clang {
-namespace query {
-
-// Lex any amount of whitespace followed by a "word" (any sequence of
-// non-whitespace characters) from the start of region [Begin,End).  If no word
-// is found before End, return StringRef().  Begin is adjusted to exclude the
-// lexed region.
-StringRef QueryParser::lexWord() {
-  Line = Line.ltrim();
-
-  if (Line.empty())
-    // Even though the Line is empty, it contains a pointer and
-    // a (zero) length. The pointer is used in the LexOrCompleteWord
-    // code completion.
-    return Line;
-
-  if (Line.front() == '#') {
-    Line = {};
-    return StringRef();
-  }
-
-  StringRef Word = Line.take_until(isWhitespace);
-  Line = Line.drop_front(Word.size());
-  return Word;
-}
-
-// This is the StringSwitch-alike used by lexOrCompleteWord below. See that
-// function for details.
-template <typename T> struct QueryParser::LexOrCompleteWord {
-  StringRef Word;
-  StringSwitch<T> Switch;
-
-  QueryParser *P;
-  // Set to the completion point offset in Word, or StringRef::npos if
-  // completion point not in Word.
-  size_t WordCompletionPos;
-
-  // Lexes a word and stores it in Word. Returns a LexOrCompleteWord<T> object
-  // that can be used like a llvm::StringSwitch<T>, but adds cases as possible
-  // completions if the lexed word contains the completion point.
-  LexOrCompleteWord(QueryParser *P, StringRef &OutWord)
-      : Word(P->lexWord()), Switch(Word), P(P),
-        WordCompletionPos(StringRef::npos) {
-    OutWord = Word;
-    if (P->CompletionPos && P->CompletionPos <= Word.data() + Word.size()) {
-      if (P->CompletionPos < Word.data())
-        WordCompletionPos = 0;
-      else
-        WordCompletionPos = P->CompletionPos - Word.data();
-    }
-  }
-
-  LexOrCompleteWord &Case(llvm::StringLiteral CaseStr, const T &Value,
-                          bool IsCompletion = true) {
-
-    if (WordCompletionPos == StringRef::npos)
-      Switch.Case(CaseStr, Value);
-    else if (CaseStr.size() != 0 && IsCompletion && WordCompletionPos <= CaseStr.size() &&
-             CaseStr.substr(0, WordCompletionPos) ==
-                 Word.substr(0, WordCompletionPos))
-      P->Completions.push_back(LineEditor::Completion(
-          (CaseStr.substr(WordCompletionPos) + " ").str(), CaseStr));
-    return *this;
-  }
-
-  T Default(T Value) { return Switch.Default(Value); }
-};
-
-QueryRef QueryParser::parseSetBool(bool QuerySession::*Var) {
-  StringRef ValStr;
-  unsigned Value = LexOrCompleteWord<unsigned>(this, ValStr)
-                       .Case("false", 0)
-                       .Case("true", 1)
-                       .Default(~0u);
-  if (Value == ~0u) {
-    return new InvalidQuery("expected 'true' or 'false', got '" + ValStr + "'");
-  }
-  return new SetQuery<bool>(Var, Value);
-}
-
-template <typename QueryType> QueryRef QueryParser::parseSetOutputKind() {
-  StringRef ValStr;
-  unsigned OutKind = LexOrCompleteWord<unsigned>(this, ValStr)
-                         .Case("diag", OK_Diag)
-                         .Case("print", OK_Print)
-                         .Case("detailed-ast", OK_DetailedAST)
-                         .Case("dump", OK_DetailedAST)
-                         .Default(~0u);
-  if (OutKind == ~0u) {
-    return new InvalidQuery(
-        "expected 'diag', 'print', 'detailed-ast' or 'dump', got '" + ValStr +
-        "'");
-  }
-
-  switch (OutKind) {
-  case OK_DetailedAST:
-    return new QueryType(&QuerySession::DetailedASTOutput);
-  case OK_Diag:
-    return new QueryType(&QuerySession::DiagOutput);
-  case OK_Print:
-    return new QueryType(&QuerySession::PrintOutput);
-  }
-
-  llvm_unreachable("Invalid output kind");
-}
-
-QueryRef QueryParser::endQuery(QueryRef Q) {
-  const StringRef Extra = Line;
-  if (!lexWord().empty())
-    return new InvalidQuery("unexpected extra input: '" + Extra + "'");
-  return Q;
-}
-
-namespace {
-
-enum ParsedQueryKind {
-  PQK_Invalid,
-  PQK_Comment,
-  PQK_NoOp,
-  PQK_Help,
-  PQK_Let,
-  PQK_Match,
-  PQK_Set,
-  PQK_Unlet,
-  PQK_Quit,
-  PQK_Enable,
-  PQK_Disable
-};
-
-enum ParsedQueryVariable {
-  PQV_Invalid,
-  PQV_Output,
-  PQV_BindRoot,
-  PQV_PrintMatcher
-};
-
-QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) {
-  std::string ErrStr;
-  llvm::raw_string_ostream OS(ErrStr);
-  Diag.printToStreamFull(OS);
-  return new InvalidQuery(OS.str());
-}
-
-} // namespace
-
-QueryRef QueryParser::completeMatcherExpression() {
-  std::vector<MatcherCompletion> Comps = Parser::completeExpression(
-      Line, CompletionPos - Line.begin(), nullptr, &QS.NamedValues);
-  for (auto I = Comps.begin(), E = Comps.end(); I != E; ++I) {
-    Completions.push_back(LineEditor::Completion(I->TypedText, I->MatcherDecl));
-  }
-  return QueryRef();
-}
-
-QueryRef QueryParser::doParse() {
-  StringRef CommandStr;
-  ParsedQueryKind QKind = LexOrCompleteWord<ParsedQueryKind>(this, CommandStr)
-                              .Case("", PQK_NoOp)
-                              .Case("#", PQK_Comment, /*IsCompletion=*/false)
-                              .Case("help", PQK_Help)
-                              .Case("l", PQK_Let, /*IsCompletion=*/false)
-                              .Case("let", PQK_Let)
-                              .Case("m", PQK_Match, /*IsCompletion=*/false)
-                              .Case("match", PQK_Match)
-                              .Case("q", PQK_Quit,  /*IsCompletion=*/false)
-                              .Case("quit", PQK_Quit)
-                              .Case("set", PQK_Set)
-                              .Case("enable", PQK_Enable)
-                              .Case("disable", PQK_Disable)
-                              .Case("unlet", PQK_Unlet)
-                              .Default(PQK_Invalid);
-
-  switch (QKind) {
-  case PQK_Comment:
-  case PQK_NoOp:
-    return new NoOpQuery;
-
-  case PQK_Help:
-    return endQuery(new HelpQuery);
-
-  case PQK_Quit:
-    return endQuery(new QuitQuery);
-
-  case PQK_Let: {
-    StringRef Name = lexWord();
-
-    if (Name.empty())
-      return new InvalidQuery("expected variable name");
-
-    if (CompletionPos)
-      return completeMatcherExpression();
-
-    Diagnostics Diag;
-    ast_matchers::dynamic::VariantValue Value;
-    if (!Parser::parseExpression(Line, nullptr, &QS.NamedValues, &Value,
-                                 &Diag)) {
-      return makeInvalidQueryFromDiagnostics(Diag);
-    }
-
-    return new LetQuery(Name, Value);
-  }
-
-  case PQK_Match: {
-    if (CompletionPos)
-      return completeMatcherExpression();
-
-    Diagnostics Diag;
-    auto MatcherSource = Line.trim();
-    Optional<DynTypedMatcher> Matcher = Parser::parseMatcherExpression(
-        MatcherSource, nullptr, &QS.NamedValues, &Diag);
-    if (!Matcher) {
-      return makeInvalidQueryFromDiagnostics(Diag);
-    }
-    return new MatchQuery(MatcherSource, *Matcher);
-  }
-
-  case PQK_Set: {
-    StringRef VarStr;
-    ParsedQueryVariable Var =
-        LexOrCompleteWord<ParsedQueryVariable>(this, VarStr)
-            .Case("output", PQV_Output)
-            .Case("bind-root", PQV_BindRoot)
-            .Case("print-matcher", PQV_PrintMatcher)
-            .Default(PQV_Invalid);
-    if (VarStr.empty())
-      return new InvalidQuery("expected variable name");
-    if (Var == PQV_Invalid)
-      return new InvalidQuery("unknown variable: '" + VarStr + "'");
-
-    QueryRef Q;
-    switch (Var) {
-    case PQV_Output:
-      Q = parseSetOutputKind<SetExclusiveOutputQuery>();
-      break;
-    case PQV_BindRoot:
-      Q = parseSetBool(&QuerySession::BindRoot);
-      break;
-    case PQV_PrintMatcher:
-      Q = parseSetBool(&QuerySession::PrintMatcher);
-      break;
-    case PQV_Invalid:
-      llvm_unreachable("Invalid query kind");
-    }
-
-    return endQuery(Q);
-  }
-  case PQK_Enable:
-  case PQK_Disable: {
-    StringRef VarStr;
-    ParsedQueryVariable Var =
-        LexOrCompleteWord<ParsedQueryVariable>(this, VarStr)
-            .Case("output", PQV_Output)
-            .Default(PQV_Invalid);
-    if (VarStr.empty())
-      return new InvalidQuery("expected variable name");
-    if (Var == PQV_Invalid)
-      return new InvalidQuery("unknown variable: '" + VarStr + "'");
-
-    QueryRef Q;
-
-    if (QKind == PQK_Enable)
-      Q = parseSetOutputKind<EnableOutputQuery>();
-    else if (QKind == PQK_Disable)
-      Q = parseSetOutputKind<DisableOutputQuery>();
-    else
-      llvm_unreachable("Invalid query kind");
-    return endQuery(Q);
-  }
-
-  case PQK_Unlet: {
-    StringRef Name = lexWord();
-
-    if (Name.empty())
-      return new InvalidQuery("expected variable name");
-
-    return endQuery(new LetQuery(Name, VariantValue()));
-  }
-
-  case PQK_Invalid:
-    return new InvalidQuery("unknown command: " + CommandStr);
-  }
-
-  llvm_unreachable("Invalid query kind");
-}
-
-QueryRef QueryParser::parse(StringRef Line, const QuerySession &QS) {
-  return QueryParser(Line, QS).doParse();
-}
-
-std::vector<LineEditor::Completion>
-QueryParser::complete(StringRef Line, size_t Pos, const QuerySession &QS) {
-  QueryParser P(Line, QS);
-  P.CompletionPos = Line.data() + Pos;
-
-  P.doParse();
-  return P.Completions;
-}
-
-} // namespace query
-} // namespace clang

clang-tools-extra/clang-query/QueryParser.h

@@ -1,69 +0,0 @@
-//===--- QueryParser.h - clang-query ----------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_PARSER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_PARSER_H
-
-#include "Query.h"
-#include "QuerySession.h"
-#include "llvm/LineEditor/LineEditor.h"
-#include <cstddef>
-
-namespace clang {
-namespace query {
-
-class QuerySession;
-
-class QueryParser {
-public:
-  /// Parse \a Line as a query.
-  ///
-  /// \return A QueryRef representing the query, which may be an InvalidQuery.
-  static QueryRef parse(StringRef Line, const QuerySession &QS);
-
-  /// Compute a list of completions for \a Line assuming a cursor at
-  /// \param Pos characters past the start of \a Line, ordered from most
-  /// likely to least likely.
-  ///
-  /// \return A vector of completions for \a Line.
-  static std::vector<llvm::LineEditor::Completion>
-  complete(StringRef Line, size_t Pos, const QuerySession &QS);
-
-private:
-  QueryParser(StringRef Line, const QuerySession &QS)
-      : Line(Line), CompletionPos(nullptr), QS(QS) {}
-
-  StringRef lexWord();
-
-  template <typename T> struct LexOrCompleteWord;
-
-  QueryRef parseSetBool(bool QuerySession::*Var);
-  template <typename QueryType> QueryRef parseSetOutputKind();
-  QueryRef completeMatcherExpression();
-
-  QueryRef endQuery(QueryRef Q);
-
-  /// \brief Parse [\p Begin,\p End).
-  ///
-  /// \return A reference to the parsed query object, which may be an
-  /// \c InvalidQuery if a parse error occurs.
-  QueryRef doParse();
-
-  StringRef Line;
-
-  const char *CompletionPos;
-  std::vector<llvm::LineEditor::Completion> Completions;
-
-  const QuerySession &QS;
-};
-
-} // namespace query
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_PARSER_H

clang-tools-extra/clang-query/QuerySession.h

@@ -1,46 +0,0 @@
-//===--- QuerySession.h - clang-query ---------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_SESSION_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_SESSION_H
-
-#include "clang/ASTMatchers/Dynamic/VariantValue.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringMap.h"
-
-namespace clang {
-
-class ASTUnit;
-
-namespace query {
-
-/// Represents the state for a particular clang-query session.
-class QuerySession {
-public:
-  QuerySession(llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs)
-      : ASTs(ASTs), PrintOutput(false), DiagOutput(true),
-        DetailedASTOutput(false), BindRoot(true), PrintMatcher(false),
-        Terminate(false) {}
-
-  llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs;
-
-  bool PrintOutput;
-  bool DiagOutput;
-  bool DetailedASTOutput;
-
-  bool BindRoot;
-  bool PrintMatcher;
-  bool Terminate;
-  llvm::StringMap<ast_matchers::dynamic::VariantValue> NamedValues;
-};
-
-} // namespace query
-} // namespace clang
-
-#endif

clang-tools-extra/clang-query/tool/CMakeLists.txt

@@ -1,16 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_clang_executable(clang-query ClangQuery.cpp)
-target_link_libraries(clang-query
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangDynamicASTMatchers
-  clangFrontend
-  clangQuery
-  clangSerialization
-  clangTooling
-  )
-
-install(TARGETS clang-query RUNTIME DESTINATION bin)

clang-tools-extra/clang-query/tool/ClangQuery.cpp

@@ -1,149 +0,0 @@
-//===---- ClangQuery.cpp - clang-query tool -------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This tool is for interactive exploration of the Clang AST using AST matchers.
-// It currently allows the user to enter a matcher at an interactive prompt and
-// view the resulting bindings as diagnostics, AST pretty prints or AST dumps.
-// Example session:
-//
-// $ cat foo.c
-// void foo(void) {}
-// $ clang-query foo.c --
-// clang-query> match functionDecl()
-//
-// Match #1:
-//
-// foo.c:1:1: note: "root" binds here
-// void foo(void) {}
-// ^~~~~~~~~~~~~~~~~
-// 1 match.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Query.h"
-#include "QueryParser.h"
-#include "QuerySession.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Tooling/CommonOptionsParser.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/LineEditor/LineEditor.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Signals.h"
-#include <fstream>
-#include <string>
-
-using namespace clang;
-using namespace clang::ast_matchers;
-using namespace clang::ast_matchers::dynamic;
-using namespace clang::query;
-using namespace clang::tooling;
-using namespace llvm;
-
-static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage);
-static cl::OptionCategory ClangQueryCategory("clang-query options");
-
-static cl::list<std::string> Commands("c", cl::desc("Specify command to run"),
-                                      cl::value_desc("command"),
-                                      cl::cat(ClangQueryCategory));
-
-static cl::list<std::string> CommandFiles("f",
-                                          cl::desc("Read commands from file"),
-                                          cl::value_desc("file"),
-                                          cl::cat(ClangQueryCategory));
-
-static cl::opt<std::string> PreloadFile(
-    "preload",
-    cl::desc("Preload commands from file and start interactive mode"),
-    cl::value_desc("file"), cl::cat(ClangQueryCategory));
-
-bool runCommandsInFile(const char *ExeName, std::string const &FileName,
-                       QuerySession &QS) {
-  std::ifstream Input(FileName.c_str());
-  if (!Input.is_open()) {
-    llvm::errs() << ExeName << ": cannot open " << FileName << "\n";
-    return 1;
-  }
-  while (Input.good()) {
-    std::string Line;
-    std::getline(Input, Line);
-
-    QueryRef Q = QueryParser::parse(Line, QS);
-    if (!Q->run(llvm::outs(), QS))
-      return true;
-  }
-  return false;
-}
-
-int main(int argc, const char **argv) {
-  llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
-
-  CommonOptionsParser OptionsParser(argc, argv, ClangQueryCategory);
-
-  if (!Commands.empty() && !CommandFiles.empty()) {
-    llvm::errs() << argv[0] << ": cannot specify both -c and -f\n";
-    return 1;
-  }
-
-  if ((!Commands.empty() || !CommandFiles.empty()) && !PreloadFile.empty()) {
-    llvm::errs() << argv[0]
-                 << ": cannot specify both -c or -f with --preload\n";
-    return 1;
-  }
-
-  ClangTool Tool(OptionsParser.getCompilations(),
-                 OptionsParser.getSourcePathList());
-  std::vector<std::unique_ptr<ASTUnit>> ASTs;
-  int Status = Tool.buildASTs(ASTs);
-  int ASTStatus = 0;
-  if (Status == 1) {
-    // Building ASTs failed.
-    return 1;
-  } else if (Status == 2) {
-    ASTStatus |= 1;
-    llvm::errs() << "Failed to build AST for some of the files, "
-                 << "results may be incomplete."
-                 << "\n";
-  } else {
-    assert(Status == 0 && "Unexpected status returned");
-  }
-
-  QuerySession QS(ASTs);
-
-  if (!Commands.empty()) {
-    for (auto I = Commands.begin(), E = Commands.end(); I != E; ++I) {
-      QueryRef Q = QueryParser::parse(*I, QS);
-      if (!Q->run(llvm::outs(), QS))
-        return 1;
-    }
-  } else if (!CommandFiles.empty()) {
-    for (auto I = CommandFiles.begin(), E = CommandFiles.end(); I != E; ++I) {
-      if (runCommandsInFile(argv[0], *I, QS))
-        return 1;
-    }
-  } else {
-    if (!PreloadFile.empty()) {
-      if (runCommandsInFile(argv[0], PreloadFile, QS))
-        return 1;
-    }
-    LineEditor LE("clang-query");
-    LE.setListCompleter([&QS](StringRef Line, size_t Pos) {
-      return QueryParser::complete(Line, Pos, QS);
-    });
-    while (llvm::Optional<std::string> Line = LE.readLine()) {
-      QueryRef Q = QueryParser::parse(*Line, QS);
-      Q->run(llvm::outs(), QS);
-      llvm::outs().flush();
-      if (QS.Terminate)
-        break;
-    }
-  }
-
-  return ASTStatus;
-}

clang-tools-extra/clang-reorder-fields/CMakeLists.txt

@@ -1,16 +0,0 @@
-set(LLVM_LINK_COMPONENTS support)
-
-add_clang_library(clangReorderFields
-  ReorderFieldsAction.cpp
-
-  LINK_LIBS
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangIndex
-  clangLex
-  clangSerialization
-  clangToolingCore
-  )
-
-add_subdirectory(tool)

clang-tools-extra/clang-reorder-fields/ReorderFieldsAction.cpp

@@ -1,311 +0,0 @@
-//===-- tools/extra/clang-reorder-fields/ReorderFieldsAction.cpp -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file contains the definition of the
-/// ReorderFieldsAction::newASTConsumer method
-///
-//===----------------------------------------------------------------------===//
-
-#include "ReorderFieldsAction.h"
-#include "clang/AST/AST.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/Refactoring.h"
-#include "llvm/ADT/SetVector.h"
-#include <algorithm>
-#include <string>
-
-namespace clang {
-namespace reorder_fields {
-using namespace clang::ast_matchers;
-using llvm::SmallSetVector;
-
-/// \brief Finds the definition of a record by name.
-///
-/// \returns nullptr if the name is ambiguous or not found.
-static const RecordDecl *findDefinition(StringRef RecordName,
-                                        ASTContext &Context) {
-  auto Results =
-      match(recordDecl(hasName(RecordName), isDefinition()).bind("recordDecl"),
-            Context);
-  if (Results.empty()) {
-    llvm::errs() << "Definition of " << RecordName << "  not found\n";
-    return nullptr;
-  }
-  if (Results.size() > 1) {
-    llvm::errs() << "The name " << RecordName
-                 << " is ambiguous, several definitions found\n";
-    return nullptr;
-  }
-  return selectFirst<RecordDecl>("recordDecl", Results);
-}
-
-/// \brief Calculates the new order of fields.
-///
-/// \returns empty vector if the list of fields doesn't match the definition.
-static SmallVector<unsigned, 4>
-getNewFieldsOrder(const RecordDecl *Definition,
-                  ArrayRef<std::string> DesiredFieldsOrder) {
-  assert(Definition && "Definition is null");
-
-  llvm::StringMap<unsigned> NameToIndex;
-  for (const auto *Field : Definition->fields())
-    NameToIndex[Field->getName()] = Field->getFieldIndex();
-
-  if (DesiredFieldsOrder.size() != NameToIndex.size()) {
-    llvm::errs() << "Number of provided fields doesn't match definition.\n";
-    return {};
-  }
-  SmallVector<unsigned, 4> NewFieldsOrder;
-  for (const auto &Name : DesiredFieldsOrder) {
-    if (!NameToIndex.count(Name)) {
-      llvm::errs() << "Field " << Name << " not found in definition.\n";
-      return {};
-    }
-    NewFieldsOrder.push_back(NameToIndex[Name]);
-  }
-  assert(NewFieldsOrder.size() == NameToIndex.size());
-  return NewFieldsOrder;
-}
-
-// FIXME: error-handling
-/// \brief Replaces one range of source code by another.
-static void
-addReplacement(SourceRange Old, SourceRange New, const ASTContext &Context,
-               std::map<std::string, tooling::Replacements> &Replacements) {
-  StringRef NewText =
-      Lexer::getSourceText(CharSourceRange::getTokenRange(New),
-                           Context.getSourceManager(), Context.getLangOpts());
-  tooling::Replacement R(Context.getSourceManager(),
-                         CharSourceRange::getTokenRange(Old), NewText,
-                         Context.getLangOpts());
-  consumeError(Replacements[R.getFilePath()].add(R));
-}
-
-/// \brief Find all member fields used in the given init-list initializer expr
-/// that belong to the same record
-///
-/// \returns a set of field declarations, empty if none were present
-static SmallSetVector<FieldDecl *, 1>
-findMembersUsedInInitExpr(const CXXCtorInitializer *Initializer,
-                          ASTContext &Context) {
-  SmallSetVector<FieldDecl *, 1> Results;
-  // Note that this does not pick up member fields of base classes since
-  // for those accesses Sema::PerformObjectMemberConversion always inserts an
-  // UncheckedDerivedToBase ImplicitCastExpr between the this expr and the
-  // object expression
-  auto FoundExprs =
-      match(findAll(memberExpr(hasObjectExpression(cxxThisExpr())).bind("ME")),
-            *Initializer->getInit(), Context);
-  for (BoundNodes &BN : FoundExprs)
-    if (auto *MemExpr = BN.getNodeAs<MemberExpr>("ME"))
-      if (auto *FD = dyn_cast<FieldDecl>(MemExpr->getMemberDecl()))
-        Results.insert(FD);
-  return Results;
-}
-
-/// \brief Reorders fields in the definition of a struct/class.
-///
-/// At the moment reodering of fields with
-/// different accesses (public/protected/private) is not supported.
-/// \returns true on success.
-static bool reorderFieldsInDefinition(
-    const RecordDecl *Definition, ArrayRef<unsigned> NewFieldsOrder,
-    const ASTContext &Context,
-    std::map<std::string, tooling::Replacements> &Replacements) {
-  assert(Definition && "Definition is null");
-
-  SmallVector<const FieldDecl *, 10> Fields;
-  for (const auto *Field : Definition->fields())
-    Fields.push_back(Field);
-
-  // Check that the permutation of the fields doesn't change the accesses
-  for (const auto *Field : Definition->fields()) {
-    const auto FieldIndex = Field->getFieldIndex();
-    if (Field->getAccess() != Fields[NewFieldsOrder[FieldIndex]]->getAccess()) {
-      llvm::errs() << "Currently reodering of fields with different accesses "
-                      "is not supported\n";
-      return false;
-    }
-  }
-
-  for (const auto *Field : Definition->fields()) {
-    const auto FieldIndex = Field->getFieldIndex();
-    if (FieldIndex == NewFieldsOrder[FieldIndex])
-      continue;
-    addReplacement(Field->getSourceRange(),
-                   Fields[NewFieldsOrder[FieldIndex]]->getSourceRange(),
-                   Context, Replacements);
-  }
-  return true;
-}
-
-/// \brief Reorders initializers in a C++ struct/class constructor.
-///
-/// A constructor can have initializers for an arbitrary subset of the class's
-/// fields. Thus, we need to ensure that we reorder just the initializers that
-/// are present.
-static void reorderFieldsInConstructor(
-    const CXXConstructorDecl *CtorDecl, ArrayRef<unsigned> NewFieldsOrder,
-    ASTContext &Context,
-    std::map<std::string, tooling::Replacements> &Replacements) {
-  assert(CtorDecl && "Constructor declaration is null");
-  if (CtorDecl->isImplicit() || CtorDecl->getNumCtorInitializers() <= 1)
-    return;
-
-  // The method FunctionDecl::isThisDeclarationADefinition returns false
-  // for a defaulted function unless that function has been implicitly defined.
-  // Thus this assert needs to be after the previous checks.
-  assert(CtorDecl->isThisDeclarationADefinition() && "Not a definition");
-
-  SmallVector<unsigned, 10> NewFieldsPositions(NewFieldsOrder.size());
-  for (unsigned i = 0, e = NewFieldsOrder.size(); i < e; ++i)
-    NewFieldsPositions[NewFieldsOrder[i]] = i;
-
-  SmallVector<const CXXCtorInitializer *, 10> OldWrittenInitializersOrder;
-  SmallVector<const CXXCtorInitializer *, 10> NewWrittenInitializersOrder;
-  for (const auto *Initializer : CtorDecl->inits()) {
-    if (!Initializer->isMemberInitializer() || !Initializer->isWritten())
-      continue;
-
-    // Warn if this reordering violates initialization expr dependencies.
-    const FieldDecl *ThisM = Initializer->getMember();
-    const auto UsedMembers = findMembersUsedInInitExpr(Initializer, Context);
-    for (const FieldDecl *UM : UsedMembers) {
-      if (NewFieldsPositions[UM->getFieldIndex()] >
-          NewFieldsPositions[ThisM->getFieldIndex()]) {
-        DiagnosticsEngine &DiagEngine = Context.getDiagnostics();
-        auto Description = ("reordering field " + UM->getName() + " after " +
-                            ThisM->getName() + " makes " + UM->getName() +
-                            " uninitialized when used in init expression")
-                               .str();
-        unsigned ID = DiagEngine.getDiagnosticIDs()->getCustomDiagID(
-            DiagnosticIDs::Warning, Description);
-        DiagEngine.Report(Initializer->getSourceLocation(), ID);
-      }
-    }
-
-    OldWrittenInitializersOrder.push_back(Initializer);
-    NewWrittenInitializersOrder.push_back(Initializer);
-  }
-  auto ByFieldNewPosition = [&](const CXXCtorInitializer *LHS,
-                                const CXXCtorInitializer *RHS) {
-    assert(LHS && RHS);
-    return NewFieldsPositions[LHS->getMember()->getFieldIndex()] <
-           NewFieldsPositions[RHS->getMember()->getFieldIndex()];
-  };
-  std::sort(std::begin(NewWrittenInitializersOrder),
-            std::end(NewWrittenInitializersOrder), ByFieldNewPosition);
-  assert(OldWrittenInitializersOrder.size() ==
-         NewWrittenInitializersOrder.size());
-  for (unsigned i = 0, e = NewWrittenInitializersOrder.size(); i < e; ++i)
-    if (OldWrittenInitializersOrder[i] != NewWrittenInitializersOrder[i])
-      addReplacement(OldWrittenInitializersOrder[i]->getSourceRange(),
-                     NewWrittenInitializersOrder[i]->getSourceRange(), Context,
-                     Replacements);
-}
-
-/// \brief Reorders initializers in the brace initialization of an aggregate.
-///
-/// At the moment partial initialization is not supported.
-/// \returns true on success
-static bool reorderFieldsInInitListExpr(
-    const InitListExpr *InitListEx, ArrayRef<unsigned> NewFieldsOrder,
-    const ASTContext &Context,
-    std::map<std::string, tooling::Replacements> &Replacements) {
-  assert(InitListEx && "Init list expression is null");
-  // We care only about InitListExprs which originate from source code.
-  // Implicit InitListExprs are created by the semantic analyzer.
-  if (!InitListEx->isExplicit())
-    return true;
-  // The method InitListExpr::getSyntacticForm may return nullptr indicating
-  // that the current initializer list also serves as its syntactic form.
-  if (const auto *SyntacticForm = InitListEx->getSyntacticForm())
-    InitListEx = SyntacticForm;
-  // If there are no initializers we do not need to change anything.
-  if (!InitListEx->getNumInits())
-    return true;
-  if (InitListEx->getNumInits() != NewFieldsOrder.size()) {
-    llvm::errs() << "Currently only full initialization is supported\n";
-    return false;
-  }
-  for (unsigned i = 0, e = InitListEx->getNumInits(); i < e; ++i)
-    if (i != NewFieldsOrder[i])
-      addReplacement(InitListEx->getInit(i)->getSourceRange(),
-                     InitListEx->getInit(NewFieldsOrder[i])->getSourceRange(),
-                     Context, Replacements);
-  return true;
-}
-
-namespace {
-class ReorderingConsumer : public ASTConsumer {
-  StringRef RecordName;
-  ArrayRef<std::string> DesiredFieldsOrder;
-  std::map<std::string, tooling::Replacements> &Replacements;
-
-public:
-  ReorderingConsumer(StringRef RecordName,
-                     ArrayRef<std::string> DesiredFieldsOrder,
-                     std::map<std::string, tooling::Replacements> &Replacements)
-      : RecordName(RecordName), DesiredFieldsOrder(DesiredFieldsOrder),
-        Replacements(Replacements) {}
-
-  ReorderingConsumer(const ReorderingConsumer &) = delete;
-  ReorderingConsumer &operator=(const ReorderingConsumer &) = delete;
-
-  void HandleTranslationUnit(ASTContext &Context) override {
-    const RecordDecl *RD = findDefinition(RecordName, Context);
-    if (!RD)
-      return;
-    SmallVector<unsigned, 4> NewFieldsOrder =
-        getNewFieldsOrder(RD, DesiredFieldsOrder);
-    if (NewFieldsOrder.empty())
-      return;
-    if (!reorderFieldsInDefinition(RD, NewFieldsOrder, Context, Replacements))
-      return;
-
-    // CXXRD will be nullptr if C code (not C++) is being processed.
-    const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD);
-    if (CXXRD)
-      for (const auto *C : CXXRD->ctors())
-        if (const auto *D = dyn_cast<CXXConstructorDecl>(C->getDefinition()))
-          reorderFieldsInConstructor(cast<const CXXConstructorDecl>(D),
-                                     NewFieldsOrder, Context, Replacements);
-
-    // We only need to reorder init list expressions for
-    // plain C structs or C++ aggregate types.
-    // For other types the order of constructor parameters is used,
-    // which we don't change at the moment.
-    // Now (v0) partial initialization is not supported.
-    if (!CXXRD || CXXRD->isAggregate())
-      for (auto Result :
-           match(initListExpr(hasType(equalsNode(RD))).bind("initListExpr"),
-                 Context))
-        if (!reorderFieldsInInitListExpr(
-                Result.getNodeAs<InitListExpr>("initListExpr"), NewFieldsOrder,
-                Context, Replacements)) {
-          Replacements.clear();
-          return;
-        }
-  }
-};
-} // end anonymous namespace
-
-std::unique_ptr<ASTConsumer> ReorderFieldsAction::newASTConsumer() {
-  return llvm::make_unique<ReorderingConsumer>(RecordName, DesiredFieldsOrder,
-                                               Replacements);
-}
-
-} // namespace reorder_fields
-} // namespace clang

clang-tools-extra/clang-reorder-fields/ReorderFieldsAction.h

@@ -1,47 +0,0 @@
-//===-- tools/extra/clang-reorder-fields/ReorderFieldsAction.h -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file contains the declarations of the ReorderFieldsAction class and
-/// the FieldPosition struct.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_REORDER_FIELDS_ACTION_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_REORDER_FIELDS_ACTION_H
-
-#include "clang/Tooling/Refactoring.h"
-
-namespace clang {
-class ASTConsumer;
-
-namespace reorder_fields {
-
-class ReorderFieldsAction {
-  llvm::StringRef RecordName;
-  llvm::ArrayRef<std::string> DesiredFieldsOrder;
-  std::map<std::string, tooling::Replacements> &Replacements;
-
-public:
-  ReorderFieldsAction(
-      llvm::StringRef RecordName,
-      llvm::ArrayRef<std::string> DesiredFieldsOrder,
-      std::map<std::string, tooling::Replacements> &Replacements)
-      : RecordName(RecordName), DesiredFieldsOrder(DesiredFieldsOrder),
-        Replacements(Replacements) {}
-
-  ReorderFieldsAction(const ReorderFieldsAction &) = delete;
-  ReorderFieldsAction &operator=(const ReorderFieldsAction &) = delete;
-
-  std::unique_ptr<ASTConsumer> newASTConsumer();
-};
-} // namespace reorder_fields
-} // namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_REORDER_FIELDS_ACTION_H

clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_clang_tool(clang-reorder-fields ClangReorderFields.cpp)
-
-target_link_libraries(clang-reorder-fields
-  PRIVATE
-  clangBasic
-  clangFrontend
-  clangReorderFields
-  clangRewrite
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )

clang-tools-extra/clang-reorder-fields/tool/ClangReorderFields.cpp

@@ -1,88 +0,0 @@
-//===-- tools/extra/clang-reorder-fields/tool/ClangReorderFields.cpp -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file contains the implementation of clang-reorder-fields tool
-///
-//===----------------------------------------------------------------------===//
-
-#include "../ReorderFieldsAction.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/CommonOptionsParser.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileSystem.h"
-#include <cstdlib>
-#include <string>
-#include <system_error>
-
-using namespace llvm;
-using namespace clang;
-
-cl::OptionCategory ClangReorderFieldsCategory("clang-reorder-fields options");
-
-static cl::opt<std::string>
-    RecordName("record-name", cl::Required,
-               cl::desc("The name of the struct/class."),
-               cl::cat(ClangReorderFieldsCategory));
-
-static cl::list<std::string> FieldsOrder("fields-order", cl::CommaSeparated,
-                                         cl::OneOrMore,
-                                         cl::desc("The desired fields order."),
-                                         cl::cat(ClangReorderFieldsCategory));
-
-static cl::opt<bool> Inplace("i", cl::desc("Overwrite edited files."),
-                             cl::cat(ClangReorderFieldsCategory));
-
-const char Usage[] = "A tool to reorder fields in C/C++ structs/classes.\n";
-
-int main(int argc, const char **argv) {
-  tooling::CommonOptionsParser OP(argc, argv, ClangReorderFieldsCategory,
-                                  Usage);
-
-  auto Files = OP.getSourcePathList();
-  tooling::RefactoringTool Tool(OP.getCompilations(), Files);
-
-  reorder_fields::ReorderFieldsAction Action(RecordName, FieldsOrder,
-                                             Tool.getReplacements());
-
-  auto Factory = tooling::newFrontendActionFactory(&Action);
-
-  if (Inplace)
-    return Tool.runAndSave(Factory.get());
-
-  int ExitCode = Tool.run(Factory.get());
-  LangOptions DefaultLangOptions;
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
-  TextDiagnosticPrinter DiagnosticPrinter(errs(), &*DiagOpts);
-  DiagnosticsEngine Diagnostics(
-      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
-      &DiagnosticPrinter, false);
-
-  auto &FileMgr = Tool.getFiles();
-  SourceManager Sources(Diagnostics, FileMgr);
-  Rewriter Rewrite(Sources, DefaultLangOptions);
-  Tool.applyAllReplacements(Rewrite);
-
-  for (const auto &File : Files) {
-    const auto *Entry = FileMgr.getFile(File);
-    const auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
-    Rewrite.getEditBuffer(ID).write(outs());
-  }
-
-  return ExitCode;
-}

clang-tools-extra/clang-tidy-vs/.gitignore

@@ -1,7 +0,0 @@
-obj/
-bin/
-.vs/
-Key.snk
-clang-tidy.exe
-packages/
-*.csproj.user

clang-tools-extra/clang-tidy-vs/CMakeLists.txt

@@ -1,28 +0,0 @@
-option(BUILD_CLANG_TIDY_VS_PLUGIN "Build clang-tidy VS plugin" OFF)
-if (BUILD_CLANG_TIDY_VS_PLUGIN)
-  add_custom_target(clang_tidy_exe_for_vsix
-      ${CMAKE_COMMAND} -E copy_if_different
-      "${LLVM_TOOLS_BINARY_DIR}/clang-tidy.exe"
-      "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy/clang-tidy.exe"
-      DEPENDS clang-tidy)
-
-  add_custom_target(clang_tidy_license
-      ${CMAKE_COMMAND} -E copy_if_different
-      "${CLANG_SOURCE_DIR}/LICENSE.TXT"
-      "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy/license.txt")
-
-  if (NOT CLANG_TIDY_VS_VERSION)
-    set(CLANG_TIDY_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
-  endif()
-
-  configure_file("source.extension.vsixmanifest.in"
-      "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy/source.extension.vsixmanifest")
-
-  add_custom_target(clang_tidy_vsix ALL
-      devenv "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy.sln" /Build Release
-      DEPENDS clang_tidy_exe_for_vsix "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy/source.extension.vsixmanifest"
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      "${CMAKE_CURRENT_SOURCE_DIR}/ClangTidy/bin/Release/ClangTidy.vsix"
-      "${LLVM_TOOLS_BINARY_DIR}/ClangTidy.vsix"
-      DEPENDS clang_tidy_exe_for_vsix clang_tidy_license)
-endif()

clang-tools-extra/clang-tidy-vs/ClangTidy.sln

@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangTidy", "ClangTidy\ClangTidy.csproj", "{BE261DA1-36C6-449A-95C5-4653A549170A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BE261DA1-36C6-449A-95C5-4653A549170A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE261DA1-36C6-449A-95C5-4653A549170A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE261DA1-36C6-449A-95C5-4653A549170A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE261DA1-36C6-449A-95C5-4653A549170A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

clang-tools-extra/clang-tidy-vs/ClangTidy/CategoryVerb.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    /// <summary>
-    /// Allows entire categories of properties to be enabled, disabled, or inherited
-    /// in one fell swoop.  We add properties to each category with the value being
-    /// this enum, and when the value is selected, we use reflection to find all other
-    /// properties in the same category and perform the corresponding action.
-    /// </summary>
-    public enum CategoryVerb
-    {
-        None,
-        Disable,
-        Enable,
-        Inherit
-    }
-
-    public class CategoryVerbConverter : EnumConverter
-    {
-        public CategoryVerbConverter() : base(typeof(CategoryVerb))
-        {
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            if (value is string)
-            {
-                switch ((string)value)
-                {
-                    case "Disable Category":
-                        return CategoryVerb.Disable;
-                    case "Enable Category":
-                        return CategoryVerb.Enable;
-                    case "Inherit Category":
-                        return CategoryVerb.Inherit;
-                    case "":
-                        return CategoryVerb.None;
-                }
-            }
-            return base.ConvertFrom(context, culture, value);
-        }
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            if (value is CategoryVerb && destinationType == typeof(string))
-            {
-                switch ((CategoryVerb)value)
-                {
-                    case CategoryVerb.Disable:
-                        return "Disable Category";
-                    case CategoryVerb.Enable:
-                        return "Enable Category";
-                    case CategoryVerb.Inherit:
-                        return "Inherit Category";
-                    case CategoryVerb.None:
-                        return String.Empty;
-                }
-            }
-
-            return base.ConvertTo(context, culture, value, destinationType);
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/CheckDatabase.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
-
-namespace LLVM.ClangTidy
-{
-    public class CheckInfo
-    {
-        [YamlAlias("Name")]
-        public string Name { get; set; }
-
-        [YamlAlias("Label")]
-        public string Label { get; set; }
-
-        [YamlAlias("Description")]
-        public string Desc { get; set; }
-
-        [YamlAlias("Category")]
-        public string Category { get; set; }
-    }
-
-    /// <summary>
-    /// Reads the list of checks from Yaml and builds a description of each one.
-    /// This list of checks is then used by the PropertyGrid to determine what
-    /// items to display.
-    /// </summary>
-    public static class CheckDatabase
-    {
-        static CheckInfo[] Checks_ = null;
-
-        class CheckRoot
-        {
-            [YamlAlias("Checks")]
-            public CheckInfo[] Checks { get; set; }
-        }
-
-        static CheckDatabase()
-        {
-            using (StringReader Reader = new StringReader(Resources.ClangTidyChecks))
-            {
-                Deserializer D = new Deserializer(namingConvention: new PascalCaseNamingConvention());
-                var Root = D.Deserialize<CheckRoot>(Reader);
-                Checks_ = Root.Checks;
-
-                HashSet<string> Names = new HashSet<string>();
-                foreach (var Check in Checks_)
-                {
-                    if (Names.Contains(Check.Name))
-                        continue;
-                    Names.Add(Check.Name);
-                }
-            }
-        }
-
-        public static IEnumerable<CheckInfo> Checks
-        {
-            get
-            {
-                return Checks_;
-            }
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/CheckTree.cs

@@ -1,273 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-
-namespace LLVM.ClangTidy
-{
-    /// <summary>
-    /// CheckTree is used to group checks into categories and subcategories.  For
-    /// example, given the following list of checks:
-    /// 
-    ///   llvm-include-order
-    ///   llvm-namespace-comment
-    ///   llvm-twine-local
-    ///   llvm-header-guard
-    ///   google-runtime-member-string-references
-    ///   google-runtime-int
-    ///   google-readability-namespace-comments
-    ///   
-    /// the corresponding CheckTree would look like this:
-    /// 
-    ///   llvm
-    ///     include-order
-    ///     namespace-comment
-    ///     twine-local
-    ///     header-guard
-    ///   google
-    ///     runtime
-    ///       member-string-references
-    ///       int
-    ///     readability
-    ///       namespace-comments
-    ///       redundant-smartptr-get
-    ///       
-    /// This is useful when serializing a set of options out to a .clang-tidy file,
-    /// because we need to decide the most efficient way to serialize the sequence
-    /// of check commands, when to use wildcards, etc.  For example, if everything
-    /// under google is inherited, we can simply leave that entry out entirely from
-    /// the .clang-tidy file.  On the other hand, if anything is inherited, we *must
-    /// not* add or remove google-* by wildcard because that, by definition, means
-    /// the property is no longer inherited.  When we can categorize the checks into
-    /// groups and subgroups like this, it is possible to efficiently serialize to
-    /// a minimal representative .clang-tidy file.
-    /// </summary>
-
-    public abstract class CheckTreeNode
-    {
-        private string Name_;
-        private CheckTreeNode Parent_;
-
-        protected CheckTreeNode(string Name, CheckTreeNode Parent)
-        {
-            Name_ = Name;
-            Parent_ = Parent;
-        }
-
-        public string Path
-        {
-            get
-            {
-                if (Parent_ == null)
-                    return null;
-                string ParentPath = Parent_.Path;
-                if (ParentPath == null)
-                    return Name_;
-                return ParentPath + "-" + Name_;
-            }
-        }
-
-        public string Name
-        {
-            get
-            {
-                return Name_;
-            }
-        }
-
-
-        public abstract int CountChecks { get; }
-        public abstract int CountExplicitlyDisabledChecks { get; }
-        public abstract int CountExplicitlyEnabledChecks { get; }
-        public abstract int CountInheritedChecks { get; }
-    }
-
-    public class CheckTree : CheckTreeNode
-    {
-        private Dictionary<string, CheckTreeNode> Children_ = new Dictionary<string, CheckTreeNode>();
-        public CheckTree()
-            : base(null, null)
-        {
-
-        }
-
-        private CheckTree(string Name, CheckTree Parent)
-            : base(Name, Parent)
-        {
-        }
-
-        private void AddLeaf(string Name, DynamicPropertyDescriptor<bool> Property)
-        {
-            Children_[Name] = new CheckLeaf(Name, this, Property);
-        }
-
-        private CheckTree AddOrCreateSubgroup(string Name)
-        {
-            CheckTreeNode Subgroup = null;
-            if (Children_.TryGetValue(Name, out Subgroup))
-            {
-                System.Diagnostics.Debug.Assert(Subgroup is CheckTree);
-                return (CheckTree)Subgroup;
-            }
-
-            CheckTree SG = new CheckTree(Name, this);
-            Children_[Name] = SG;
-            return SG;
-        }
-
-        public static CheckTree Build(ClangTidyProperties Config)
-        {
-            // Since some check names contain dashes in them, it doesn't make sense to
-            // simply split all check names by dash and construct a huge tree.  For
-            // example, in the check called google-runtime-member-string-references,
-            // we don't need each of those to be a different subgroup.  So instead we
-            // explicitly specify the common breaking points at which a user might want
-            // to use a -* and everything else falls as a leaf under one of these
-            // categories.
-            // FIXME: This should be configurable without recompilation
-            CheckTree Root = new CheckTree();
-            string[][] Groups = new string[][] {
-                new string[] {"boost"},
-                new string[] {"cert"},
-                new string[] {"clang", "diagnostic"},
-                new string[] {"cppcoreguidelines", "interfaces"},
-                new string[] {"cppcoreguidelines", "pro", "bounds"},
-                new string[] {"cppcoreguidelines", "pro", "type"},
-                new string[] {"google", "build"},
-                new string[] {"google", "readability"},
-                new string[] {"google", "runtime"},
-                new string[] {"llvm"},
-                new string[] {"misc"},
-            };
-
-            foreach (string[] Group in Groups)
-            {
-                CheckTree Subgroup = Root;
-                foreach (string Component in Group)
-                    Subgroup = Subgroup.AddOrCreateSubgroup(Component);
-            }
-
-            var Props = Config.GetProperties()
-                              .Cast<PropertyDescriptor>()
-                              .OfType<DynamicPropertyDescriptor<bool>>()
-                              .Where(x => x.Attributes.OfType<ClangTidyCheckAttribute>().Count() > 0)
-                              .Select(x => new KeyValuePair<DynamicPropertyDescriptor<bool>, string>(
-                                            x, x.Attributes.OfType<ClangTidyCheckAttribute>().First().CheckName));
-            var PropArray = Props.ToArray();
-            foreach (var CheckInfo in PropArray)
-            {
-                string LeafName = null;
-                CheckTree Tree = Root.LocateCheckLeafGroup(CheckInfo.Value, out LeafName);
-                Tree.AddLeaf(LeafName, CheckInfo.Key);
-            }
-            return Root;
-        }
-
-        private CheckTree LocateCheckLeafGroup(string Check, out string LeafName)
-        {
-            string[] Components = Check.Split('-');
-            string FirstComponent = Components.FirstOrDefault();
-            if (FirstComponent == null)
-            {
-                LeafName = Check;
-                return this;
-            }
-
-            CheckTreeNode Subgroup = null;
-            if (!Children_.TryGetValue(FirstComponent, out Subgroup))
-            {
-                LeafName = Check;
-                return this;
-            }
-            System.Diagnostics.Debug.Assert(Subgroup is CheckTree);
-            CheckTree Child = (CheckTree)Subgroup;
-            string ChildName = Check.Substring(FirstComponent.Length + 1);
-            return Child.LocateCheckLeafGroup(ChildName, out LeafName);
-        }
-
-        public override int CountChecks
-        {
-            get
-            {
-                return Children_.Aggregate(0, (X, V) => { return X + V.Value.CountChecks; });
-            }
-        }
-
-        public override int CountExplicitlyDisabledChecks
-        {
-            get
-            {
-                return Children_.Aggregate(0, (X, V) => { return X + V.Value.CountExplicitlyDisabledChecks; });
-            }
-        }
-
-        public override int CountExplicitlyEnabledChecks
-        {
-            get
-            {
-                return Children_.Aggregate(0, (X, V) => { return X + V.Value.CountExplicitlyEnabledChecks; });
-            }
-        }
-        public override int CountInheritedChecks
-        {
-            get
-            {
-                return Children_.Aggregate(0, (X, V) => { return X + V.Value.CountInheritedChecks; });
-            }
-        }
-
-        public IDictionary<string, CheckTreeNode> Children
-        {
-            get { return Children_; }
-        }
-    }
-
-    public class CheckLeaf : CheckTreeNode
-    {
-        private DynamicPropertyDescriptor<bool> Property_;
-
-        public CheckLeaf(string Name, CheckTree Parent, DynamicPropertyDescriptor<bool> Property)
-            : base(Name, Parent)
-        {
-            Property_ = Property;
-        }
-
-        public override int CountChecks
-        {
-            get
-            {
-                return 1;
-            }
-        }
-
-        public override int CountExplicitlyDisabledChecks
-        {
-            get
-            {
-                if (Property_.IsInheriting)
-                    return 0;
-                return (bool)Property_.GetValue(null) ? 0 : 1;
-            }
-        }
-
-        public override int CountExplicitlyEnabledChecks
-        {
-            get
-            {
-                if (Property_.IsInheriting)
-                    return 0;
-                return (bool)Property_.GetValue(null) ? 1 : 0;
-            }
-        }
-
-        public override int CountInheritedChecks
-        {
-            get
-            {
-                return (Property_.IsInheriting) ? 1 : 0;
-            }
-        }
-
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidy.csproj

@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BE261DA1-36C6-449A-95C5-4653A549170A}</ProjectGuid>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LLVM.ClangTidy</RootNamespace>
-    <AssemblyName>ClangTidy</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>0</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Settings.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
-    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="YamlDotNet, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.3.3.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="YamlDotNet.Dynamic, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Dynamic.3.2.3\lib\net40\YamlDotNet.Dynamic.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE100">
-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
-      <VersionMajor>10</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE90">
-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.VisualStudio.CommandBars">
-      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CategoryVerb.cs" />
-    <Compile Include="CheckDatabase.cs" />
-    <Compile Include="CheckTree.cs" />
-    <Compile Include="ClangTidyCheckAttribute.cs" />
-    <Compile Include="ClangTidyConfigurationPage.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ClangTidyProperties.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DynamicPropertyConverter.cs" />
-    <Compile Include="DynamicPropertyDescriptor.cs" />
-    <Compile Include="ForwardingPropertyDescriptor.cs" />
-    <Compile Include="Guids.cs" />
-    <Compile Include="DynamicPropertyComponent.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DynamicPropertyComponent.Designer.cs" />
-    <Compile Include="ClangTidyConfigParser.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="ClangTidyPackage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PkgCmdID.cs" />
-    <Compile Include="ClangTidyPropertyGrid.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ClangTidyPropertyGrid.Designer.cs">
-      <DependentUpon>ClangTidyPropertyGrid.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Utility.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ClangTidyPropertyGrid.resx">
-      <DependentUpon>ClangTidyPropertyGrid.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Key.snk" />
-    <None Include="packages.config" />
-    <None Include="Resources\ClangTidyChecks.yaml" />
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <VSCTCompile Include="ClangTidy.vsct">
-      <ResourceName>Menus.ctmenu</ResourceName>
-      <SubType>Designer</SubType>
-    </VSCTCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Images_32bit.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="clang-tidy.exe">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="license.txt">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Resources\Package.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 4.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <PropertyGroup>
-    <UseCodebase>true</UseCodebase>
-  </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
-  <PropertyGroup>
-    <PreBuildEvent>if not exist $(ProjectDir)Key.snk ("$(SDKToolsPath)\sn.exe" -k $(ProjectDir)Key.snk)</PreBuildEvent>
-  </PropertyGroup>
-  <Target Name="BeforeBuild">
-    <Exec ContinueOnError="false" Command="&quot;..\packages\Brutal.Dev.StrongNameSigner.1.8.0\tools\StrongNameSigner.Console.exe&quot; -in &quot;..\packages&quot; -l Summary" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidy.vsct

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <!--  This is the file that defines the actual layout and type of the commands.
-        It is divided in different sections (e.g. command definition, command
-        placement, ...), with each defining a specific set of properties.
-        See the comment before each section for more details about how to
-        use it. -->
-
-  <!--  The VSCT compiler (the tool that translates this file into the binary 
-        format that VisualStudio will consume) has the ability to run a preprocessor 
-        on the vsct file; this preprocessor is (usually) the C++ preprocessor, so 
-        it is possible to define includes and macros with the same syntax used 
-        in C++ files. Using this ability of the compiler here, we include some files 
-        defining some of the constants that we will use inside the file. -->
-
-  <!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
-  <Extern href="stdidcmd.h"/>
-
-  <!--This header contains the command ids for the menus provided by the shell. -->
-  <Extern href="vsshlids.h"/>
-
-
-
-
-  <!--The Commands section is where we the commands, menus and menu groups are defined.
-      This section uses a Guid to identify the package that provides the command defined inside it. -->
-  <Commands package="guidClangTidyPkg">
-    <!-- Inside this section we have different sub-sections: one for the menus, another  
-    for the menu groups, one for the buttons (the actual commands), one for the combos 
-    and the last one for the bitmaps used. Each element is identified by a command id that  
-    is a unique pair of guid and numeric identifier; the guid part of the identifier is usually  
-    called "command set" and is used to group different command inside a logically related  
-    group; your package should define its own command set in order to avoid collisions  
-    with command ids defined by other packages. -->
-
-    
-    <!-- In this section you can define new menu groups. A menu group is a container for 
-         other menus or buttons (commands); from a visual point of view you can see the 
-         group as the part of a menu contained between two lines. The parent of a group 
-         must be a menu. -->
-    <Groups>
-
-      <Group guid="guidClangTidyCmdSet" id="MyMenuGroup" priority="0x0600">
-        <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS"/>
-      </Group>
-      
-
-
-    </Groups>
-    
-    <!--Buttons section. -->
-    <!--This section defines the elements the user can interact with, like a menu command or a button 
-        or combo box in a toolbar. -->
-    <Buttons>
-      <!--To define a menu group you have to specify its ID, the parent menu and its display priority. 
-          The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
-          the CommandFlag node.
-          You can add more than one CommandFlag node e.g.:
-              <CommandFlag>DefaultInvisible</CommandFlag>
-              <CommandFlag>DynamicVisibility</CommandFlag>
-          If you do not want an image next to your command, remove the Icon node /> -->
-
-      <Button guid="guidClangTidyCmdSet" id="cmdidClangTidy" priority="0x0100" type="Button">
-        <Parent guid="guidClangTidyCmdSet" id="MyMenuGroup" />
-        <Icon guid="guidImages" id="bmpPic1" />
-        <Strings>
-          <ButtonText>ClangTidy</ButtonText>
-        </Strings>
-      </Button>
-
-
-
-    </Buttons>
-   
-    <!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
-    <Bitmaps>
-      <!--  The bitmap id is defined in a way that is a little bit different from the others: 
-            the declaration starts with a guid for the bitmap strip, then there is the resource id of the 
-            bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 
-            inside a button definition. An important aspect of this declaration is that the element id 
-            must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
-      <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>
-      
-    </Bitmaps>
- 
-  </Commands>
-
-
-  <KeyBindings>
-    <KeyBinding guid="guidClangTidyCmdSet" id="cmdidClangTidy" editor="guidTextEditor" key1="R" mod1="Control" key2="T" mod2="Control"/>
-  </KeyBindings>
-
-
-
-  <Symbols>
-    <!-- This is the package guid. -->
-    <GuidSymbol name="guidClangTidyPkg" value="{AE4956BE-3DB8-430E-BBAB-7E2E9A014E9C}" />
-    
-    <!-- This is the guid used to group the menu commands together -->
-    <GuidSymbol name="guidClangTidyCmdSet" value="{9E0F0493-6493-46DE-AEE1-ACD8F60F265E}">
-      <IDSymbol name="MyMenuGroup" value="0x1020" />
-      <IDSymbol name="cmdidClangTidy" value="0x0100" />
-    </GuidSymbol>
-
-    <GuidSymbol name="guidTextEditor" value="{E10FAD35-7FB8-4991-A269-EF88F12166C9}" />
-
-
-    <GuidSymbol name="guidImages" value="{942F126F-942D-428A-84B4-4AC7C523D0B2}" >
-      <IDSymbol name="bmpPic1" value="1" />
-      <IDSymbol name="bmpPic2" value="2" />
-      <IDSymbol name="bmpPicSearch" value="3" />
-      <IDSymbol name="bmpPicX" value="4" />
-      <IDSymbol name="bmpPicArrows" value="5" />
-    </GuidSymbol>
-  </Symbols>
-
-</CommandTable>

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyCheckAttribute.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    public class ClangTidyCheckAttribute : Attribute
-    {
-        private string CheckName_;
-        public ClangTidyCheckAttribute(string CheckName)
-        {
-            this.CheckName_ = CheckName;
-        }
-
-        public string CheckName
-        {
-            get { return CheckName_; }
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyConfigParser.cs

@@ -1,214 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
-
-namespace LLVM.ClangTidy
-{
-    static class ClangTidyConfigParser
-    {
-        public class CheckOption
-        {
-            [YamlAlias("key")]
-            public string Key { get; set; }
-
-            [YamlAlias("value")]
-            public string Value { get; set; }
-        }
-        public class ClangTidyYaml
-        {
-            [YamlAlias("Checks")]
-            public string Checks { get; set; }
-
-            [YamlAlias("CheckOptions")]
-            public List<CheckOption> CheckOptions { get; set; }
-        }
-
-        public static List<KeyValuePair<string, ClangTidyProperties>> ParseConfigurationChain(string ClangTidyFile)
-        {
-            List<KeyValuePair<string, ClangTidyProperties>> Result = new List<KeyValuePair<string, ClangTidyProperties>>();
-            Result.Add(new KeyValuePair<string, ClangTidyProperties>(null, ClangTidyProperties.RootProperties));
-
-            foreach (string P in Utility.SplitPath(ClangTidyFile).Reverse())
-            {
-                if (!Utility.HasClangTidyFile(P))
-                    continue;
-
-                string ConfigFile = Path.Combine(P, ".clang-tidy");
-
-                using (StreamReader Reader = new StreamReader(ConfigFile))
-                {
-                    Deserializer D = new Deserializer(namingConvention: new PascalCaseNamingConvention());
-                    ClangTidyYaml Y = D.Deserialize<ClangTidyYaml>(Reader);
-                    ClangTidyProperties Parent = Result[Result.Count - 1].Value;
-                    ClangTidyProperties NewProps = new ClangTidyProperties(Parent);
-                    SetPropertiesFromYaml(Y, NewProps);
-                    Result.Add(new KeyValuePair<string, ClangTidyProperties>(P, NewProps));
-                }
-            }
-            return Result;
-        }
-
-        enum TreeLevelOp
-        {
-            Enable,
-            Disable,
-            Inherit
-        }
-
-        public static void SerializeClangTidyFile(ClangTidyProperties Props, string ClangTidyFilePath)
-        {
-            List<string> CommandList = new List<string>();
-            SerializeCheckTree(CommandList, Props.GetCheckTree(), TreeLevelOp.Inherit);
-
-            CommandList.Sort((x, y) =>
-            {
-                bool LeftSub = x.StartsWith("-");
-                bool RightSub = y.StartsWith("-");
-                if (LeftSub && !RightSub)
-                    return -1;
-                if (RightSub && !LeftSub)
-                    return 1;
-                return StringComparer.CurrentCulture.Compare(x, y);
-            });
-
-            string ConfigFile = Path.Combine(ClangTidyFilePath, ".clang-tidy");
-            using (StreamWriter Writer = new StreamWriter(ConfigFile))
-            {
-                Serializer S = new Serializer(namingConvention: new PascalCaseNamingConvention());
-                ClangTidyYaml Yaml = new ClangTidyYaml();
-                Yaml.Checks = String.Join(",", CommandList.ToArray());
-                S.Serialize(Writer, Yaml);
-            }
-        }
-
-        /// <summary>
-        /// Convert the given check tree into serialized list of commands that can be written to
-        /// the Yaml.  The goal here is to determine the minimal sequence of check commands that
-        /// will produce the exact configuration displayed in the UI.  This is complicated by the
-        /// fact that an inherited True is not the same as an explicitly specified True.  If the
-        /// user has chosen to inherit a setting in a .clang-tidy file, then changing it in the
-        /// parent should show the reflected changes in the current file as well.  So we cannot
-        /// simply -* everything and then add in the checks we need, because -* immediately marks
-        /// every single check as explicitly false, thus disabling inheritance.
-        /// </summary>
-        /// <param name="CommandList">State passed through this recursive algorithm representing
-        /// the sequence of commands we have determined so far.
-        /// </param>
-        /// <param name="Tree">The check tree to serialize.  This is the parameter that will be
-        /// recursed on as successive subtrees get serialized to `CommandList`.
-        /// </param>
-        /// <param name="CurrentOp">The current state of the subtree.  For example, if the
-        /// algorithm decides to -* an entire subtree and then add back one single check,
-        /// after adding a -subtree-* command to CommandList, it would pass in a value of
-        /// CurrentOp=TreeLevelOp.Disable when it recurses down.  This allows deeper iterations
-        /// of the algorithm to know what kind of command (if any) needs to be added to CommandList
-        /// in order to put a particular check into a particular state.
-        /// </param>
-        private static void SerializeCheckTree(List<string> CommandList, CheckTree Tree, TreeLevelOp CurrentOp)
-        {
-            int NumChecks = Tree.CountChecks;
-            int NumDisabled = Tree.CountExplicitlyDisabledChecks;
-            int NumEnabled = Tree.CountExplicitlyEnabledChecks;
-            int NumInherited = Tree.CountInheritedChecks;
-
-            if (NumChecks == 0)
-                return;
-
-            if (NumInherited > 0)
-                System.Diagnostics.Debug.Assert(CurrentOp == TreeLevelOp.Inherit);
-
-            // If this entire tree is inherited, just exit, nothing about this needs to
-            // go in the clang-tidy file.
-            if (NumInherited == NumChecks)
-                return;
-
-            TreeLevelOp NewOp = CurrentOp;
-            // If there are no inherited properties in this subtree, decide whether to
-            // explicitly enable or disable this subtree.  Decide by looking at whether
-            // there is a larger proportion of disabled or enabled descendants.  If
-            // there are more disabled items in this subtree for example, disabling the
-            // subtree will lead to a smaller configuration file.
-            if (NumInherited == 0)
-            {
-                if (NumDisabled >= NumEnabled)
-                    NewOp = TreeLevelOp.Disable;
-                else
-                    NewOp = TreeLevelOp.Enable;
-            }
-
-            if (NewOp == TreeLevelOp.Disable)
-            {
-                // Only add an explicit disable command if the tree was not already disabled
-                // to begin with.
-                if (CurrentOp != TreeLevelOp.Disable)
-                {
-                    string WildcardPath = "*";
-                    if (Tree.Path != null)
-                        WildcardPath = Tree.Path + "-" + WildcardPath;
-                    CommandList.Add("-" + WildcardPath);
-                }
-                // If the entire subtree was disabled, there's no point descending.
-                if (NumDisabled == NumChecks)
-                    return;
-            }
-            else if (NewOp == TreeLevelOp.Enable)
-            {
-                // Only add an explicit enable command if the tree was not already enabled
-                // to begin with.  Note that if we're at the root, all checks are already
-                // enabled by default, so there's no need to explicitly include *
-                if (CurrentOp != TreeLevelOp.Enable && Tree.Path != null)
-                {
-                    string WildcardPath = Tree.Path + "-*";
-                    CommandList.Add(WildcardPath);
-                }
-                // If the entire subtree was enabled, there's no point descending.
-                if (NumEnabled == NumChecks)
-                    return;
-            }
-
-            foreach (var Child in Tree.Children)
-            {
-                if (Child.Value is CheckLeaf)
-                {
-                    CheckLeaf Leaf = (CheckLeaf)Child.Value;
-                    if (Leaf.CountExplicitlyEnabledChecks == 1 && NewOp != TreeLevelOp.Enable)
-                        CommandList.Add(Leaf.Path);
-                    else if (Leaf.CountExplicitlyDisabledChecks == 1 && NewOp != TreeLevelOp.Disable)
-                        CommandList.Add("-" + Leaf.Path);
-                    continue;
-                }
-
-                System.Diagnostics.Debug.Assert(Child.Value is CheckTree);
-                CheckTree ChildTree = (CheckTree)Child.Value;
-                SerializeCheckTree(CommandList, ChildTree, NewOp);
-            }
-        }
-
-        private static void SetPropertiesFromYaml(ClangTidyYaml Yaml, ClangTidyProperties Props)
-        {
-            string[] CheckCommands = Yaml.Checks.Split(',');
-            foreach (string Command in CheckCommands)
-            {
-                if (Command == null || Command.Length == 0)
-                    continue;
-                bool Add = true;
-                string Pattern = Command;
-                if (Pattern[0] == '-')
-                {
-                    Pattern = Pattern.Substring(1);
-                    Add = false;
-                }
-
-                foreach (var Match in CheckDatabase.Checks.Where(x => Utility.MatchWildcardString(x.Name, Pattern)))
-                {
-                    Props.SetDynamicValue(Match.Name, Add);
-                }
-            }
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyConfigurationPage.cs

@@ -1,61 +0,0 @@
-using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace LLVM.ClangTidy
-{
-    [ClassInterface(ClassInterfaceType.AutoDual)]
-    [CLSCompliant(false), ComVisible(true)]
-    public class ClangTidyConfigurationPage : DialogPage
-    {
-        ClangTidyPropertyGrid Grid = null;
-        protected override IWin32Window Window
-        {
-            get
-            {
-                if (Grid == null)
-                    Grid = new ClangTidyPropertyGrid();
-                return Grid;
-            }
-        }
-
-        protected override void SaveSetting(PropertyDescriptor property)
-        {
-            base.SaveSetting(property);
-        }
-
-        public override void SaveSettingsToStorage()
-        {
-            if (Grid != null)
-                Grid.SaveSettingsToStorage();
-
-            base.SaveSettingsToStorage();
-        }
-
-        public override void ResetSettings()
-        {
-            base.ResetSettings();
-        }
-
-        protected override void LoadSettingFromStorage(PropertyDescriptor prop)
-        {
-            base.LoadSettingFromStorage(prop);
-        }
-
-        public override void LoadSettingsFromStorage()
-        {
-            if (Grid != null)
-                Grid.InitializeSettings();
-            base.LoadSettingsFromStorage();
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyPackage.cs

@@ -1,56 +0,0 @@
-//===-- ClangTidyPackages.cs - VSPackage for clang-tidy ----------*- C# -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This class contains a VS extension package that runs clang-tidy over a
-// file in a VS text editor.
-//
-//===----------------------------------------------------------------------===//
-
-using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.TextManager.Interop;
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.ComponentModel.Design;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.Xml.Linq;
-
-namespace LLVM.ClangTidy
-{
-    [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
-    [ProvideMenuResource("Menus.ctmenu", 1)]
-    [Guid(GuidList.guidClangTidyPkgString)]
-    [ProvideOptionPage(typeof(ClangTidyConfigurationPage), "LLVM/Clang", "ClangTidy", 0, 0, true)]
-    public sealed class ClangTidyPackage : Package
-    {
-        #region Package Members
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            var commandService = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
-            if (commandService != null)
-            {
-                var menuCommandID = new CommandID(GuidList.guidClangTidyCmdSet, (int)PkgCmdIDList.cmdidClangTidy);
-                var menuItem = new MenuCommand(MenuItemCallback, menuCommandID);
-                commandService.AddCommand(menuItem);
-            }
-        }
-        #endregion
-
-        private void MenuItemCallback(object sender, EventArgs args)
-        {
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyProperties.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-
-    public class ClangTidyProperties : DynamicPropertyComponent
-    {
-        private static ClangTidyProperties RootProperties_ = null;
-        private CheckTree CheckTree_;
-        private bool HasUnsavedChanges_ = false;
-
-        public struct CheckMapping
-        {
-            public string CheckName;
-            public string Property;
-        }
-
-        public ClangTidyProperties()
-            : base(null)
-        {
-            AddClangCheckProperties();
-            CheckTree_ = CheckTree.Build(this);
-        }
-
-        public ClangTidyProperties(DynamicPropertyComponent Parent)
-            : base(Parent)
-        {
-            AddClangCheckProperties();
-            CheckTree_ = CheckTree.Build(this);
-        }
-
-        static ClangTidyProperties()
-        {
-            RootProperties_ = new ClangTidyProperties(null);
-        }
-
-        public static ClangTidyProperties RootProperties
-        {
-            get { return RootProperties_; }
-        }
-
-        private void AddClangCheckProperties()
-        {
-            // Add each check in the check database
-            HashSet<string> Categories = new HashSet<string>();
-            foreach (var Check in CheckDatabase.Checks)
-            {
-                string Name = Check.Name.Replace('-', '_');
-                List<Attribute> Attrs = new List<Attribute>();
-                Attrs.Add(new CategoryAttribute(Check.Category));
-                Attrs.Add(new DisplayNameAttribute(Check.Label));
-                Attrs.Add(new DefaultValueAttribute(true));
-                Attrs.Add(new DescriptionAttribute(Check.Desc));
-                Attrs.Add(new ClangTidyCheckAttribute(Check.Name));
-                Categories.Add(Check.Category);
-                AddDynamicProperty<bool>(Check.Name, Attrs.ToArray());
-            }
-
-            // Add a category verb for each unique category.
-            foreach (string Cat in Categories)
-            {
-                List<Attribute> Attrs = new List<Attribute>();
-                Attrs.Add(new CategoryAttribute(Cat));
-                Attrs.Add(new DisplayNameAttribute("(Category Verbs)"));
-                Attrs.Add(new TypeConverterAttribute(typeof(CategoryVerbConverter)));
-                Attrs.Add(new DefaultValueAttribute(CategoryVerb.None));
-                AddDynamicProperty<CategoryVerb>(Cat + "Verb", Attrs.ToArray());
-            }
-        }
-
-        public CheckTree GetCheckTree() { return CheckTree_; }
-        public bool GetHasUnsavedChanges() { return HasUnsavedChanges_; }
-        public void SetHasUnsavedChanges(bool Value) { HasUnsavedChanges_ = Value; }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyPropertyGrid.Designer.cs

@@ -1,119 +0,0 @@
-namespace LLVM.ClangTidy
-{
-    partial class ClangTidyPropertyGrid
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.button1 = new System.Windows.Forms.Button();
-            this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
-            this.clangTidyProperties1 = new LLVM.ClangTidy.ClangTidyProperties();
-            this.clangTidyConfigurationPage1 = new LLVM.ClangTidy.ClangTidyConfigurationPage();
-            this.linkLabelPath = new System.Windows.Forms.LinkLabel();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(14, 17);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 13);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Configuration File";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBox1.Location = new System.Drawing.Point(108, 14);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(222, 20);
-            this.textBox1.TabIndex = 1;
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Location = new System.Drawing.Point(336, 14);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(78, 20);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "Browse";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // propertyGrid1
-            // 
-            this.propertyGrid1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.propertyGrid1.Location = new System.Drawing.Point(20, 73);
-            this.propertyGrid1.Name = "propertyGrid1";
-            this.propertyGrid1.SelectedObject = this.clangTidyProperties1;
-            this.propertyGrid1.Size = new System.Drawing.Size(391, 384);
-            this.propertyGrid1.TabIndex = 6;
-            this.propertyGrid1.ViewBorderColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.propertyGrid1.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid1_PropertyValueChanged);
-            // 
-            // linkLabelPath
-            // 
-            this.linkLabelPath.AutoSize = true;
-            this.linkLabelPath.Location = new System.Drawing.Point(29, 50);
-            this.linkLabelPath.Name = "linkLabelPath";
-            this.linkLabelPath.Size = new System.Drawing.Size(55, 13);
-            this.linkLabelPath.TabIndex = 7;
-            this.linkLabelPath.TabStop = true;
-            this.linkLabelPath.Text = "linkLabel1";
-            this.linkLabelPath.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelPath_LinkClicked);
-            // 
-            // ClangTidyPropertyGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.linkLabelPath);
-            this.Controls.Add(this.propertyGrid1);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Name = "ClangTidyPropertyGrid";
-            this.Size = new System.Drawing.Size(444, 469);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.PropertyGrid propertyGrid1;
-        private ClangTidyProperties clangTidyProperties1;
-        private ClangTidyConfigurationPage clangTidyConfigurationPage1;
-        private System.Windows.Forms.LinkLabel linkLabelPath;
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyPropertyGrid.cs

@@ -1,208 +0,0 @@
-//===-- ClangTidyPropertyGrid.cs - UI for configuring clang-tidy -*- C# -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This class contains a UserControl consisting of a .NET PropertyGrid control
-// allowing configuration of checks and check options for ClangTidy.
-//
-//===----------------------------------------------------------------------===//
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.IO;
-using Microsoft.VisualStudio.Shell;
-
-namespace LLVM.ClangTidy
-{
-    /// <summary>
-    ///  A UserControl displaying a PropertyGrid allowing configuration of clang-tidy
-    ///  checks and check options, as well as serialization and deserialization of
-    ///  clang-tidy configuration files.  When a configuration file is loaded, the
-    ///  entire chain of configuration files is analyzed based on the file path,
-    ///  and quick access is provided to edit or view any of the files in the
-    ///  configuration chain, allowing easy visualization of where values come from
-    ///  (similar in spirit to the -explain-config option of clang-tidy).
-    /// </summary>
-    public partial class ClangTidyPropertyGrid : UserControl
-    {
-        /// <summary>
-        /// The sequence of .clang-tidy configuration files, starting from the root
-        /// of the filesystem, down to the selected file.
-        /// </summary>
-        List<KeyValuePair<string, ClangTidyProperties>> PropertyChain_ = null;
-
-        public ClangTidyPropertyGrid()
-        {
-            InitializeComponent();
-            InitializeSettings();
-        }
-
-        private enum ShouldCancel
-        {
-            Yes,
-            No,
-        }
-
-        public void SaveSettingsToStorage()
-        {
-            PersistUnsavedChanges(false);
-        }
-
-        private ShouldCancel PersistUnsavedChanges(bool PromptFirst)
-        {
-            var UnsavedResults = PropertyChain_.Where(x => x.Key != null && x.Value.GetHasUnsavedChanges());
-            if (UnsavedResults.Count() == 0)
-                return ShouldCancel.No;
-
-            bool ShouldSave = false;
-            if (PromptFirst)
-            {
-                var Response = MessageBox.Show(
-                    "You have unsaved changes!  Do you want to save before loading a new file?",
-                    "clang-tidy",
-                    MessageBoxButtons.YesNoCancel);
-
-                ShouldSave = (Response == DialogResult.Yes);
-                if (Response == DialogResult.Cancel)
-                    return ShouldCancel.Yes;
-            }
-            else
-                ShouldSave = true;
-
-            if (ShouldSave)
-            {
-                foreach (var Result in UnsavedResults)
-                {
-                    ClangTidyConfigParser.SerializeClangTidyFile(Result.Value, Result.Key);
-                    Result.Value.SetHasUnsavedChanges(false);
-                }
-            }
-            return ShouldCancel.No;
-        }
-
-        public void InitializeSettings()
-        {
-            PropertyChain_ = new List<KeyValuePair<string, ClangTidyProperties>>();
-            PropertyChain_.Add(new KeyValuePair<string, ClangTidyProperties>(null, ClangTidyProperties.RootProperties));
-            reloadPropertyChain();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            ShouldCancel Cancel = PersistUnsavedChanges(true);
-            if (Cancel == ShouldCancel.Yes)
-                return;
-
-            using (OpenFileDialog D = new OpenFileDialog())
-            {
-                D.Filter = "Clang Tidy files|.clang-tidy";
-                D.CheckPathExists = true;
-                D.CheckFileExists = true;
-
-                if (D.ShowDialog() == DialogResult.OK)
-                {
-                    PropertyChain_.Clear();
-                    PropertyChain_ = ClangTidyConfigParser.ParseConfigurationChain(D.FileName);
-                    textBox1.Text = D.FileName;
-                    reloadPropertyChain();
-                }
-            }
-        }
-
-        private static readonly string DefaultText = "(Default)";
-        private static readonly string BrowseText = "Browse for a file to edit its properties";
-
-        /// <summary>
-        /// After a new configuration file is chosen, analyzes the directory hierarchy
-        /// and finds all .clang-tidy files in the path, parses them and updates the
-        /// PropertyGrid and quick-access LinkLabel control to reflect the new property
-        /// chain.
-        /// </summary>
-        private void reloadPropertyChain()
-        {
-            StringBuilder LinkBuilder = new StringBuilder();
-            LinkBuilder.Append(DefaultText);
-            LinkBuilder.Append(" > ");
-            int PrefixLength = LinkBuilder.Length;
-
-            if (PropertyChain_.Count == 1)
-                LinkBuilder.Append(BrowseText);
-            else
-                LinkBuilder.Append(PropertyChain_[PropertyChain_.Count - 1].Key);
-
-            linkLabelPath.Text = LinkBuilder.ToString();
-
-            // Given a path like D:\Foo\Bar\Baz, construct a LinkLabel where individual
-            // components of the path are clickable iff they contain a .clang-tidy file.
-            // Clicking one of the links then updates the PropertyGrid to display the
-            // selected .clang-tidy file.
-            ClangTidyProperties LastProps = ClangTidyProperties.RootProperties;
-            linkLabelPath.Links.Clear();
-            linkLabelPath.Links.Add(0, DefaultText.Length, LastProps);
-            foreach (var Prop in PropertyChain_.Skip(1))
-            {
-                LastProps = Prop.Value;
-                string ClangTidyFolder = Path.GetFileName(Prop.Key);
-                int ClangTidyFolderOffset = Prop.Key.Length - ClangTidyFolder.Length;
-                linkLabelPath.Links.Add(PrefixLength + ClangTidyFolderOffset, ClangTidyFolder.Length, LastProps);
-            }
-            propertyGrid1.SelectedObject = LastProps;
-        }
-
-        private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
-        {
-            ClangTidyProperties Props = (ClangTidyProperties)propertyGrid1.SelectedObject;
-            Props.SetHasUnsavedChanges(true);
-
-            // When a CategoryVerb is selected, perform the corresponding action.
-            PropertyDescriptor Property = e.ChangedItem.PropertyDescriptor;
-            if (!(e.ChangedItem.Value is CategoryVerb))
-                return;
-
-            CategoryVerb Action = (CategoryVerb)e.ChangedItem.Value;
-            if (Action == CategoryVerb.None)
-                return;
-
-            var Category = Property.Attributes.OfType<CategoryAttribute>().FirstOrDefault();
-            if (Category == null)
-                return;
-            var SameCategoryProps = Props.GetProperties(new Attribute[] { Category });
-            foreach (PropertyDescriptor P in SameCategoryProps)
-            {
-                if (P == Property)
-                    continue;
-                switch (Action)
-                {
-                    case CategoryVerb.Disable:
-                        P.SetValue(propertyGrid1.SelectedObject, false);
-                        break;
-                    case CategoryVerb.Enable:
-                        P.SetValue(propertyGrid1.SelectedObject, true);
-                        break;
-                    case CategoryVerb.Inherit:
-                        P.ResetValue(propertyGrid1.SelectedObject);
-                        break;
-                }
-            }
-            Property.ResetValue(propertyGrid1.SelectedObject);
-            propertyGrid1.Invalidate();
-        }
-
-        private void linkLabelPath_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            ClangTidyProperties Props = (ClangTidyProperties)e.Link.LinkData;
-            propertyGrid1.SelectedObject = Props;
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ClangTidyPropertyGrid.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="clangTidyConfigurationPage1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>183, 17</value>
-  </metadata>
-</root>

clang-tools-extra/clang-tidy-vs/ClangTidy/DynamicPropertyComponent.Designer.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    partial class DynamicPropertyComponent
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/DynamicPropertyComponent.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    /// <summary>
-    /// The goal of this class is to enable displaying of a PropertyGrid in much the
-    /// same way that Visual Studio's C++ project system does.  A project or file can
-    /// have properties which might inherit from their parent, or be overridden.
-    /// It turns out this is somewhat non-trivial.  The .NET PropertyGrid is good makes
-    /// displaying simple properties with a static notion of what constitutes a
-    /// "default" value very easy.  You simply apply an Attribute to the class that says
-    /// what the default value is and you're done.  But when you try to introduce the idea
-    /// that a property's default value depends on some other factor, things get much more
-    /// complicated due to the static nature of Attributes.
-    /// 
-    /// The solution to this is to inherit from ICustomTypeDescriptor.  This is the mechanism
-    /// by which you can inject or modify attributes or properties at runtime.  The .NET
-    /// PropertyGrid is designed in such a way that instead of using simple .NET Reflection to
-    /// look for the properties and attributes on a class, it will invoke the methods of
-    /// ICustomTypeDescriptor (if your type inherits from it), and ask those methods.  Our
-    /// implementation of ICustomTypeDescriptor works by waiting until the PropertyGrid requests
-    /// PropertyDescriptors for each of the properties, and then "decorating" them with our
-    /// own custom PropertyDescriptor implementation which understands the proeprty inheritance
-    /// model we wish to implement.
-    /// </summary>
-    public partial class DynamicPropertyComponent : Component, ICustomTypeDescriptor
-    {
-        PropertyDescriptorCollection DynamicProperties_ = new PropertyDescriptorCollection(null);
-        private DynamicPropertyComponent Parent_;
-
-        public DynamicPropertyComponent(DynamicPropertyComponent Parent)
-        {
-            Parent_ = Parent;
-        }
-
-        public DynamicPropertyComponent(DynamicPropertyComponent Parent, IContainer container)
-        {
-            Parent_ = Parent;
-
-            container.Add(this);
-            InitializeComponent();
-        }
-
-        public AttributeCollection GetAttributes()
-        {
-            return TypeDescriptor.GetAttributes(GetType());
-        }
-
-        public string GetClassName()
-        {
-            return TypeDescriptor.GetClassName(GetType());
-        }
-
-        public string GetComponentName()
-        {
-            return TypeDescriptor.GetComponentName(GetType());
-        }
-
-        public TypeConverter GetConverter()
-        {
-            return TypeDescriptor.GetConverter(GetType());
-        }
-
-        public EventDescriptor GetDefaultEvent()
-        {
-            return TypeDescriptor.GetDefaultEvent(GetType());
-        }
-
-        public PropertyDescriptor GetDefaultProperty()
-        {
-            return TypeDescriptor.GetDefaultProperty(GetType());
-        }
-
-        public object GetEditor(Type editorBaseType)
-        {
-            return TypeDescriptor.GetEditor(GetType(), editorBaseType);
-        }
-
-        public EventDescriptorCollection GetEvents()
-        {
-            return TypeDescriptor.GetEvents(GetType());
-        }
-
-        public EventDescriptorCollection GetEvents(Attribute[] attributes)
-        {
-            return TypeDescriptor.GetEvents(GetType(), attributes);
-        }
-
-        public PropertyDescriptorCollection GetProperties()
-        {
-            return DynamicProperties_;
-        }
-
-        public PropertyDescriptorCollection GetProperties(Attribute[] attributes)
-        {
-            var Props = DynamicProperties_.OfType<PropertyDescriptor>();
-            var Filtered = Props.Where(x => x.Attributes.Contains(attributes)).ToArray();
-            return new PropertyDescriptorCollection(Filtered);
-        }
-
-        public object GetPropertyOwner(PropertyDescriptor pd)
-        {
-            return this;
-        }
-
-        public void SetDynamicValue<T>(string Name, T Value)
-        {
-            Name = Name.Replace('-', '_');
-            DynamicPropertyDescriptor<T> Descriptor = (DynamicPropertyDescriptor<T>)DynamicProperties_.Find(Name, false);
-            Descriptor.SetValue(this, Value);
-        }
-
-        public T GetDynamicValue<T>(string Name)
-        {
-            Name = Name.Replace('-', '_');
-            DynamicPropertyDescriptor<T> Descriptor = (DynamicPropertyDescriptor<T>)DynamicProperties_.Find(Name, false);
-            return (T)Descriptor.GetValue(this);
-        }
-
-        protected void AddDynamicProperty<T>(string Name, Attribute[] Attributes)
-        {
-            Name = Name.Replace('-', '_');
-
-            // If we have a parent, find the corresponding PropertyDescriptor with the same
-            // name from the parent.
-            DynamicPropertyDescriptor<T> ParentDescriptor = null;
-            if (Parent_ != null)
-                ParentDescriptor = (DynamicPropertyDescriptor<T>)Parent_.GetProperties().Find(Name, false);
-
-            DynamicProperties_.Add(new DynamicPropertyDescriptor<T>(Name, ParentDescriptor, Name, Attributes));
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/DynamicPropertyConverter.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    class MagicInheritance
-    {
-        public static readonly string Value = "{3A27184D-1774-489B-9BB7-7191B8E8E622}";
-        public static readonly string Text = "<Inherit from project or parent>";
-    }
-
-
-    class DynamicPropertyConverter<T> : TypeConverter
-    {
-        private DynamicPropertyDescriptor<T> Descriptor_;
-        private TypeConverter Root_;
-
-        public DynamicPropertyConverter(DynamicPropertyDescriptor<T> Descriptor, TypeConverter Root)
-        {
-            Descriptor_ = Descriptor;
-            Root_ = Root;
-        }
-
-        /// <summary>
-        /// Returns true if there are specific values that can be chosen from a dropdown
-        /// for this property.  Regardless of whether standard values are supported for
-        /// the underlying type, we always support standard values because we need to
-        /// display the inheritance option.
-        /// </summary>
-        /// <returns>true</returns>
-        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Get the set of all standard values that can be chosen from a dropdown for this
-        /// property.  If the underlying type supports standard values, we want to include
-        /// all those.  Additionally, we want to display the option to inherit the value,
-        /// but only if the value is not already inheriting.
-        /// </summary>
-        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
-        {
-            List<object> Values = new List<object>();
-            if (Root_.GetStandardValuesSupported(context))
-            {
-                StandardValuesCollection RootValues = Root_.GetStandardValues(context);
-                Values.AddRange(RootValues.Cast<object>());
-            }
-            if (!Descriptor_.IsInheriting)
-                Values.Add(MagicInheritance.Value);
-            StandardValuesCollection Result = new StandardValuesCollection(Values);
-            return Result;
-        }
-
-        /// <summary>
-        /// Determines whether this property can accept values other than those specified
-        /// in the dropdown (for example by manually typing into the field).
-        /// </summary>
-        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
-        {
-            // Although we add items to the dropdown list, we do not change whether or not
-            // the set of values are exclusive.  If the user could type into the field before
-            // they still can.  And if they couldn't before, they still can't.
-            return Root_.GetStandardValuesExclusive(context);
-        }
-
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return Root_.CanConvertFrom(context, sourceType);
-        }
-
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
-        {
-            return Root_.CanConvertTo(context, destinationType);
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            if (value.Equals(MagicInheritance.Value))
-                return MagicInheritance.Text;
-            return Root_.ConvertFrom(context, culture, value);
-        }
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            if (value.GetType() == destinationType)
-                return value;
-
-            return Root_.ConvertTo(context, culture, value, destinationType);
-        }
-
-        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
-        {
-            return Root_.CreateInstance(context, propertyValues);
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Root_.Equals(obj);
-        }
-
-        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
-        {
-            return Root_.GetCreateInstanceSupported(context);
-        }
-
-        public override int GetHashCode()
-        {
-            return Root_.GetHashCode();
-        }
-
-        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
-        {
-            return Root_.GetProperties(context, value, attributes);
-        }
-
-        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
-        {
-            return Root_.GetPropertiesSupported(context);
-        }
-
-        public override bool IsValid(ITypeDescriptorContext context, object value)
-        {
-            return Root_.IsValid(context, value);
-        }
-
-        public override string ToString()
-        {
-            return Root_.ToString();
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/DynamicPropertyDescriptor.cs

@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    public class DynamicPropertyDescriptor<T> : PropertyDescriptor
-    {
-        T Value_;
-        DynamicPropertyDescriptor<T> Parent_;
-        bool IsInheriting_;
-        object Component_;
-
-        public DynamicPropertyDescriptor(object Component, DynamicPropertyDescriptor<T> Parent, string Name, Attribute[] Attrs)
-            : base(Name, Attrs)
-        {
-            foreach (DefaultValueAttribute Attr in Attrs.OfType<DefaultValueAttribute>())
-            {
-                Value_ = (T)Attr.Value;
-            }
-            Parent_ = Parent;
-            IsInheriting_ = true;
-            Component_ = Component;
-        }
-
-        public bool IsInheriting { get { return IsInheriting_; } set { IsInheriting_ = value; } }
-        public DynamicPropertyDescriptor<T> Parent { get { return Parent_; } }
-
-        /// <summary>
-        /// Determines whether this property's value should be considered "default" (e.g.
-        /// displayed in bold in the property grid).  Root properties are unmodifiable and
-        /// always default.  Non-root properties are default iff they are inheriting.
-        /// That is to say, if a property is explicitly set to False, the property should
-        /// be serialized even if the parent is also False.  It would only not be serialized
-        /// if the user had explicitly chosen to inherit it.
-        /// </summary>
-        /// <param name="component"></param>
-        /// <returns></returns>
-        public override bool ShouldSerializeValue(object component)
-        {
-            return (Parent_ != null) && !IsInheriting;
-        }
-
-        /// <summary>
-        /// Set the value back to the default.  For root properties, this essentially does
-        /// nothing as they are read-only anyway.  For non-root properties, this only means
-        /// that the property is now inheriting.
-        /// </summary>
-        /// <param name="component"></param>
-        public override void ResetValue(object component)
-        {
-            IsInheriting_ = true;
-        }
-
-        public override void SetValue(object component, object value)
-        {
-            // This is a bit of a trick.  If the user chose the inheritance option from the
-            // dropdown, we will try to set the value to that string.  So look for that and
-            // then just reset the value.
-            if (value.Equals(MagicInheritance.Text))
-                ResetValue(component);
-            else
-            {
-                // By explicitly setting the value, this property is no longer inheriting,
-                // even if the value the property is being set to is the same as that of
-                // the parent.
-                IsInheriting_ = false;
-                Value_ = (T)value;
-            }
-        }
-
-        public override TypeConverter Converter
-        {
-            get
-            {
-                // We need to return a DynamicPropertyConverter<> that can deal with our requirement
-                // to inject the inherit property option into the dropdown.  But we still need to use
-                // the "real" converter to do the actual work for the underlying type.  Therefore,
-                // we need to look for a TypeConverter<> attribute on the property, and if it is present
-                // forward an instance of that converter to the DynamicPropertyConverter<>.  Otherwise,
-                // forward an instance of the default converter for type T to the DynamicPropertyConverter<>.
-                TypeConverter UnderlyingConverter = null;
-                var ConverterAttr = this.Attributes.OfType<TypeConverterAttribute>().LastOrDefault();
-                if (ConverterAttr != null)
-                {
-                    Type ConverterType = Type.GetType(ConverterAttr.ConverterTypeName);
-                    UnderlyingConverter = (TypeConverter)Activator.CreateInstance(ConverterType);
-                }
-                else
-                    UnderlyingConverter = TypeDescriptor.GetConverter(typeof(T));
-
-                return new DynamicPropertyConverter<T>(this, UnderlyingConverter);
-            }
-        }
-
-        public override bool IsReadOnly
-        {
-            get
-            {
-                return (Parent_ == null);
-            }
-        }
-
-        public override Type ComponentType
-        {
-            get
-            {
-                return Component_.GetType();
-            }
-        }
-
-        public override object GetValue(object component)
-        {
-            // Return either this property's value or the parents value, depending on
-            // whether or not this property is inheriting.
-            if (IsInheriting_ && Parent != null)
-                return Parent.GetValue(component);
-            return Value_;
-        }
-
-        public override bool CanResetValue(object component)
-        {
-            return !IsReadOnly;
-        }
-
-        public override Type PropertyType
-        {
-            get
-            {
-                return typeof(T);
-            }
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/ForwardingPropertyDescriptor.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    /// <summary>
-    /// A decorator of sorts.  Accepts a PropertyDescriptor to its constructor
-    /// and forwards all calls to the underlying PropertyDescriptor.  In this way
-    /// we can inherit from ForwardingPropertyDescriptor and override only the
-    /// few methods we need to customize the behavior of, while allowing the
-    /// underlying PropertyDescriptor to do the real work.
-    /// </summary>
-    public abstract class ForwardingPropertyDescriptor : PropertyDescriptor
-    {
-        private readonly PropertyDescriptor root;
-        protected PropertyDescriptor Root { get { return root; } }
-        protected ForwardingPropertyDescriptor(PropertyDescriptor root)
-            : base(root)
-        {
-            this.root = root;
-        }
-
-        public override void AddValueChanged(object component, EventHandler handler)
-        {
-            root.AddValueChanged(component, handler);
-        }
-
-        public override AttributeCollection Attributes
-        {
-            get
-            {
-                return root.Attributes;
-            }
-        }
-
-        public override bool CanResetValue(object component)
-        {
-            return root.CanResetValue(component);
-        }
-
-        public override string Category
-        {
-            get
-            {
-                return root.Category;
-            }
-        }
-
-        public override Type ComponentType
-        {
-            get
-            {
-                return root.ComponentType;
-            }
-        }
-
-        public override TypeConverter Converter
-        {
-            get
-            {
-                return root.Converter;
-            }
-        }
-
-        public override string Description
-        {
-            get
-            {
-                return root.Description;
-            }
-        }
-
-        public override bool DesignTimeOnly
-        {
-            get
-            {
-                return root.DesignTimeOnly;
-            }
-        }
-
-        public override string DisplayName
-        {
-            get
-            {
-                return root.DisplayName;
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            return root.Equals(obj);
-        }
-
-        public override PropertyDescriptorCollection GetChildProperties(object instance, Attribute[] filter)
-        {
-            return root.GetChildProperties(instance, filter);
-        }
-
-        public override object GetEditor(Type editorBaseType)
-        {
-            return root.GetEditor(editorBaseType);
-        }
-
-        public override int GetHashCode()
-        {
-            return root.GetHashCode();
-        }
-
-        public override object GetValue(object component)
-        {
-            return root.GetValue(component);
-        }
-
-        public override bool IsBrowsable
-        {
-            get
-            {
-                return root.IsBrowsable;
-            }
-        }
-
-        public override bool IsLocalizable
-        {
-            get
-            {
-                return root.IsLocalizable;
-            }
-        }
-
-        public override bool IsReadOnly
-        {
-            get
-            {
-                return root.IsReadOnly;
-            }
-        }
-
-        public override string Name
-        {
-            get
-            {
-                return root.Name;
-            }
-        }
-
-        public override Type PropertyType
-        {
-            get
-            {
-                return root.PropertyType;
-            }
-        }
-
-        public override void RemoveValueChanged(object component, EventHandler handler)
-        {
-            root.RemoveValueChanged(component, handler);
-        }
-
-        public override void ResetValue(object component)
-        {
-            root.ResetValue(component);
-        }
-
-        public override void SetValue(object component, object value)
-        {
-            root.SetValue(component, value);
-        }
-
-        public override bool ShouldSerializeValue(object component)
-        {
-            return root.ShouldSerializeValue(component);
-        }
-
-        public override bool SupportsChangeEvents
-        {
-            get
-            {
-                return root.SupportsChangeEvents;
-            }
-        }
-
-        public override string ToString()
-        {
-            return root.ToString();
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/GlobalSuppressions.cs

@@ -1,11 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project. Project-level
-// suppressions either have no target or are given a specific target
-// and scoped to a namespace, type, member, etc.
-//
-// To add a suppression to this file, right-click the message in the
-// Error List, point to "Suppress Message(s)", and click "In Project
-// Suppression File". You do not need to add suppressions to this
-// file manually.
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")]

clang-tools-extra/clang-tidy-vs/ClangTidy/Guids.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace LLVM.ClangTidy
-{
-    static class GuidList
-    {
-        public const string guidClangTidyPkgString = "AE4956BE-3DB8-430E-BBAB-7E2E9A014E9C";
-        public const string guidClangTidyCmdSetString = "9E0F0493-6493-46DE-AEE1-ACD8F60F265E";
-
-        public static readonly Guid guidClangTidyCmdSet = new Guid(guidClangTidyCmdSetString);
-    };
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/PkgCmdID.cs

@@ -1,7 +0,0 @@
-namespace LLVM.ClangTidy
-{
-    static class PkgCmdIDList
-    {
-        public const uint cmdidClangTidy = 0x100;
-    };
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/Properties/AssemblyInfo.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClangFormat")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("LLVM")]
-[assembly: AssemblyProduct("ClangFormat")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-// FIXME: Add a way to have this generated automatically by CMake
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]

clang-tools-extra/clang-tidy-vs/ClangTidy/Resources.Designer.cs

@@ -1,81 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace LLVM.ClangTidy {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LLVM.ClangTidy.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ---
-        ///Checks:
-        ///Checks:
-        ///  - Name:        cert-dcl54-cpp
-        ///    Label:       Overloaded allocation function pairs
-        ///    Description: Checks for violations of CERT DCL54-CPP - Overload allocation and deallocation functions as a pair in the same scope
-        ///    Category:    CERT Secure Coding Standards
-        ///  - Name:        cppcoreguidelines-interfaces-global-init
-        ///    Label:       I.22 - Complex Global Initializers
-        ///    Description: Checks for violations of Core Guideline I.22 - Avoid complex initializers of global object [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string ClangTidyChecks {
-            get {
-                return ResourceManager.GetString("ClangTidyChecks", resourceCulture);
-            }
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/Resources.resx

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ClangTidyChecks" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\ClangTidyChecks.yaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-</root>

clang-tools-extra/clang-tidy-vs/ClangTidy/Resources/ClangTidyChecks.yaml

@@ -1,317 +0,0 @@
----
-Checks:
-   # This file should be updated when new checks are added, and eventually we should
-   # generate this file automatically from the .rst files in clang-tidy.
-  - Category:    CERT Secure Coding Standards
-    Label:       Overloaded allocation function pairs
-    Description: Checks for violations of CERT DCL54-CPP - Overload allocation and deallocation functions as a pair in the same scope
-    Name:        cert-dcl54-cpp
-  - Category:    C++ Core Guidelines
-    Label:       I.22 - Complex Global Initializers
-    Description: Checks for violations of Core Guideline I.22 - Avoid complex initializers of global objects
-    Name:        cppcoreguidelines-interfaces-global-init
-  - Category:    CERT Secure Coding Standards
-    Label:       DCL50-CPP
-    Description: Checks for violations of CERT DCL50-CPP - Do not define a C-style variadic function
-    Name:        cert-dcl50-cpp
-  - Category:    C++ Core Guidelines
-    Label:       Bounds.1 - No pointer arithmetic
-    Description: Checks for violations of Core Guideline Bounds.3 - Don't use pointer arithmetic.  Use span<> instead.
-    Name:        cppcoreguidelines-pro-bounds-pointer-arithmetic
-  - Category:    C++ Core Guidelines
-    Label:       Bounds.2 - Constant array indices
-    Description: Checks for violations of Core Bounds.2 - Only index into arrays using constant expressions.
-    Name:        cppcoreguidelines-pro-bounds-constant-array-index
-  - Category:    C++ Core Guidelines
-    Label:       Bounds.3 - Array to Pointer Decay
-    Description: Checks for violations of Core Guideline Bounds.3 - No array-to-pointer decay
-    Name:        cppcoreguidelines-pro-bounds-array-to-pointer-decay
-  - Category:    C++ Core Guidelines
-    Label:       const_cast (Type.3)
-    Description: Checks for violations of Core Guideline Type.3 - Don't use const_cast to cast away const
-    Name:        cppcoreguidelines-pro-type-const-cast
-  - Category:    C++ Core Guidelines
-    Label: C style casts (Type.4)
-    Description: Checks for violations of Core Guideline Type.3 - Don't use C-style (T)expression casts that would perform a static downcast, const_cast, or reinterpret_cast
-    Name:        cppcoreguidelines-pro-type-cstyle-cast
-  - Category:    C++ Core Guidelines
-    Label:       reinterpret_cast (Type.1)
-    Description: Checks for violations of Core Guideline Type.1 - Don't use reinterpret_cast.
-    Name:        cppcoreguidelines-pro-type-reinterpret-cast
-  - Category:    C++ Core Guidelines
-    Label:       Prefer dynamic_cast (Type.2)
-    Description: Checks for violations of Core Guideline Type.2 - Don't use static_cast downcasts.  Use dynamic_cast instead.
-    Name:        cppcoreguidelines-pro-type-static-cast-downcast
-  - Category:    C++ Core Guidelines
-    Label:       Member variable initialization (Type.6)
-    Description: Checks for violations of Core Guideline Type.6 - Always initialize a member variable.
-    Name:        cppcoreguidelines-pro-type-member-init
-  - Category:    C++ Core Guidelines
-    Label:       Avoid unions (Type.7)
-    Description: Checks for violations of Core Guideline Type.7 - Avoid accessing members of raw unions.  Use variant instead.
-    Name:        cppcoreguidelines-pro-type-union-access
-  - Category:    C++ Core Guidelines
-    Label:       Don't use varargs (Type.8)
-    Description: Checks for violations of Core Guideline Type.8 - Avoid reading varargs or passing vararg arguments.  Prefer variadic templates instead.
-    Name:        cppcoreguidelines-pro-type-vararg
-  - Category:    C++ Core Guidelines
-    Label:       Don't slice (ES.63 & C.145)
-    Description: Checks for violations of Core Guidelines ES.63 (Don't slice) and C.145 (Access polymorphic objects through pointers and references)
-    Name:        cppcoreguidelines-slicing
-  - Category:    C++ Core Guidelines
-    Label:       Detect unsafe special functions (C.21)
-    Description: Checks for violations of Core Guidelines C.21 - If you define or =delete any default operation, define or =delete them all.
-    Name:        cppcoreguidelines-special-member-functions
-  - Category:    Google Style Guide
-    Label:       Forbid explicitly parameterized make_pair
-    Description: 
-    Name:        google-build-explicit-make-pair
-  - Category:    Google Style Guide
-    Label:       Anonymous namespace in headers
-    Description: 
-    Name:        google-build-namespaces
-  - Category:    Google Style Guide
-    Label:       Find using namespace directives
-    Description: 
-    Name:        google-build-using-namespace
-  - Category:    Google Style Guide
-    Label:       Default arguments in virtual methods
-    Description: 
-    Name:        google-default-arguments
-  - Category:    Google Style Guide
-    Label:       explicit constructors
-    Description: 
-    Name:        google-explicit-constructor
-  - Category:    Google Style Guide
-    Label:       Global namespace pollution in headers
-    Description: 
-    Name:        google-global-names-in-headers
-  - Category:    Google Style Guide
-    Label:       Braces around statements
-    Description: 
-    Name:        google-readability-braces-around-statements
-  - Category:    Google Style Guide
-    Label:       No C-style casts
-    Description: 
-    Name:        google-readability-casting
-  - Category:    Google Style Guide
-    Label:       Find large functions
-    Description: 
-    Name:        google-readability-function-size
-  - Category:    Google Style Guide
-    Label:       Namespace closing comments
-    Description: 
-    Name:        google-readability-namespace-comments
-  - Category:    Google Style Guide
-    Label:       Find unnecessary calls to .get()
-    Description: 
-    Name:        google-readability-redundant-smartptr-get
-  - Category:    Google Style Guide
-    Label:       Find noncomformant TODO comments
-    Description: 
-    Name:        google-readability-todo
-  - Category:    Google Style Guide
-    Label:       Find implementation-specific integral types
-    Description: 
-    Name:        google-runtime-int
-  - Category:    Google Style Guide
-    Label:       Find zero-length memsets
-    Description: 
-    Name:        google-runtime-memset
-  - Category:    Google Style Guide
-    Label:       Find overloads of operator&
-    Description: 
-    Name:        google-runtime-operator
-  - Category:    Google Style Guide
-    Label:       Check usage of non-const references
-    Description: 
-    Name:        google-runtime-references
-  - Category:    LLVM Style Guide
-    Label:       LLVM header guards
-    Description: 
-    Name:        llvm-header-guard
-  - Category:    LLVM Style Guide
-    Label:       LLVM include order
-    Description: 
-    Name:        llvm-include-order
-  - Category:    LLVM Style Guide
-    Label:       LLVM namespace comments
-    Description: 
-    Name:        llvm-namespace-comment
-  - Category:    LLVM Style Guide
-    Label:       Find local twines
-    Description: 
-    Name:        llvm-twine-local
-  - Category:    Clang Diagnostics
-    Label:       Warnings
-    Description: 
-    Name:        clang-diagnostic-warning
-  - Category:    Clang Diagnostics
-    Label:       Errors
-    Description: 
-    Name:        clang-diagnostic-error
-  - Category:    Clang Diagnostics
-    Label:       Unknown
-    Description: 
-    Name:        clang-diagnostic-unknown
-  - Category:    Miscellaneous
-    Label:       Validate argument comments
-    Description: 
-    Name:        misc-argument-comment
-  - Category:    Miscellaneous
-    Label:       Side effects in assert()
-    Description: 
-    Name:        misc-assert-side-effect
-  - Category:    Miscellaneous
-    Label:       bool / pointer implicit conversions
-    Description: 
-    Name:        misc-bool-pointer-implicit-conversion
-  - Category:    Miscellaneous
-    Label:       Dangling handles
-    Description: 
-    Name:        misc-dangling-handle
-  - Category:    Miscellaneous
-    Label:       Definitions in headers
-    Description: 
-    Name:        misc-definitions-in-headers
-  - Category:    Miscellaneous
-    Label:       Type mismatch in fold operations
-    Description: 
-    Name:        misc-fold-init-type
-  - Category:    Miscellaneous
-    Label:       Forward declaration namespace
-    Description: 
-    Name:        misc-forward-declaration-namespace
-  - Category:    Miscellaneous
-    Label:       Inaccurate erase
-    Description: 
-    Name:        misc-inaccurate-erase
-  - Category:    Miscellaneous
-    Label:       Incorrect rounding
-    Description: 
-    Name:        misc-incorrect-roundings
-  - Category:    Miscellaneous
-    Label:       Inefficient STL algorithms
-    Description: 
-    Name:        misc-inefficient-algorithm
-  - Category:    Miscellaneous
-    Label:       Macro parentheses
-    Description: 
-    Name:        misc-macro-parentheses
-  - Category:    Miscellaneous
-    Label:       Macro repeated side effects
-    Description: 
-    Name:        misc-macro-repeated-side-effects
-  - Category:    Miscellaneous
-    Label:       Misplaced const
-    Description: 
-    Name:        misc-misplaced-const
-  - Category:    Miscellaneous
-    Label:       Misplaced widening casts
-    Description: 
-    Name:        misc-misplaced-widening-cast
-  - Category:    Miscellaneous
-    Label:       Move constructor const arguments
-    Description: 
-    Name:        misc-move-const-arg
-  - Category:    Miscellaneous
-    Label:       Move constructor initialization
-    Description: 
-    Name:        misc-move-constructor-init
-  - Category:    Miscellaneous
-    Label:       Multi-statement macros
-    Description: 
-    Name:        misc-multiple-statement-macro
-  - Category:    Miscellaneous
-    Label:       Verify new / delete overloads
-    Description: 
-    Name:        misc-new-delete-overloads
-  - Category:    Miscellaneous
-    Label:       Ensure move constructors are noexcept
-    Description: 
-    Name:        misc-noexcept-move-constructor
-  - Category:    Miscellaneous
-    Label:       Copying of non-copyable objects
-    Description: 
-    Name:        misc-non-copyable-objects
-  - Category:    Miscellaneous
-    Label:       Find redundant expressions
-    Description: 
-    Name:        misc-redundant-expression
-  - Category:    Miscellaneous
-    Label:       sizeof() on stl containers
-    Description: 
-    Name:        misc-sizeof-container
-  - Category:    Miscellaneous
-    Label:       Suspicious sizeof() usage
-    Description: 
-    Name:        misc-sizeof-expression
-  - Category:    Miscellaneous
-    Label:       Replace assert with static_assert
-    Description: 
-    Name:        misc-static-assert
-  - Category:    Miscellaneous
-    Label:       Suspicious string constructor
-    Description: 
-    Name:        misc-string-constructor
-  - Category:    Miscellaneous
-    Label:       String integer assignment
-    Description: 
-    Name:        misc-string-integer-assignment
-  - Category:    Miscellaneous
-    Label:       String literal with embedded null
-    Description: 
-    Name:        misc-string-literal-with-embedded-nul
-  - Category:    Miscellaneous
-    Label:       Suspicious missing comma
-    Description: 
-    Name:        misc-suspicious-missing-comma
-  - Category:    Miscellaneous
-    Label:       Suspicious semicolon
-    Description: 
-    Name:        misc-suspicious-semicolon
-  - Category:    Miscellaneous
-    Label:       Suspicious string compare
-    Description: 
-    Name:        misc-suspicious-string-compare
-  - Category:    Miscellaneous
-    Label:       Swapped arguments
-    Description: 
-    Name:        misc-swapped-arguments
-  - Category:    Miscellaneous
-    Label:       Throw by value / catch by reference
-    Description: 
-    Name:        misc-throw-by-value-catch-by-reference
-  - Category:    Miscellaneous
-    Label:       Unconventional operator=()
-    Description: 
-    Name:        misc-unconventional-assign-operator
-  - Category:    Miscellaneous
-    Label:       Undelegated constructor
-    Description: 
-    Name:        misc-undelegated-constructor
-  - Category:    Miscellaneous
-    Label:       unique_ptr<> reset / release
-    Description: 
-    Name:        misc-uniqueptr-reset-release
-  - Category:    Miscellaneous
-    Label:       Unused Alias Decls
-    Description: 
-    Name:        misc-unused-alias-decls
-  - Category:    Miscellaneous
-    Label:       Unused Params
-    Description: 
-    Name:        misc-unused-parameters
-  - Category:    Miscellaneous
-    Label:       Unused Raii
-    Description: 
-    Name:        misc-unused-raii
-  - Category:    Miscellaneous
-    Label:       Unused Using Decls
-    Description: 
-    Name:        misc-unused-using-decls
-  - Category:    Miscellaneous
-    Label:       Virtual Near Miss
-    Description: 
-    Name:        misc-virtual-near-miss
-...

clang-tools-extra/clang-tidy-vs/ClangTidy/Utility.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace LLVM.ClangTidy
-{
-    static class Utility
-    {
-        public static IEnumerable<string> SplitPath(string FileOrDir)
-        {
-            string P = Path.GetDirectoryName(FileOrDir);
-            do
-            {
-                yield return P;
-                P = Path.GetDirectoryName(P);
-            } while (P != null);
-        }
-
-        public static bool HasClangTidyFile(string Folder)
-        {
-            string ClangTidy = Path.Combine(Folder, ".clang-tidy");
-            return File.Exists(ClangTidy);
-        }
-
-        public static bool MatchWildcardString(string Value, string Pattern)
-        {
-            string RE = Regex.Escape(Pattern).Replace(@"\*", ".*");
-            return Regex.IsMatch(Value, RE);
-        }
-    }
-}

clang-tools-extra/clang-tidy-vs/ClangTidy/VSPackage.resx

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="110" xml:space="preserve">
-    <value>ClangTidy</value>
-  </data>
-  <data name="112" xml:space="preserve">
-    <value>Analyzes code by calling the clang-tidy executable.</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

clang-tools-extra/clang-tidy-vs/ClangTidy/license.txt

@@ -1,63 +0,0 @@
-==============================================================================
-LLVM Release License
-==============================================================================
-University of Illinois/NCSA
-Open Source License
-
-Copyright (c) 2007-2018 University of Illinois at Urbana-Champaign.
-All rights reserved.
-
-Developed by:
-
-    LLVM Team
-
-    University of Illinois at Urbana-Champaign
-
-    http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimers in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the LLVM Team, University of Illinois at
-      Urbana-Champaign, nor the names of its contributors may be used to
-      endorse or promote products derived from this Software without specific
-      prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
-
-==============================================================================
-The LLVM software contains code written by third parties.  Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the LLVM Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program             Directory
--------             ---------
-<none yet>
-

clang-tools-extra/clang-tidy-vs/ClangTidy/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Brutal.Dev.StrongNameSigner" version="1.8.0" targetFramework="net45" />
-  <package id="YamlDotNet" version="3.3.0" targetFramework="net45" />
-  <package id="YamlDotNet.Dynamic" version="3.2.3" targetFramework="net45" />
-</packages>

clang-tools-extra/clang-tidy-vs/ClangTidy/source.extension.vsixmanifest

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Vsix Version="1.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="405594C3-042A-4155-B9A6-E25DAB8B1924">
-    <Name>ClangFormat</Name>
-    <Author>LLVM</Author>
-    <Version>4.0.0</Version>
-    <Description xml:space="preserve">A static analysis tool for C/C++ code.</Description>
-    <Locale>1033</Locale>
-    <MoreInfoUrl>http://clang.llvm.org/extra/clang-tidy/</MoreInfoUrl>
-    <License>license.txt</License>
-    <InstalledByMsi>false</InstalledByMsi>
-    <SupportedProducts>
-      <VisualStudio Version="10.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="11.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="12.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="14.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-    </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
-  </Identifier>
-  <References>
-        <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-            <Name>Visual Studio MPF</Name>
-        </Reference>
-  </References>
-  <Content>
-    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
-  </Content>
-</Vsix>

clang-tools-extra/clang-tidy-vs/README.txt

@@ -1,17 +0,0 @@
-This directory contains a VSPackage project to generate a Visual Studio extension
-for clang-tidy.
-
-Build prerequisites are:
-- Visual Studio 2013 Professional
-- Visual Studio 2013 SDK
-- Visual Studio 2010 Professional (?)
-- Visual Studio 2010 SDK (?)
-
-The extension is built using CMake by setting BUILD_CLANG_TIDY_VS_PLUGIN=ON
-when configuring a Clang build, and building the clang_tidy_vsix target.
-
-The CMake build will copy clang-tidy.exe and LICENSE.TXT into the ClangTidy/
-directory so they can be bundled with the plug-in, as well as creating
-ClangTidy/source.extension.vsixmanifest. Once the plug-in has been built with
-CMake once, it can be built manually from the ClangTidy.sln solution in Visual
-Studio.

clang-tools-extra/clang-tidy-vs/source.extension.vsixmanifest.in

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Vsix Version="1.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="405594C3-042A-4155-B9A6-E25DAB8B1924">
-    <Name>ClangTidy</Name>
-    <Author>LLVM</Author>
-    <Version>@CLANG_TIDY_VS_VERSION@</Version>
-    <Description xml:space="preserve">A static analysis tool for C/C++ code.</Description>
-    <Locale>1033</Locale>
-    <MoreInfoUrl>http://clang.llvm.org/extra/clang-tidy/</MoreInfoUrl>
-    <License>license.txt</License>
-    <InstalledByMsi>false</InstalledByMsi>
-    <SupportedProducts>
-      <VisualStudio Version="10.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="11.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="12.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="14.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-    </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
-  </Identifier>
-  <References>
-        <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-            <Name>Visual Studio MPF</Name>
-        </Reference>
-  </References>
-  <Content>
-    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
-  </Content>
-</Vsix>

clang-tools-extra/clang-tidy/CMakeLists.txt

@@ -1,58 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_library(clangTidy
-  ClangTidy.cpp
-  ClangTidyModule.cpp
-  ClangTidyDiagnosticConsumer.cpp
-  ClangTidyOptions.cpp
-  ClangTidyProfiling.cpp
-
-  DEPENDS
-  ClangSACheckers
-
-  LINK_LIBS
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangLex
-  clangRewrite
-  clangSema
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  )
-
-if(CLANG_ENABLE_STATIC_ANALYZER)
-  target_link_libraries(clangTidy PRIVATE
-    clangStaticAnalyzerCore
-    clangStaticAnalyzerFrontend
-  )
-endif()
-
-add_subdirectory(android)
-add_subdirectory(abseil)
-add_subdirectory(boost)
-add_subdirectory(bugprone)
-add_subdirectory(cert)
-add_subdirectory(cppcoreguidelines)
-add_subdirectory(fuchsia)
-add_subdirectory(google)
-add_subdirectory(hicpp)
-add_subdirectory(llvm)
-add_subdirectory(misc)
-add_subdirectory(modernize)
-if(CLANG_ENABLE_STATIC_ANALYZER)
-  add_subdirectory(mpi)
-endif()
-add_subdirectory(objc)
-add_subdirectory(performance)
-add_subdirectory(plugin)
-add_subdirectory(portability)
-add_subdirectory(readability)
-add_subdirectory(tool)
-add_subdirectory(utils)
-add_subdirectory(zircon)

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -1,623 +0,0 @@
-//===--- tools/extra/clang-tidy/ClangTidy.cpp - Clang tidy tool -----------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-///  \file This file implements a clang-tidy tool.
-///
-///  This tool uses the Clang Tooling infrastructure, see
-///    http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html
-///  for details on setting it up with LLVM source tree.
-///
-//===----------------------------------------------------------------------===//
-
-#include "ClangTidy.h"
-#include "ClangTidyDiagnosticConsumer.h"
-#include "ClangTidyModuleRegistry.h"
-#include "ClangTidyProfiling.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Config/config.h"
-#include "clang/Format/Format.h"
-#include "clang/Frontend/ASTConsumers.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Frontend/MultiplexConsumer.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Lex/PPCallbacks.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Rewrite/Frontend/FixItRewriter.h"
-#include "clang/Rewrite/Frontend/FrontendActions.h"
-#if CLANG_ENABLE_STATIC_ANALYZER
-#include "clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#endif // CLANG_ENABLE_STATIC_ANALYZER
-#include "clang/Tooling/DiagnosticsYaml.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/ReplacementsYaml.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/Signals.h"
-#include <algorithm>
-#include <utility>
-
-using namespace clang::ast_matchers;
-using namespace clang::driver;
-using namespace clang::tooling;
-using namespace llvm;
-
-LLVM_INSTANTIATE_REGISTRY(clang::tidy::ClangTidyModuleRegistry)
-
-namespace clang {
-namespace tidy {
-
-namespace {
-#if CLANG_ENABLE_STATIC_ANALYZER
-static const char *AnalyzerCheckNamePrefix = "clang-analyzer-";
-
-class AnalyzerDiagnosticConsumer : public ento::PathDiagnosticConsumer {
-public:
-  AnalyzerDiagnosticConsumer(ClangTidyContext &Context) : Context(Context) {}
-
-  void FlushDiagnosticsImpl(std::vector<const ento::PathDiagnostic *> &Diags,
-                            FilesMade *filesMade) override {
-    for (const ento::PathDiagnostic *PD : Diags) {
-      SmallString<64> CheckName(AnalyzerCheckNamePrefix);
-      CheckName += PD->getCheckName();
-      Context.diag(CheckName, PD->getLocation().asLocation(),
-                   PD->getShortDescription())
-          << PD->path.back()->getRanges();
-
-      for (const auto &DiagPiece :
-           PD->path.flatten(/*ShouldFlattenMacros=*/true)) {
-        Context.diag(CheckName, DiagPiece->getLocation().asLocation(),
-                     DiagPiece->getString(), DiagnosticIDs::Note)
-            << DiagPiece->getRanges();
-      }
-    }
-  }
-
-  StringRef getName() const override { return "ClangTidyDiags"; }
-  bool supportsLogicalOpControlFlow() const override { return true; }
-  bool supportsCrossFileDiagnostics() const override { return true; }
-
-private:
-  ClangTidyContext &Context;
-};
-#endif // CLANG_ENABLE_STATIC_ANALYZER
-
-class ErrorReporter {
-public:
-  ErrorReporter(ClangTidyContext &Context, bool ApplyFixes,
-                llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS)
-      : Files(FileSystemOptions(), BaseFS), DiagOpts(new DiagnosticOptions()),
-        DiagPrinter(new TextDiagnosticPrinter(llvm::outs(), &*DiagOpts)),
-        Diags(IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), &*DiagOpts,
-              DiagPrinter),
-        SourceMgr(Diags, Files), Context(Context), ApplyFixes(ApplyFixes),
-        TotalFixes(0), AppliedFixes(0), WarningsAsErrors(0) {
-    DiagOpts->ShowColors = llvm::sys::Process::StandardOutHasColors();
-    DiagPrinter->BeginSourceFile(LangOpts);
-  }
-
-  SourceManager &getSourceManager() { return SourceMgr; }
-
-  void reportDiagnostic(const ClangTidyError &Error) {
-    const tooling::DiagnosticMessage &Message = Error.Message;
-    SourceLocation Loc = getLocation(Message.FilePath, Message.FileOffset);
-    // Contains a pair for each attempted fix: location and whether the fix was
-    // applied successfully.
-    SmallVector<std::pair<SourceLocation, bool>, 4> FixLocations;
-    {
-      auto Level = static_cast<DiagnosticsEngine::Level>(Error.DiagLevel);
-      std::string Name = Error.DiagnosticName;
-      if (Error.IsWarningAsError) {
-        Name += ",-warnings-as-errors";
-        Level = DiagnosticsEngine::Error;
-        WarningsAsErrors++;
-      }
-      auto Diag = Diags.Report(Loc, Diags.getCustomDiagID(Level, "%0 [%1]"))
-                  << Message.Message << Name;
-      for (const auto &FileAndReplacements : Error.Fix) {
-        for (const auto &Repl : FileAndReplacements.second) {
-          SourceLocation FixLoc;
-          ++TotalFixes;
-          bool CanBeApplied = false;
-          if (Repl.isApplicable()) {
-            SmallString<128> FixAbsoluteFilePath = Repl.getFilePath();
-            Files.makeAbsolutePath(FixAbsoluteFilePath);
-            if (ApplyFixes) {
-              tooling::Replacement R(FixAbsoluteFilePath, Repl.getOffset(),
-                                     Repl.getLength(),
-                                     Repl.getReplacementText());
-              Replacements &Replacements = FileReplacements[R.getFilePath()];
-              llvm::Error Err = Replacements.add(R);
-              if (Err) {
-                // FIXME: Implement better conflict handling.
-                llvm::errs() << "Trying to resolve conflict: "
-                             << llvm::toString(std::move(Err)) << "\n";
-                unsigned NewOffset =
-                    Replacements.getShiftedCodePosition(R.getOffset());
-                unsigned NewLength = Replacements.getShiftedCodePosition(
-                                         R.getOffset() + R.getLength()) -
-                                     NewOffset;
-                if (NewLength == R.getLength()) {
-                  R = Replacement(R.getFilePath(), NewOffset, NewLength,
-                                  R.getReplacementText());
-                  Replacements = Replacements.merge(tooling::Replacements(R));
-                  CanBeApplied = true;
-                  ++AppliedFixes;
-                } else {
-                  llvm::errs()
-                      << "Can't resolve conflict, skipping the replacement.\n";
-                }
-
-              } else {
-                CanBeApplied = true;
-                ++AppliedFixes;
-              }
-            }
-            FixLoc = getLocation(FixAbsoluteFilePath, Repl.getOffset());
-            SourceLocation FixEndLoc =
-                FixLoc.getLocWithOffset(Repl.getLength());
-            // Retrieve the source range for applicable fixes. Macro definitions
-            // on the command line have locations in a virtual buffer and don't
-            // have valid file paths and are therefore not applicable.
-            CharSourceRange Range =
-                CharSourceRange::getCharRange(SourceRange(FixLoc, FixEndLoc));
-            Diag << FixItHint::CreateReplacement(Range,
-                                                 Repl.getReplacementText());
-          }
-
-          if (ApplyFixes)
-            FixLocations.push_back(std::make_pair(FixLoc, CanBeApplied));
-        }
-      }
-    }
-    for (auto Fix : FixLocations) {
-      Diags.Report(Fix.first, Fix.second ? diag::note_fixit_applied
-                                         : diag::note_fixit_failed);
-    }
-    for (const auto &Note : Error.Notes)
-      reportNote(Note);
-  }
-
-  void Finish() {
-    if (ApplyFixes && TotalFixes > 0) {
-      Rewriter Rewrite(SourceMgr, LangOpts);
-      for (const auto &FileAndReplacements : FileReplacements) {
-        StringRef File = FileAndReplacements.first();
-        llvm::ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer =
-            SourceMgr.getFileManager().getBufferForFile(File);
-        if (!Buffer) {
-          llvm::errs() << "Can't get buffer for file " << File << ": "
-                       << Buffer.getError().message() << "\n";
-          // FIXME: Maybe don't apply fixes for other files as well.
-          continue;
-        }
-        StringRef Code = Buffer.get()->getBuffer();
-        auto Style = format::getStyle(
-            *Context.getOptionsForFile(File).FormatStyle, File, "none");
-        if (!Style) {
-          llvm::errs() << llvm::toString(Style.takeError()) << "\n";
-          continue;
-        }
-        llvm::Expected<tooling::Replacements> Replacements =
-            format::cleanupAroundReplacements(Code, FileAndReplacements.second,
-                                              *Style);
-        if (!Replacements) {
-          llvm::errs() << llvm::toString(Replacements.takeError()) << "\n";
-          continue;
-        }
-        if (llvm::Expected<tooling::Replacements> FormattedReplacements =
-                format::formatReplacements(Code, *Replacements, *Style)) {
-          Replacements = std::move(FormattedReplacements);
-          if (!Replacements)
-            llvm_unreachable("!Replacements");
-        } else {
-          llvm::errs() << llvm::toString(FormattedReplacements.takeError())
-                       << ". Skipping formatting.\n";
-        }
-        if (!tooling::applyAllReplacements(Replacements.get(), Rewrite)) {
-          llvm::errs() << "Can't apply replacements for file " << File << "\n";
-        }
-      }
-      if (Rewrite.overwriteChangedFiles()) {
-        llvm::errs() << "clang-tidy failed to apply suggested fixes.\n";
-      } else {
-        llvm::errs() << "clang-tidy applied " << AppliedFixes << " of "
-                     << TotalFixes << " suggested fixes.\n";
-      }
-    }
-  }
-
-  unsigned getWarningsAsErrorsCount() const { return WarningsAsErrors; }
-
-private:
-  SourceLocation getLocation(StringRef FilePath, unsigned Offset) {
-    if (FilePath.empty())
-      return SourceLocation();
-
-    const FileEntry *File = SourceMgr.getFileManager().getFile(FilePath);
-    FileID ID = SourceMgr.getOrCreateFileID(File, SrcMgr::C_User);
-    return SourceMgr.getLocForStartOfFile(ID).getLocWithOffset(Offset);
-  }
-
-  void reportNote(const tooling::DiagnosticMessage &Message) {
-    SourceLocation Loc = getLocation(Message.FilePath, Message.FileOffset);
-    Diags.Report(Loc, Diags.getCustomDiagID(DiagnosticsEngine::Note, "%0"))
-        << Message.Message;
-  }
-
-  FileManager Files;
-  LangOptions LangOpts; // FIXME: use langopts from each original file
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts;
-  DiagnosticConsumer *DiagPrinter;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  llvm::StringMap<Replacements> FileReplacements;
-  ClangTidyContext &Context;
-  bool ApplyFixes;
-  unsigned TotalFixes;
-  unsigned AppliedFixes;
-  unsigned WarningsAsErrors;
-};
-
-class ClangTidyASTConsumer : public MultiplexConsumer {
-public:
-  ClangTidyASTConsumer(std::vector<std::unique_ptr<ASTConsumer>> Consumers,
-                       std::unique_ptr<ClangTidyProfiling> Profiling,
-                       std::unique_ptr<ast_matchers::MatchFinder> Finder,
-                       std::vector<std::unique_ptr<ClangTidyCheck>> Checks)
-      : MultiplexConsumer(std::move(Consumers)),
-        Profiling(std::move(Profiling)), Finder(std::move(Finder)),
-        Checks(std::move(Checks)) {}
-
-private:
-  // Destructor order matters! Profiling must be destructed last.
-  // Or at least after Finder.
-  std::unique_ptr<ClangTidyProfiling> Profiling;
-  std::unique_ptr<ast_matchers::MatchFinder> Finder;
-  std::vector<std::unique_ptr<ClangTidyCheck>> Checks;
-};
-
-} // namespace
-
-ClangTidyASTConsumerFactory::ClangTidyASTConsumerFactory(
-    ClangTidyContext &Context)
-    : Context(Context), CheckFactories(new ClangTidyCheckFactories) {
-  for (ClangTidyModuleRegistry::iterator I = ClangTidyModuleRegistry::begin(),
-                                         E = ClangTidyModuleRegistry::end();
-       I != E; ++I) {
-    std::unique_ptr<ClangTidyModule> Module(I->instantiate());
-    Module->addCheckFactories(*CheckFactories);
-  }
-}
-
-#if CLANG_ENABLE_STATIC_ANALYZER
-static void setStaticAnalyzerCheckerOpts(const ClangTidyOptions &Opts,
-                                         AnalyzerOptionsRef AnalyzerOptions) {
-  StringRef AnalyzerPrefix(AnalyzerCheckNamePrefix);
-  for (const auto &Opt : Opts.CheckOptions) {
-    StringRef OptName(Opt.first);
-    if (!OptName.startswith(AnalyzerPrefix))
-      continue;
-    AnalyzerOptions->Config[OptName.substr(AnalyzerPrefix.size())] = Opt.second;
-  }
-}
-
-typedef std::vector<std::pair<std::string, bool>> CheckersList;
-
-static CheckersList getCheckersControlList(ClangTidyContext &Context,
-                                           bool IncludeExperimental) {
-  CheckersList List;
-
-  const auto &RegisteredCheckers =
-      AnalyzerOptions::getRegisteredCheckers(IncludeExperimental);
-  bool AnalyzerChecksEnabled = false;
-  for (StringRef CheckName : RegisteredCheckers) {
-    std::string ClangTidyCheckName((AnalyzerCheckNamePrefix + CheckName).str());
-    AnalyzerChecksEnabled |= Context.isCheckEnabled(ClangTidyCheckName);
-  }
-
-  if (!AnalyzerChecksEnabled)
-    return List;
-
-  // List all static analyzer checkers that our filter enables.
-  //
-  // Always add all core checkers if any other static analyzer check is enabled.
-  // This is currently necessary, as other path sensitive checks rely on the
-  // core checkers.
-  for (StringRef CheckName : RegisteredCheckers) {
-    std::string ClangTidyCheckName((AnalyzerCheckNamePrefix + CheckName).str());
-
-    if (CheckName.startswith("core") ||
-        Context.isCheckEnabled(ClangTidyCheckName)) {
-      List.emplace_back(CheckName, true);
-    }
-  }
-  return List;
-}
-#endif // CLANG_ENABLE_STATIC_ANALYZER
-
-std::unique_ptr<clang::ASTConsumer>
-ClangTidyASTConsumerFactory::CreateASTConsumer(
-    clang::CompilerInstance &Compiler, StringRef File) {
-  // FIXME: Move this to a separate method, so that CreateASTConsumer doesn't
-  // modify Compiler.
-  Context.setSourceManager(&Compiler.getSourceManager());
-  Context.setCurrentFile(File);
-  Context.setASTContext(&Compiler.getASTContext());
-
-  auto WorkingDir = Compiler.getSourceManager()
-                        .getFileManager()
-                        .getVirtualFileSystem()
-                        ->getCurrentWorkingDirectory();
-  if (WorkingDir)
-    Context.setCurrentBuildDirectory(WorkingDir.get());
-
-  std::vector<std::unique_ptr<ClangTidyCheck>> Checks;
-  CheckFactories->createChecks(&Context, Checks);
-
-  ast_matchers::MatchFinder::MatchFinderOptions FinderOptions;
-
-  std::unique_ptr<ClangTidyProfiling> Profiling;
-  if (Context.getEnableProfiling()) {
-    Profiling = llvm::make_unique<ClangTidyProfiling>(
-        Context.getProfileStorageParams());
-    FinderOptions.CheckProfiling.emplace(Profiling->Records);
-  }
-
-  std::unique_ptr<ast_matchers::MatchFinder> Finder(
-      new ast_matchers::MatchFinder(std::move(FinderOptions)));
-
-  for (auto &Check : Checks) {
-    Check->registerMatchers(&*Finder);
-    Check->registerPPCallbacks(Compiler);
-  }
-
-  std::vector<std::unique_ptr<ASTConsumer>> Consumers;
-  if (!Checks.empty())
-    Consumers.push_back(Finder->newASTConsumer());
-
-#if CLANG_ENABLE_STATIC_ANALYZER
-  AnalyzerOptionsRef AnalyzerOptions = Compiler.getAnalyzerOpts();
-  AnalyzerOptions->CheckersControlList =
-      getCheckersControlList(Context, Context.canEnableAnalyzerAlphaCheckers());
-  if (!AnalyzerOptions->CheckersControlList.empty()) {
-    setStaticAnalyzerCheckerOpts(Context.getOptions(), AnalyzerOptions);
-    AnalyzerOptions->AnalysisStoreOpt = RegionStoreModel;
-    AnalyzerOptions->AnalysisDiagOpt = PD_NONE;
-    AnalyzerOptions->AnalyzeNestedBlocks = true;
-    AnalyzerOptions->eagerlyAssumeBinOpBifurcation = true;
-    std::unique_ptr<ento::AnalysisASTConsumer> AnalysisConsumer =
-        ento::CreateAnalysisConsumer(Compiler);
-    AnalysisConsumer->AddDiagnosticConsumer(
-        new AnalyzerDiagnosticConsumer(Context));
-    Consumers.push_back(std::move(AnalysisConsumer));
-  }
-#endif // CLANG_ENABLE_STATIC_ANALYZER
-  return llvm::make_unique<ClangTidyASTConsumer>(
-      std::move(Consumers), std::move(Profiling), std::move(Finder),
-      std::move(Checks));
-}
-
-std::vector<std::string> ClangTidyASTConsumerFactory::getCheckNames() {
-  std::vector<std::string> CheckNames;
-  for (const auto &CheckFactory : *CheckFactories) {
-    if (Context.isCheckEnabled(CheckFactory.first))
-      CheckNames.push_back(CheckFactory.first);
-  }
-
-#if CLANG_ENABLE_STATIC_ANALYZER
-  for (const auto &AnalyzerCheck : getCheckersControlList(
-           Context, Context.canEnableAnalyzerAlphaCheckers()))
-    CheckNames.push_back(AnalyzerCheckNamePrefix + AnalyzerCheck.first);
-#endif // CLANG_ENABLE_STATIC_ANALYZER
-
-  std::sort(CheckNames.begin(), CheckNames.end());
-  return CheckNames;
-}
-
-ClangTidyOptions::OptionMap ClangTidyASTConsumerFactory::getCheckOptions() {
-  ClangTidyOptions::OptionMap Options;
-  std::vector<std::unique_ptr<ClangTidyCheck>> Checks;
-  CheckFactories->createChecks(&Context, Checks);
-  for (const auto &Check : Checks)
-    Check->storeOptions(Options);
-  return Options;
-}
-
-DiagnosticBuilder ClangTidyCheck::diag(SourceLocation Loc, StringRef Message,
-                                       DiagnosticIDs::Level Level) {
-  return Context->diag(CheckName, Loc, Message, Level);
-}
-
-void ClangTidyCheck::run(const ast_matchers::MatchFinder::MatchResult &Result) {
-  // For historical reasons, checks don't implement the MatchFinder run()
-  // callback directly. We keep the run()/check() distinction to avoid interface
-  // churn, and to allow us to add cross-cutting logic in the future.
-  check(Result);
-}
-
-OptionsView::OptionsView(StringRef CheckName,
-                         const ClangTidyOptions::OptionMap &CheckOptions)
-    : NamePrefix(CheckName.str() + "."), CheckOptions(CheckOptions) {}
-
-std::string OptionsView::get(StringRef LocalName, StringRef Default) const {
-  const auto &Iter = CheckOptions.find(NamePrefix + LocalName.str());
-  if (Iter != CheckOptions.end())
-    return Iter->second;
-  return Default;
-}
-
-std::string OptionsView::getLocalOrGlobal(StringRef LocalName,
-                                          StringRef Default) const {
-  auto Iter = CheckOptions.find(NamePrefix + LocalName.str());
-  if (Iter != CheckOptions.end())
-    return Iter->second;
-  // Fallback to global setting, if present.
-  Iter = CheckOptions.find(LocalName.str());
-  if (Iter != CheckOptions.end())
-    return Iter->second;
-  return Default;
-}
-
-void OptionsView::store(ClangTidyOptions::OptionMap &Options,
-                        StringRef LocalName, StringRef Value) const {
-  Options[NamePrefix + LocalName.str()] = Value;
-}
-
-void OptionsView::store(ClangTidyOptions::OptionMap &Options,
-                        StringRef LocalName, int64_t Value) const {
-  store(Options, LocalName, llvm::itostr(Value));
-}
-
-std::vector<std::string>
-getCheckNames(const ClangTidyOptions &Options,
-              bool AllowEnablingAnalyzerAlphaCheckers) {
-  clang::tidy::ClangTidyContext Context(
-      llvm::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(),
-                                                Options),
-      AllowEnablingAnalyzerAlphaCheckers);
-  ClangTidyASTConsumerFactory Factory(Context);
-  return Factory.getCheckNames();
-}
-
-ClangTidyOptions::OptionMap
-getCheckOptions(const ClangTidyOptions &Options,
-                bool AllowEnablingAnalyzerAlphaCheckers) {
-  clang::tidy::ClangTidyContext Context(
-      llvm::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(),
-                                                Options),
-      AllowEnablingAnalyzerAlphaCheckers);
-  ClangTidyASTConsumerFactory Factory(Context);
-  return Factory.getCheckOptions();
-}
-
-std::vector<ClangTidyError>
-runClangTidy(clang::tidy::ClangTidyContext &Context,
-             const CompilationDatabase &Compilations,
-             ArrayRef<std::string> InputFiles,
-             llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-             bool EnableCheckProfile, llvm::StringRef StoreCheckProfile) {
-  ClangTool Tool(Compilations, InputFiles,
-                 std::make_shared<PCHContainerOperations>(), BaseFS);
-
-  // Add extra arguments passed by the clang-tidy command-line.
-  ArgumentsAdjuster PerFileExtraArgumentsInserter =
-      [&Context](const CommandLineArguments &Args, StringRef Filename) {
-        ClangTidyOptions Opts = Context.getOptionsForFile(Filename);
-        CommandLineArguments AdjustedArgs = Args;
-        if (Opts.ExtraArgsBefore) {
-          auto I = AdjustedArgs.begin();
-          if (I != AdjustedArgs.end() && !StringRef(*I).startswith("-"))
-            ++I; // Skip compiler binary name, if it is there.
-          AdjustedArgs.insert(I, Opts.ExtraArgsBefore->begin(),
-                              Opts.ExtraArgsBefore->end());
-        }
-        if (Opts.ExtraArgs)
-          AdjustedArgs.insert(AdjustedArgs.end(), Opts.ExtraArgs->begin(),
-                              Opts.ExtraArgs->end());
-        return AdjustedArgs;
-      };
-
-  Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);
-  Tool.appendArgumentsAdjuster(getStripPluginsAdjuster());
-  Context.setEnableProfiling(EnableCheckProfile);
-  Context.setProfileStoragePrefix(StoreCheckProfile);
-
-  ClangTidyDiagnosticConsumer DiagConsumer(Context);
-  DiagnosticsEngine DE(new DiagnosticIDs(), new DiagnosticOptions(),
-                       &DiagConsumer, /*ShouldOwnClient=*/false);
-  Context.setDiagnosticsEngine(&DE);
-  Tool.setDiagnosticConsumer(&DiagConsumer);
-
-  class ActionFactory : public FrontendActionFactory {
-  public:
-    ActionFactory(ClangTidyContext &Context) : ConsumerFactory(Context) {}
-    FrontendAction *create() override { return new Action(&ConsumerFactory); }
-
-    bool runInvocation(std::shared_ptr<CompilerInvocation> Invocation,
-                       FileManager *Files,
-                       std::shared_ptr<PCHContainerOperations> PCHContainerOps,
-                       DiagnosticConsumer *DiagConsumer) override {
-      // Explicitly set ProgramAction to RunAnalysis to make the preprocessor
-      // define __clang_analyzer__ macro. The frontend analyzer action will not
-      // be called here.
-      Invocation->getFrontendOpts().ProgramAction = frontend::RunAnalysis;
-      return FrontendActionFactory::runInvocation(
-          Invocation, Files, PCHContainerOps, DiagConsumer);
-    }
-
-  private:
-    class Action : public ASTFrontendAction {
-    public:
-      Action(ClangTidyASTConsumerFactory *Factory) : Factory(Factory) {}
-      std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                     StringRef File) override {
-        return Factory->CreateASTConsumer(Compiler, File);
-      }
-
-    private:
-      ClangTidyASTConsumerFactory *Factory;
-    };
-
-    ClangTidyASTConsumerFactory ConsumerFactory;
-  };
-
-  ActionFactory Factory(Context);
-  Tool.run(&Factory);
-  return DiagConsumer.take();
-}
-
-void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
-                  ClangTidyContext &Context, bool Fix,
-                  unsigned &WarningsAsErrorsCount,
-                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
-  ErrorReporter Reporter(Context, Fix, BaseFS);
-  llvm::vfs::FileSystem &FileSystem =
-      *Reporter.getSourceManager().getFileManager().getVirtualFileSystem();
-  auto InitialWorkingDir = FileSystem.getCurrentWorkingDirectory();
-  if (!InitialWorkingDir)
-    llvm::report_fatal_error("Cannot get current working path.");
-
-  for (const ClangTidyError &Error : Errors) {
-    if (!Error.BuildDirectory.empty()) {
-      // By default, the working directory of file system is the current
-      // clang-tidy running directory.
-      //
-      // Change the directory to the one used during the analysis.
-      FileSystem.setCurrentWorkingDirectory(Error.BuildDirectory);
-    }
-    Reporter.reportDiagnostic(Error);
-    // Return to the initial directory to correctly resolve next Error.
-    FileSystem.setCurrentWorkingDirectory(InitialWorkingDir.get());
-  }
-  Reporter.Finish();
-  WarningsAsErrorsCount += Reporter.getWarningsAsErrorsCount();
-}
-
-void exportReplacements(const llvm::StringRef MainFilePath,
-                        const std::vector<ClangTidyError> &Errors,
-                        raw_ostream &OS) {
-  TranslationUnitDiagnostics TUD;
-  TUD.MainSourceFile = MainFilePath;
-  for (const auto &Error : Errors) {
-    tooling::Diagnostic Diag = Error;
-    TUD.Diagnostics.insert(TUD.Diagnostics.end(), Diag);
-  }
-
-  yaml::Output YAML(OS);
-  YAML << TUD;
-}
-
-} // namespace tidy
-} // namespace clang

clang-tools-extra/clang-tidy/ClangTidy.h

@@ -1,261 +0,0 @@
-//===--- ClangTidy.h - clang-tidy -------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDY_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDY_H
-
-#include "ClangTidyDiagnosticConsumer.h"
-#include "ClangTidyOptions.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Tooling/Refactoring.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/raw_ostream.h"
-#include <memory>
-#include <type_traits>
-#include <vector>
-
-namespace clang {
-
-class CompilerInstance;
-namespace tooling {
-class CompilationDatabase;
-}
-
-namespace tidy {
-
-/// \brief Provides access to the ``ClangTidyCheck`` options via check-local
-/// names.
-///
-/// Methods of this class prepend ``CheckName + "."`` to translate check-local
-/// option names to global option names.
-class OptionsView {
-public:
-  /// \brief Initializes the instance using \p CheckName + "." as a prefix.
-  OptionsView(StringRef CheckName,
-              const ClangTidyOptions::OptionMap &CheckOptions);
-
-  /// \brief Read a named option from the ``Context``.
-  ///
-  /// Reads the option with the check-local name \p LocalName from the
-  /// ``CheckOptions``. If the corresponding key is not present, returns
-  /// \p Default.
-  std::string get(StringRef LocalName, StringRef Default) const;
-
-  /// \brief Read a named option from the ``Context``.
-  ///
-  /// Reads the option with the check-local name \p LocalName from local or
-  /// global ``CheckOptions``. Gets local option first. If local is not present,
-  /// falls back to get global option. If global option is not present either,
-  /// returns Default.
-  std::string getLocalOrGlobal(StringRef LocalName, StringRef Default) const;
-
-  /// \brief Read a named option from the ``Context`` and parse it as an
-  /// integral type ``T``.
-  ///
-  /// Reads the option with the check-local name \p LocalName from the
-  /// ``CheckOptions``. If the corresponding key is not present, returns
-  /// \p Default.
-  template <typename T>
-  typename std::enable_if<std::is_integral<T>::value, T>::type
-  get(StringRef LocalName, T Default) const {
-    std::string Value = get(LocalName, "");
-    T Result = Default;
-    if (!Value.empty())
-      StringRef(Value).getAsInteger(10, Result);
-    return Result;
-  }
-
-  /// \brief Read a named option from the ``Context`` and parse it as an
-  /// integral type ``T``.
-  ///
-  /// Reads the option with the check-local name \p LocalName from local or
-  /// global ``CheckOptions``. Gets local option first. If local is not present,
-  /// falls back to get global option. If global option is not present either,
-  /// returns Default.
-  template <typename T>
-  typename std::enable_if<std::is_integral<T>::value, T>::type
-  getLocalOrGlobal(StringRef LocalName, T Default) const {
-    std::string Value = getLocalOrGlobal(LocalName, "");
-    T Result = Default;
-    if (!Value.empty())
-      StringRef(Value).getAsInteger(10, Result);
-    return Result;
-  }
-
-  /// \brief Stores an option with the check-local name \p LocalName with string
-  /// value \p Value to \p Options.
-  void store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
-             StringRef Value) const;
-
-  /// \brief Stores an option with the check-local name \p LocalName with
-  /// ``int64_t`` value \p Value to \p Options.
-  void store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
-             int64_t Value) const;
-
-private:
-  std::string NamePrefix;
-  const ClangTidyOptions::OptionMap &CheckOptions;
-};
-
-/// \brief Base class for all clang-tidy checks.
-///
-/// To implement a ``ClangTidyCheck``, write a subclass and override some of the
-/// base class's methods. E.g. to implement a check that validates namespace
-/// declarations, override ``registerMatchers``:
-///
-/// ~~~{.cpp}
-/// void registerMatchers(ast_matchers::MatchFinder *Finder) override {
-///   Finder->addMatcher(namespaceDecl().bind("namespace"), this);
-/// }
-/// ~~~
-///
-/// and then override ``check(const MatchResult &Result)`` to do the actual
-/// check for each match.
-///
-/// A new ``ClangTidyCheck`` instance is created per translation unit.
-///
-/// FIXME: Figure out whether carrying information from one TU to another is
-/// useful/necessary.
-class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
-public:
-  /// \brief Initializes the check with \p CheckName and \p Context.
-  ///
-  /// Derived classes must implement the constructor with this signature or
-  /// delegate it. If a check needs to read options, it can do this in the
-  /// constructor using the Options.get() methods below.
-  ClangTidyCheck(StringRef CheckName, ClangTidyContext *Context)
-      : CheckName(CheckName), Context(Context),
-        Options(CheckName, Context->getOptions().CheckOptions) {
-    assert(Context != nullptr);
-    assert(!CheckName.empty());
-  }
-
-  /// \brief Override this to register ``PPCallbacks`` with ``Compiler``.
-  ///
-  /// This should be used for clang-tidy checks that analyze preprocessor-
-  /// dependent properties, e.g. the order of include directives.
-  virtual void registerPPCallbacks(CompilerInstance &Compiler) {}
-
-  /// \brief Override this to register AST matchers with \p Finder.
-  ///
-  /// This should be used by clang-tidy checks that analyze code properties that
-  /// dependent on AST knowledge.
-  ///
-  /// You can register as many matchers as necessary with \p Finder. Usually,
-  /// "this" will be used as callback, but you can also specify other callback
-  /// classes. Thereby, different matchers can trigger different callbacks.
-  ///
-  /// If you need to merge information between the different matchers, you can
-  /// store these as members of the derived class. However, note that all
-  /// matches occur in the order of the AST traversal.
-  virtual void registerMatchers(ast_matchers::MatchFinder *Finder) {}
-
-  /// \brief ``ClangTidyChecks`` that register ASTMatchers should do the actual
-  /// work in here.
-  virtual void check(const ast_matchers::MatchFinder::MatchResult &Result) {}
-
-  /// \brief Add a diagnostic with the check's name.
-  DiagnosticBuilder diag(SourceLocation Loc, StringRef Description,
-                         DiagnosticIDs::Level Level = DiagnosticIDs::Warning);
-
-  /// \brief Should store all options supported by this check with their
-  /// current values or default values for options that haven't been overridden.
-  ///
-  /// The check should use ``Options.store()`` to store each option it supports
-  /// whether it has the default value or it has been overridden.
-  virtual void storeOptions(ClangTidyOptions::OptionMap &Options) {}
-
-private:
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override;
-  StringRef getID() const override { return CheckName; }
-  std::string CheckName;
-  ClangTidyContext *Context;
-
-protected:
-  OptionsView Options;
-  /// \brief Returns the main file name of the current translation unit.
-  StringRef getCurrentMainFile() const { return Context->getCurrentFile(); }
-  /// \brief Returns the language options from the context.
-  LangOptions getLangOpts() const { return Context->getLangOpts(); }
-};
-
-class ClangTidyCheckFactories;
-
-class ClangTidyASTConsumerFactory {
-public:
-  ClangTidyASTConsumerFactory(ClangTidyContext &Context);
-
-  /// \brief Returns an ASTConsumer that runs the specified clang-tidy checks.
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &Compiler, StringRef File);
-
-  /// \brief Get the list of enabled checks.
-  std::vector<std::string> getCheckNames();
-
-  /// \brief Get the union of options from all checks.
-  ClangTidyOptions::OptionMap getCheckOptions();
-
-private:
-  ClangTidyContext &Context;
-  std::unique_ptr<ClangTidyCheckFactories> CheckFactories;
-};
-
-/// \brief Fills the list of check names that are enabled when the provided
-/// filters are applied.
-std::vector<std::string> getCheckNames(const ClangTidyOptions &Options,
-                                       bool AllowEnablingAnalyzerAlphaCheckers);
-
-/// \brief Returns the effective check-specific options.
-///
-/// The method configures ClangTidy with the specified \p Options and collects
-/// effective options from all created checks. The returned set of options
-/// includes default check-specific options for all keys not overridden by \p
-/// Options.
-ClangTidyOptions::OptionMap
-getCheckOptions(const ClangTidyOptions &Options,
-                bool AllowEnablingAnalyzerAlphaCheckers);
-
-/// \brief Run a set of clang-tidy checks on a set of files.
-///
-/// \param EnableCheckProfile If provided, it enables check profile collection
-/// in MatchFinder, and will contain the result of the profile.
-/// \param StoreCheckProfile If provided, and EnableCheckProfile is true,
-/// the profile will not be output to stderr, but will instead be stored
-/// as a JSON file in the specified directory.
-std::vector<ClangTidyError>
-runClangTidy(clang::tidy::ClangTidyContext &Context,
-             const tooling::CompilationDatabase &Compilations,
-             ArrayRef<std::string> InputFiles,
-             llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-             bool EnableCheckProfile = false,
-             llvm::StringRef StoreCheckProfile = StringRef());
-
-// FIXME: This interface will need to be significantly extended to be useful.
-// FIXME: Implement confidence levels for displaying/fixing errors.
-//
-/// \brief Displays the found \p Errors to the users. If \p Fix is true, \p
-/// Errors containing fixes are automatically applied and reformatted. If no
-/// clang-format configuration file is found, the given \P FormatStyle is used.
-void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
-                  ClangTidyContext &Context, bool Fix,
-                  unsigned &WarningsAsErrorsCount,
-                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS);
-
-/// \brief Serializes replacements into YAML and writes them to the specified
-/// output stream.
-void exportReplacements(StringRef MainFilePath,
-                        const std::vector<ClangTidyError> &Errors,
-                        raw_ostream &OS);
-
-} // end namespace tidy
-} // end namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDY_H

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp

@@ -1,669 +0,0 @@
-//===--- tools/extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp ----------=== //
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-///  \file This file implements ClangTidyDiagnosticConsumer, ClangTidyContext
-///  and ClangTidyError classes.
-///
-///  This tool uses the Clang Tooling infrastructure, see
-///    http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html
-///  for details on setting it up with LLVM source tree.
-///
-//===----------------------------------------------------------------------===//
-
-#include "ClangTidyDiagnosticConsumer.h"
-#include "ClangTidyOptions.h"
-#include "clang/AST/ASTDiagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Frontend/DiagnosticRenderer.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
-#include <tuple>
-#include <vector>
-using namespace clang;
-using namespace tidy;
-
-namespace {
-class ClangTidyDiagnosticRenderer : public DiagnosticRenderer {
-public:
-  ClangTidyDiagnosticRenderer(const LangOptions &LangOpts,
-                              DiagnosticOptions *DiagOpts,
-                              ClangTidyError &Error)
-      : DiagnosticRenderer(LangOpts, DiagOpts), Error(Error) {}
-
-protected:
-  void emitDiagnosticMessage(FullSourceLoc Loc, PresumedLoc PLoc,
-                             DiagnosticsEngine::Level Level, StringRef Message,
-                             ArrayRef<CharSourceRange> Ranges,
-                             DiagOrStoredDiag Info) override {
-    // Remove check name from the message.
-    // FIXME: Remove this once there's a better way to pass check names than
-    // appending the check name to the message in ClangTidyContext::diag and
-    // using getCustomDiagID.
-    std::string CheckNameInMessage = " [" + Error.DiagnosticName + "]";
-    if (Message.endswith(CheckNameInMessage))
-      Message = Message.substr(0, Message.size() - CheckNameInMessage.size());
-
-    auto TidyMessage =
-        Loc.isValid()
-            ? tooling::DiagnosticMessage(Message, Loc.getManager(), Loc)
-            : tooling::DiagnosticMessage(Message);
-    if (Level == DiagnosticsEngine::Note) {
-      Error.Notes.push_back(TidyMessage);
-      return;
-    }
-    assert(Error.Message.Message.empty() && "Overwriting a diagnostic message");
-    Error.Message = TidyMessage;
-  }
-
-  void emitDiagnosticLoc(FullSourceLoc Loc, PresumedLoc PLoc,
-                         DiagnosticsEngine::Level Level,
-                         ArrayRef<CharSourceRange> Ranges) override {}
-
-  void emitCodeContext(FullSourceLoc Loc, DiagnosticsEngine::Level Level,
-                       SmallVectorImpl<CharSourceRange> &Ranges,
-                       ArrayRef<FixItHint> Hints) override {
-    assert(Loc.isValid());
-    for (const auto &FixIt : Hints) {
-      CharSourceRange Range = FixIt.RemoveRange;
-      assert(Range.getBegin().isValid() && Range.getEnd().isValid() &&
-             "Invalid range in the fix-it hint.");
-      assert(Range.getBegin().isFileID() && Range.getEnd().isFileID() &&
-             "Only file locations supported in fix-it hints.");
-
-      tooling::Replacement Replacement(Loc.getManager(), Range,
-                                       FixIt.CodeToInsert);
-      llvm::Error Err = Error.Fix[Replacement.getFilePath()].add(Replacement);
-      // FIXME: better error handling (at least, don't let other replacements be
-      // applied).
-      if (Err) {
-        llvm::errs() << "Fix conflicts with existing fix! "
-                     << llvm::toString(std::move(Err)) << "\n";
-        assert(false && "Fix conflicts with existing fix!");
-      }
-    }
-  }
-
-  void emitIncludeLocation(FullSourceLoc Loc, PresumedLoc PLoc) override {}
-
-  void emitImportLocation(FullSourceLoc Loc, PresumedLoc PLoc,
-                          StringRef ModuleName) override {}
-
-  void emitBuildingModuleLocation(FullSourceLoc Loc, PresumedLoc PLoc,
-                                  StringRef ModuleName) override {}
-
-  void endDiagnostic(DiagOrStoredDiag D,
-                     DiagnosticsEngine::Level Level) override {
-    assert(!Error.Message.Message.empty() && "Message has not been set");
-  }
-
-private:
-  ClangTidyError &Error;
-};
-} // end anonymous namespace
-
-ClangTidyError::ClangTidyError(StringRef CheckName,
-                               ClangTidyError::Level DiagLevel,
-                               StringRef BuildDirectory, bool IsWarningAsError)
-    : tooling::Diagnostic(CheckName, DiagLevel, BuildDirectory),
-      IsWarningAsError(IsWarningAsError) {}
-
-// Returns true if GlobList starts with the negative indicator ('-'), removes it
-// from the GlobList.
-static bool ConsumeNegativeIndicator(StringRef &GlobList) {
-  GlobList = GlobList.trim(" \r\n");
-  if (GlobList.startswith("-")) {
-    GlobList = GlobList.substr(1);
-    return true;
-  }
-  return false;
-}
-// Converts first glob from the comma-separated list of globs to Regex and
-// removes it and the trailing comma from the GlobList.
-static llvm::Regex ConsumeGlob(StringRef &GlobList) {
-  StringRef UntrimmedGlob = GlobList.substr(0, GlobList.find(','));
-  StringRef Glob = UntrimmedGlob.trim(' ');
-  GlobList = GlobList.substr(UntrimmedGlob.size() + 1);
-  SmallString<128> RegexText("^");
-  StringRef MetaChars("()^$|*+?.[]\\{}");
-  for (char C : Glob) {
-    if (C == '*')
-      RegexText.push_back('.');
-    else if (MetaChars.find(C) != StringRef::npos)
-      RegexText.push_back('\\');
-    RegexText.push_back(C);
-  }
-  RegexText.push_back('$');
-  return llvm::Regex(RegexText);
-}
-
-GlobList::GlobList(StringRef Globs)
-    : Positive(!ConsumeNegativeIndicator(Globs)), Regex(ConsumeGlob(Globs)),
-      NextGlob(Globs.empty() ? nullptr : new GlobList(Globs)) {}
-
-bool GlobList::contains(StringRef S, bool Contains) {
-  if (Regex.match(S))
-    Contains = Positive;
-
-  if (NextGlob)
-    Contains = NextGlob->contains(S, Contains);
-  return Contains;
-}
-
-class ClangTidyContext::CachedGlobList {
-public:
-  CachedGlobList(StringRef Globs) : Globs(Globs) {}
-
-  bool contains(StringRef S) {
-    switch (auto &Result = Cache[S]) {
-      case Yes: return true;
-      case No: return false;
-      case None:
-        Result = Globs.contains(S) ? Yes : No;
-        return Result == Yes;
-    }
-    llvm_unreachable("invalid enum");
-  }
-
-private:
-  GlobList Globs;
-  enum Tristate { None, Yes, No };
-  llvm::StringMap<Tristate> Cache;
-};
-
-ClangTidyContext::ClangTidyContext(
-    std::unique_ptr<ClangTidyOptionsProvider> OptionsProvider,
-    bool AllowEnablingAnalyzerAlphaCheckers)
-    : DiagEngine(nullptr), OptionsProvider(std::move(OptionsProvider)),
-      Profile(false),
-      AllowEnablingAnalyzerAlphaCheckers(AllowEnablingAnalyzerAlphaCheckers) {
-  // Before the first translation unit we can get errors related to command-line
-  // parsing, use empty string for the file name in this case.
-  setCurrentFile("");
-}
-
-ClangTidyContext::~ClangTidyContext() = default;
-
-DiagnosticBuilder ClangTidyContext::diag(
-    StringRef CheckName, SourceLocation Loc, StringRef Description,
-    DiagnosticIDs::Level Level /* = DiagnosticIDs::Warning*/) {
-  assert(Loc.isValid());
-  unsigned ID = DiagEngine->getDiagnosticIDs()->getCustomDiagID(
-      Level, (Description + " [" + CheckName + "]").str());
-  CheckNamesByDiagnosticID.try_emplace(ID, CheckName);
-  return DiagEngine->Report(Loc, ID);
-}
-
-void ClangTidyContext::setSourceManager(SourceManager *SourceMgr) {
-  DiagEngine->setSourceManager(SourceMgr);
-}
-
-void ClangTidyContext::setCurrentFile(StringRef File) {
-  CurrentFile = File;
-  CurrentOptions = getOptionsForFile(CurrentFile);
-  CheckFilter = llvm::make_unique<CachedGlobList>(*getOptions().Checks);
-  WarningAsErrorFilter =
-      llvm::make_unique<CachedGlobList>(*getOptions().WarningsAsErrors);
-}
-
-void ClangTidyContext::setASTContext(ASTContext *Context) {
-  DiagEngine->SetArgToStringFn(&FormatASTNodeDiagnosticArgument, Context);
-  LangOpts = Context->getLangOpts();
-}
-
-const ClangTidyGlobalOptions &ClangTidyContext::getGlobalOptions() const {
-  return OptionsProvider->getGlobalOptions();
-}
-
-const ClangTidyOptions &ClangTidyContext::getOptions() const {
-  return CurrentOptions;
-}
-
-ClangTidyOptions ClangTidyContext::getOptionsForFile(StringRef File) const {
-  // Merge options on top of getDefaults() as a safeguard against options with
-  // unset values.
-  return ClangTidyOptions::getDefaults().mergeWith(
-      OptionsProvider->getOptions(File));
-}
-
-void ClangTidyContext::setEnableProfiling(bool P) { Profile = P; }
-
-void ClangTidyContext::setProfileStoragePrefix(StringRef Prefix) {
-  ProfilePrefix = Prefix;
-}
-
-llvm::Optional<ClangTidyProfiling::StorageParams>
-ClangTidyContext::getProfileStorageParams() const {
-  if (ProfilePrefix.empty())
-    return llvm::None;
-
-  return ClangTidyProfiling::StorageParams(ProfilePrefix, CurrentFile);
-}
-
-bool ClangTidyContext::isCheckEnabled(StringRef CheckName) const {
-  assert(CheckFilter != nullptr);
-  return CheckFilter->contains(CheckName);
-}
-
-bool ClangTidyContext::treatAsError(StringRef CheckName) const {
-  assert(WarningAsErrorFilter != nullptr);
-  return WarningAsErrorFilter->contains(CheckName);
-}
-
-StringRef ClangTidyContext::getCheckName(unsigned DiagnosticID) const {
-  llvm::DenseMap<unsigned, std::string>::const_iterator I =
-      CheckNamesByDiagnosticID.find(DiagnosticID);
-  if (I != CheckNamesByDiagnosticID.end())
-    return I->second;
-  return "";
-}
-
-ClangTidyDiagnosticConsumer::ClangTidyDiagnosticConsumer(
-    ClangTidyContext &Ctx, bool RemoveIncompatibleErrors)
-    : Context(Ctx), RemoveIncompatibleErrors(RemoveIncompatibleErrors),
-      LastErrorRelatesToUserCode(false), LastErrorPassesLineFilter(false),
-      LastErrorWasIgnored(false) {}
-
-void ClangTidyDiagnosticConsumer::finalizeLastError() {
-  if (!Errors.empty()) {
-    ClangTidyError &Error = Errors.back();
-    if (!Context.isCheckEnabled(Error.DiagnosticName) &&
-        Error.DiagLevel != ClangTidyError::Error) {
-      ++Context.Stats.ErrorsIgnoredCheckFilter;
-      Errors.pop_back();
-    } else if (!LastErrorRelatesToUserCode) {
-      ++Context.Stats.ErrorsIgnoredNonUserCode;
-      Errors.pop_back();
-    } else if (!LastErrorPassesLineFilter) {
-      ++Context.Stats.ErrorsIgnoredLineFilter;
-      Errors.pop_back();
-    } else {
-      ++Context.Stats.ErrorsDisplayed;
-    }
-  }
-  LastErrorRelatesToUserCode = false;
-  LastErrorPassesLineFilter = false;
-}
-
-static bool IsNOLINTFound(StringRef NolintDirectiveText, StringRef Line,
-                          unsigned DiagID, const ClangTidyContext &Context) {
-  const size_t NolintIndex = Line.find(NolintDirectiveText);
-  if (NolintIndex == StringRef::npos)
-    return false;
-
-  size_t BracketIndex = NolintIndex + NolintDirectiveText.size();
-  // Check if the specific checks are specified in brackets.
-  if (BracketIndex < Line.size() && Line[BracketIndex] == '(') {
-    ++BracketIndex;
-    const size_t BracketEndIndex = Line.find(')', BracketIndex);
-    if (BracketEndIndex != StringRef::npos) {
-      StringRef ChecksStr =
-          Line.substr(BracketIndex, BracketEndIndex - BracketIndex);
-      // Allow disabling all the checks with "*".
-      if (ChecksStr != "*") {
-        StringRef CheckName = Context.getCheckName(DiagID);
-        // Allow specifying a few check names, delimited with comma.
-        SmallVector<StringRef, 1> Checks;
-        ChecksStr.split(Checks, ',', -1, false);
-        llvm::transform(Checks, Checks.begin(),
-                        [](StringRef S) { return S.trim(); });
-        return llvm::find(Checks, CheckName) != Checks.end();
-      }
-    }
-  }
-  return true;
-}
-
-static bool LineIsMarkedWithNOLINT(const SourceManager &SM, SourceLocation Loc,
-                                   unsigned DiagID,
-                                   const ClangTidyContext &Context) {
-  bool Invalid;
-  const char *CharacterData = SM.getCharacterData(Loc, &Invalid);
-  if (Invalid)
-    return false;
-
-  // Check if there's a NOLINT on this line.
-  const char *P = CharacterData;
-  while (*P != '\0' && *P != '\r' && *P != '\n')
-    ++P;
-  StringRef RestOfLine(CharacterData, P - CharacterData + 1);
-  if (IsNOLINTFound("NOLINT", RestOfLine, DiagID, Context))
-    return true;
-
-  // Check if there's a NOLINTNEXTLINE on the previous line.
-  const char *BufBegin =
-      SM.getCharacterData(SM.getLocForStartOfFile(SM.getFileID(Loc)), &Invalid);
-  if (Invalid || P == BufBegin)
-    return false;
-
-  // Scan backwards over the current line.
-  P = CharacterData;
-  while (P != BufBegin && *P != '\n')
-    --P;
-
-  // If we reached the begin of the file there is no line before it.
-  if (P == BufBegin)
-    return false;
-
-  // Skip over the newline.
-  --P;
-  const char *LineEnd = P;
-
-  // Now we're on the previous line. Skip to the beginning of it.
-  while (P != BufBegin && *P != '\n')
-    --P;
-
-  RestOfLine = StringRef(P, LineEnd - P + 1);
-  if (IsNOLINTFound("NOLINTNEXTLINE", RestOfLine, DiagID, Context))
-    return true;
-
-  return false;
-}
-
-static bool LineIsMarkedWithNOLINTinMacro(const SourceManager &SM,
-                                          SourceLocation Loc, unsigned DiagID,
-                                          const ClangTidyContext &Context) {
-  while (true) {
-    if (LineIsMarkedWithNOLINT(SM, Loc, DiagID, Context))
-      return true;
-    if (!Loc.isMacroID())
-      return false;
-    Loc = SM.getImmediateExpansionRange(Loc).getBegin();
-  }
-  return false;
-}
-
-void ClangTidyDiagnosticConsumer::HandleDiagnostic(
-    DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) {
-  if (LastErrorWasIgnored && DiagLevel == DiagnosticsEngine::Note)
-    return;
-
-  if (Info.getLocation().isValid() && DiagLevel != DiagnosticsEngine::Error &&
-      DiagLevel != DiagnosticsEngine::Fatal &&
-      LineIsMarkedWithNOLINTinMacro(Info.getSourceManager(),
-                                    Info.getLocation(), Info.getID(),
-                                    Context)) {
-    ++Context.Stats.ErrorsIgnoredNOLINT;
-    // Ignored a warning, should ignore related notes as well
-    LastErrorWasIgnored = true;
-    return;
-  }
-
-  LastErrorWasIgnored = false;
-  // Count warnings/errors.
-  DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
-
-  if (DiagLevel == DiagnosticsEngine::Note) {
-    assert(!Errors.empty() &&
-           "A diagnostic note can only be appended to a message.");
-  } else {
-    finalizeLastError();
-    StringRef WarningOption =
-        Context.DiagEngine->getDiagnosticIDs()->getWarningOptionForDiag(
-            Info.getID());
-    std::string CheckName = !WarningOption.empty()
-                                ? ("clang-diagnostic-" + WarningOption).str()
-                                : Context.getCheckName(Info.getID()).str();
-
-    if (CheckName.empty()) {
-      // This is a compiler diagnostic without a warning option. Assign check
-      // name based on its level.
-      switch (DiagLevel) {
-      case DiagnosticsEngine::Error:
-      case DiagnosticsEngine::Fatal:
-        CheckName = "clang-diagnostic-error";
-        break;
-      case DiagnosticsEngine::Warning:
-        CheckName = "clang-diagnostic-warning";
-        break;
-      default:
-        CheckName = "clang-diagnostic-unknown";
-        break;
-      }
-    }
-
-    ClangTidyError::Level Level = ClangTidyError::Warning;
-    if (DiagLevel == DiagnosticsEngine::Error ||
-        DiagLevel == DiagnosticsEngine::Fatal) {
-      // Force reporting of Clang errors regardless of filters and non-user
-      // code.
-      Level = ClangTidyError::Error;
-      LastErrorRelatesToUserCode = true;
-      LastErrorPassesLineFilter = true;
-    }
-    bool IsWarningAsError = DiagLevel == DiagnosticsEngine::Warning &&
-                            Context.treatAsError(CheckName);
-    Errors.emplace_back(CheckName, Level, Context.getCurrentBuildDirectory(),
-                        IsWarningAsError);
-  }
-
-  ClangTidyDiagnosticRenderer Converter(
-      Context.getLangOpts(), &Context.DiagEngine->getDiagnosticOptions(),
-      Errors.back());
-  SmallString<100> Message;
-  Info.FormatDiagnostic(Message);
-  FullSourceLoc Loc;
-  if (Info.getLocation().isValid() && Info.hasSourceManager())
-    Loc = FullSourceLoc(Info.getLocation(), Info.getSourceManager());
-  Converter.emitDiagnostic(Loc, DiagLevel, Message, Info.getRanges(),
-                           Info.getFixItHints());
-
-  if (Info.hasSourceManager())
-    checkFilters(Info.getLocation(), Info.getSourceManager());
-}
-
-bool ClangTidyDiagnosticConsumer::passesLineFilter(StringRef FileName,
-                                                   unsigned LineNumber) const {
-  if (Context.getGlobalOptions().LineFilter.empty())
-    return true;
-  for (const FileFilter &Filter : Context.getGlobalOptions().LineFilter) {
-    if (FileName.endswith(Filter.Name)) {
-      if (Filter.LineRanges.empty())
-        return true;
-      for (const FileFilter::LineRange &Range : Filter.LineRanges) {
-        if (Range.first <= LineNumber && LineNumber <= Range.second)
-          return true;
-      }
-      return false;
-    }
-  }
-  return false;
-}
-
-void ClangTidyDiagnosticConsumer::checkFilters(SourceLocation Location,
-                                               const SourceManager &Sources) {
-  // Invalid location may mean a diagnostic in a command line, don't skip these.
-  if (!Location.isValid()) {
-    LastErrorRelatesToUserCode = true;
-    LastErrorPassesLineFilter = true;
-    return;
-  }
-
-  if (!*Context.getOptions().SystemHeaders &&
-      Sources.isInSystemHeader(Location))
-    return;
-
-  // FIXME: We start with a conservative approach here, but the actual type of
-  // location needed depends on the check (in particular, where this check wants
-  // to apply fixes).
-  FileID FID = Sources.getDecomposedExpansionLoc(Location).first;
-  const FileEntry *File = Sources.getFileEntryForID(FID);
-
-  // -DMACRO definitions on the command line have locations in a virtual buffer
-  // that doesn't have a FileEntry. Don't skip these as well.
-  if (!File) {
-    LastErrorRelatesToUserCode = true;
-    LastErrorPassesLineFilter = true;
-    return;
-  }
-
-  StringRef FileName(File->getName());
-  LastErrorRelatesToUserCode = LastErrorRelatesToUserCode ||
-                               Sources.isInMainFile(Location) ||
-                               getHeaderFilter()->match(FileName);
-
-  unsigned LineNumber = Sources.getExpansionLineNumber(Location);
-  LastErrorPassesLineFilter =
-      LastErrorPassesLineFilter || passesLineFilter(FileName, LineNumber);
-}
-
-llvm::Regex *ClangTidyDiagnosticConsumer::getHeaderFilter() {
-  if (!HeaderFilter)
-    HeaderFilter =
-        llvm::make_unique<llvm::Regex>(*Context.getOptions().HeaderFilterRegex);
-  return HeaderFilter.get();
-}
-
-void ClangTidyDiagnosticConsumer::removeIncompatibleErrors() {
-  // Each error is modelled as the set of intervals in which it applies
-  // replacements. To detect overlapping replacements, we use a sweep line
-  // algorithm over these sets of intervals.
-  // An event here consists of the opening or closing of an interval. During the
-  // process, we maintain a counter with the amount of open intervals. If we
-  // find an endpoint of an interval and this counter is different from 0, it
-  // means that this interval overlaps with another one, so we set it as
-  // inapplicable.
-  struct Event {
-    // An event can be either the begin or the end of an interval.
-    enum EventType {
-      ET_Begin = 1,
-      ET_End = -1,
-    };
-
-    Event(unsigned Begin, unsigned End, EventType Type, unsigned ErrorId,
-          unsigned ErrorSize)
-        : Type(Type), ErrorId(ErrorId) {
-      // The events are going to be sorted by their position. In case of draw:
-      //
-      // * If an interval ends at the same position at which other interval
-      //   begins, this is not an overlapping, so we want to remove the ending
-      //   interval before adding the starting one: end events have higher
-      //   priority than begin events.
-      //
-      // * If we have several begin points at the same position, we will mark as
-      //   inapplicable the ones that we process later, so the first one has to
-      //   be the one with the latest end point, because this one will contain
-      //   all the other intervals. For the same reason, if we have several end
-      //   points in the same position, the last one has to be the one with the
-      //   earliest begin point. In both cases, we sort non-increasingly by the
-      //   position of the complementary.
-      //
-      // * In case of two equal intervals, the one whose error is bigger can
-      //   potentially contain the other one, so we want to process its begin
-      //   points before and its end points later.
-      //
-      // * Finally, if we have two equal intervals whose errors have the same
-      //   size, none of them will be strictly contained inside the other.
-      //   Sorting by ErrorId will guarantee that the begin point of the first
-      //   one will be processed before, disallowing the second one, and the
-      //   end point of the first one will also be processed before,
-      //   disallowing the first one.
-      if (Type == ET_Begin)
-        Priority = std::make_tuple(Begin, Type, -End, -ErrorSize, ErrorId);
-      else
-        Priority = std::make_tuple(End, Type, -Begin, ErrorSize, ErrorId);
-    }
-
-    bool operator<(const Event &Other) const {
-      return Priority < Other.Priority;
-    }
-
-    // Determines if this event is the begin or the end of an interval.
-    EventType Type;
-    // The index of the error to which the interval that generated this event
-    // belongs.
-    unsigned ErrorId;
-    // The events will be sorted based on this field.
-    std::tuple<unsigned, EventType, int, int, unsigned> Priority;
-  };
-
-  // Compute error sizes.
-  std::vector<int> Sizes;
-  for (const auto &Error : Errors) {
-    int Size = 0;
-    for (const auto &FileAndReplaces : Error.Fix) {
-      for (const auto &Replace : FileAndReplaces.second)
-        Size += Replace.getLength();
-    }
-    Sizes.push_back(Size);
-  }
-
-  // Build events from error intervals.
-  std::map<std::string, std::vector<Event>> FileEvents;
-  for (unsigned I = 0; I < Errors.size(); ++I) {
-    for (const auto &FileAndReplace : Errors[I].Fix) {
-      for (const auto &Replace : FileAndReplace.second) {
-        unsigned Begin = Replace.getOffset();
-        unsigned End = Begin + Replace.getLength();
-        const std::string &FilePath = Replace.getFilePath();
-        // FIXME: Handle empty intervals, such as those from insertions.
-        if (Begin == End)
-          continue;
-        auto &Events = FileEvents[FilePath];
-        Events.emplace_back(Begin, End, Event::ET_Begin, I, Sizes[I]);
-        Events.emplace_back(Begin, End, Event::ET_End, I, Sizes[I]);
-      }
-    }
-  }
-
-  std::vector<bool> Apply(Errors.size(), true);
-  for (auto &FileAndEvents : FileEvents) {
-    std::vector<Event> &Events = FileAndEvents.second;
-    // Sweep.
-    std::sort(Events.begin(), Events.end());
-    int OpenIntervals = 0;
-    for (const auto &Event : Events) {
-      if (Event.Type == Event::ET_End)
-        --OpenIntervals;
-      // This has to be checked after removing the interval from the count if it
-      // is an end event, or before adding it if it is a begin event.
-      if (OpenIntervals != 0)
-        Apply[Event.ErrorId] = false;
-      if (Event.Type == Event::ET_Begin)
-        ++OpenIntervals;
-    }
-    assert(OpenIntervals == 0 && "Amount of begin/end points doesn't match");
-  }
-
-  for (unsigned I = 0; I < Errors.size(); ++I) {
-    if (!Apply[I]) {
-      Errors[I].Fix.clear();
-      Errors[I].Notes.emplace_back(
-          "this fix will not be applied because it overlaps with another fix");
-    }
-  }
-}
-
-namespace {
-struct LessClangTidyError {
-  bool operator()(const ClangTidyError &LHS, const ClangTidyError &RHS) const {
-    const tooling::DiagnosticMessage &M1 = LHS.Message;
-    const tooling::DiagnosticMessage &M2 = RHS.Message;
-
-    return std::tie(M1.FilePath, M1.FileOffset, M1.Message) <
-           std::tie(M2.FilePath, M2.FileOffset, M2.Message);
-  }
-};
-struct EqualClangTidyError {
-  bool operator()(const ClangTidyError &LHS, const ClangTidyError &RHS) const {
-    LessClangTidyError Less;
-    return !Less(LHS, RHS) && !Less(RHS, LHS);
-  }
-};
-} // end anonymous namespace
-
-std::vector<ClangTidyError> ClangTidyDiagnosticConsumer::take() {
-  finalizeLastError();
-
-  std::sort(Errors.begin(), Errors.end(), LessClangTidyError());
-  Errors.erase(std::unique(Errors.begin(), Errors.end(), EqualClangTidyError()),
-               Errors.end());
-  if (RemoveIncompatibleErrors)
-    removeIncompatibleErrors();
-  return std::move(Errors);
-}

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h

@@ -1,265 +0,0 @@
-//===--- ClangTidyDiagnosticConsumer.h - clang-tidy -------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYDIAGNOSTICCONSUMER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYDIAGNOSTICCONSUMER_H
-
-#include "ClangTidyOptions.h"
-#include "ClangTidyProfiling.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Tooling/Core/Diagnostic.h"
-#include "clang/Tooling/Refactoring.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/Regex.h"
-#include "llvm/Support/Timer.h"
-
-namespace clang {
-
-class ASTContext;
-class CompilerInstance;
-namespace ast_matchers {
-class MatchFinder;
-}
-namespace tooling {
-class CompilationDatabase;
-}
-
-namespace tidy {
-
-/// \brief A detected error complete with information to display diagnostic and
-/// automatic fix.
-///
-/// This is used as an intermediate format to transport Diagnostics without a
-/// dependency on a SourceManager.
-///
-/// FIXME: Make Diagnostics flexible enough to support this directly.
-struct ClangTidyError : tooling::Diagnostic {
-  ClangTidyError(StringRef CheckName, Level DiagLevel, StringRef BuildDirectory,
-                 bool IsWarningAsError);
-
-  bool IsWarningAsError;
-};
-
-/// \brief Read-only set of strings represented as a list of positive and
-/// negative globs. Positive globs add all matched strings to the set, negative
-/// globs remove them in the order of appearance in the list.
-class GlobList {
-public:
-  /// \brief \p GlobList is a comma-separated list of globs (only '*'
-  /// metacharacter is supported) with optional '-' prefix to denote exclusion.
-  GlobList(StringRef Globs);
-
-  /// \brief Returns \c true if the pattern matches \p S. The result is the last
-  /// matching glob's Positive flag.
-  bool contains(StringRef S) { return contains(S, false); }
-
-private:
-  bool contains(StringRef S, bool Contains);
-
-  bool Positive;
-  llvm::Regex Regex;
-  std::unique_ptr<GlobList> NextGlob;
-};
-
-/// \brief Contains displayed and ignored diagnostic counters for a ClangTidy
-/// run.
-struct ClangTidyStats {
-  ClangTidyStats()
-      : ErrorsDisplayed(0), ErrorsIgnoredCheckFilter(0), ErrorsIgnoredNOLINT(0),
-        ErrorsIgnoredNonUserCode(0), ErrorsIgnoredLineFilter(0) {}
-
-  unsigned ErrorsDisplayed;
-  unsigned ErrorsIgnoredCheckFilter;
-  unsigned ErrorsIgnoredNOLINT;
-  unsigned ErrorsIgnoredNonUserCode;
-  unsigned ErrorsIgnoredLineFilter;
-
-  unsigned errorsIgnored() const {
-    return ErrorsIgnoredNOLINT + ErrorsIgnoredCheckFilter +
-           ErrorsIgnoredNonUserCode + ErrorsIgnoredLineFilter;
-  }
-};
-
-/// \brief Every \c ClangTidyCheck reports errors through a \c DiagnosticsEngine
-/// provided by this context.
-///
-/// A \c ClangTidyCheck always has access to the active context to report
-/// warnings like:
-/// \code
-/// Context->Diag(Loc, "Single-argument constructors must be explicit")
-///     << FixItHint::CreateInsertion(Loc, "explicit ");
-/// \endcode
-class ClangTidyContext {
-public:
-  /// \brief Initializes \c ClangTidyContext instance.
-  ClangTidyContext(std::unique_ptr<ClangTidyOptionsProvider> OptionsProvider,
-                   bool AllowEnablingAnalyzerAlphaCheckers = false);
-  /// Sets the DiagnosticsEngine that diag() will emit diagnostics to.
-  // FIXME: this is required initialization, and should be a constructor param.
-  // Fix the context -> diag engine -> consumer -> context initialization cycle.
-  void setDiagnosticsEngine(DiagnosticsEngine *DiagEngine) {
-    this->DiagEngine = DiagEngine;
-  }
-
-  ~ClangTidyContext();
-
-  /// \brief Report any errors detected using this method.
-  ///
-  /// This is still under heavy development and will likely change towards using
-  /// tablegen'd diagnostic IDs.
-  /// FIXME: Figure out a way to manage ID spaces.
-  DiagnosticBuilder diag(StringRef CheckName, SourceLocation Loc,
-                         StringRef Message,
-                         DiagnosticIDs::Level Level = DiagnosticIDs::Warning);
-
-  /// \brief Sets the \c SourceManager of the used \c DiagnosticsEngine.
-  ///
-  /// This is called from the \c ClangTidyCheck base class.
-  void setSourceManager(SourceManager *SourceMgr);
-
-  /// \brief Should be called when starting to process new translation unit.
-  void setCurrentFile(StringRef File);
-
-  /// \brief Returns the main file name of the current translation unit.
-  StringRef getCurrentFile() const { return CurrentFile; }
-
-  /// \brief Sets ASTContext for the current translation unit.
-  void setASTContext(ASTContext *Context);
-
-  /// \brief Gets the language options from the AST context.
-  const LangOptions &getLangOpts() const { return LangOpts; }
-
-  /// \brief Returns the name of the clang-tidy check which produced this
-  /// diagnostic ID.
-  StringRef getCheckName(unsigned DiagnosticID) const;
-
-  /// \brief Returns \c true if the check is enabled for the \c CurrentFile.
-  ///
-  /// The \c CurrentFile can be changed using \c setCurrentFile.
-  bool isCheckEnabled(StringRef CheckName) const;
-
-  /// \brief Returns \c true if the check should be upgraded to error for the
-  /// \c CurrentFile.
-  bool treatAsError(StringRef CheckName) const;
-
-  /// \brief Returns global options.
-  const ClangTidyGlobalOptions &getGlobalOptions() const;
-
-  /// \brief Returns options for \c CurrentFile.
-  ///
-  /// The \c CurrentFile can be changed using \c setCurrentFile.
-  const ClangTidyOptions &getOptions() const;
-
-  /// \brief Returns options for \c File. Does not change or depend on
-  /// \c CurrentFile.
-  ClangTidyOptions getOptionsForFile(StringRef File) const;
-
-  /// \brief Returns \c ClangTidyStats containing issued and ignored diagnostic
-  /// counters.
-  const ClangTidyStats &getStats() const { return Stats; }
-
-  /// \brief Control profile collection in clang-tidy.
-  void setEnableProfiling(bool Profile);
-  bool getEnableProfiling() const { return Profile; }
-
-  /// \brief Control storage of profile date.
-  void setProfileStoragePrefix(StringRef ProfilePrefix);
-  llvm::Optional<ClangTidyProfiling::StorageParams>
-  getProfileStorageParams() const;
-
-  /// \brief Should be called when starting to process new translation unit.
-  void setCurrentBuildDirectory(StringRef BuildDirectory) {
-    CurrentBuildDirectory = BuildDirectory;
-  }
-
-  /// \brief Returns build directory of the current translation unit.
-  const std::string &getCurrentBuildDirectory() {
-    return CurrentBuildDirectory;
-  }
-
-  /// \brief If the experimental alpha checkers from the static analyzer can be
-  /// enabled.
-  bool canEnableAnalyzerAlphaCheckers() const {
-    return AllowEnablingAnalyzerAlphaCheckers;
-  }
-
-private:
-  // Writes to Stats.
-  friend class ClangTidyDiagnosticConsumer;
-
-  DiagnosticsEngine *DiagEngine;
-  std::unique_ptr<ClangTidyOptionsProvider> OptionsProvider;
-
-  std::string CurrentFile;
-  ClangTidyOptions CurrentOptions;
-  class CachedGlobList;
-  std::unique_ptr<CachedGlobList> CheckFilter;
-  std::unique_ptr<CachedGlobList> WarningAsErrorFilter;
-
-  LangOptions LangOpts;
-
-  ClangTidyStats Stats;
-
-  std::string CurrentBuildDirectory;
-
-  llvm::DenseMap<unsigned, std::string> CheckNamesByDiagnosticID;
-
-  bool Profile;
-  std::string ProfilePrefix;
-
-  bool AllowEnablingAnalyzerAlphaCheckers;
-};
-
-/// \brief A diagnostic consumer that turns each \c Diagnostic into a
-/// \c SourceManager-independent \c ClangTidyError.
-//
-// FIXME: If we move away from unit-tests, this can be moved to a private
-// implementation file.
-class ClangTidyDiagnosticConsumer : public DiagnosticConsumer {
-public:
-  ClangTidyDiagnosticConsumer(ClangTidyContext &Ctx,
-                              bool RemoveIncompatibleErrors = true);
-
-  // FIXME: The concept of converting between FixItHints and Replacements is
-  // more generic and should be pulled out into a more useful Diagnostics
-  // library.
-  void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                        const Diagnostic &Info) override;
-
-  // Retrieve the diagnostics that were captured.
-  std::vector<ClangTidyError> take();
-
-private:
-  void finalizeLastError();
-  void removeIncompatibleErrors();
-
-  /// \brief Returns the \c HeaderFilter constructed for the options set in the
-  /// context.
-  llvm::Regex *getHeaderFilter();
-
-  /// \brief Updates \c LastErrorRelatesToUserCode and LastErrorPassesLineFilter
-  /// according to the diagnostic \p Location.
-  void checkFilters(SourceLocation Location, const SourceManager& Sources);
-  bool passesLineFilter(StringRef FileName, unsigned LineNumber) const;
-
-  ClangTidyContext &Context;
-  bool RemoveIncompatibleErrors;
-  std::vector<ClangTidyError> Errors;
-  std::unique_ptr<llvm::Regex> HeaderFilter;
-  bool LastErrorRelatesToUserCode;
-  bool LastErrorPassesLineFilter;
-  bool LastErrorWasIgnored;
-};
-
-} // end namespace tidy
-} // end namespace clang
-
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYDIAGNOSTICCONSUMER_H

clang-tools-extra/clang-tidy/ClangTidyForceLinker.h

@@ -1,114 +0,0 @@
-//===- ClangTidyForceLinker.h - clang-tidy --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYFORCELINKER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYFORCELINKER_H
-
-#include "clang/Config/config.h"
-#include "llvm/Support/Compiler.h"
-
-namespace clang {
-namespace tidy {
-
-// This anchor is used to force the linker to link the CERTModule.
-extern volatile int CERTModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED CERTModuleAnchorDestination =
-    CERTModuleAnchorSource;
-
-// This anchor is used to force the linker to link the AbseilModule.
-extern volatile int AbseilModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED AbseilModuleAnchorDestination =
-    AbseilModuleAnchorSource;
-
-// This anchor is used to force the linker to link the BoostModule.
-extern volatile int BoostModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED BoostModuleAnchorDestination =
-    BoostModuleAnchorSource;
-
-// This anchor is used to force the linker to link the BugproneModule.
-extern volatile int BugproneModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED BugproneModuleAnchorDestination =
-    BugproneModuleAnchorSource;
-
-// This anchor is used to force the linker to link the LLVMModule.
-extern volatile int LLVMModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED LLVMModuleAnchorDestination =
-    LLVMModuleAnchorSource;
-
-// This anchor is used to force the linker to link the CppCoreGuidelinesModule.
-extern volatile int CppCoreGuidelinesModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED CppCoreGuidelinesModuleAnchorDestination =
-    CppCoreGuidelinesModuleAnchorSource;
-
-// This anchor is used to force the linker to link the FuchsiaModule.
-extern volatile int FuchsiaModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED FuchsiaModuleAnchorDestination =
-    FuchsiaModuleAnchorSource;
-
-// This anchor is used to force the linker to link the GoogleModule.
-extern volatile int GoogleModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED GoogleModuleAnchorDestination =
-    GoogleModuleAnchorSource;
-
-// This anchor is used to force the linker to link the AndroidModule.
-extern volatile int AndroidModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED AndroidModuleAnchorDestination =
-    AndroidModuleAnchorSource;
-
-// This anchor is used to force the linker to link the MiscModule.
-extern volatile int MiscModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED MiscModuleAnchorDestination =
-    MiscModuleAnchorSource;
-
-// This anchor is used to force the linker to link the ModernizeModule.
-extern volatile int ModernizeModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED ModernizeModuleAnchorDestination =
-    ModernizeModuleAnchorSource;
-
-#if CLANG_ENABLE_STATIC_ANALYZER
-// This anchor is used to force the linker to link the MPIModule.
-extern volatile int MPIModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED MPIModuleAnchorDestination =
-    MPIModuleAnchorSource;
-#endif
-
-// This anchor is used to force the linker to link the PerformanceModule.
-extern volatile int PerformanceModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED PerformanceModuleAnchorDestination =
-    PerformanceModuleAnchorSource;
-
-// This anchor is used to force the linker to link the PortabilityModule.
-extern volatile int PortabilityModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED PortabilityModuleAnchorDestination =
-    PortabilityModuleAnchorSource;
-
-// This anchor is used to force the linker to link the ReadabilityModule.
-extern volatile int ReadabilityModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED ReadabilityModuleAnchorDestination =
-    ReadabilityModuleAnchorSource;
-
-// This anchor is used to force the linker to link the ObjCModule.
-extern volatile int ObjCModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED ObjCModuleAnchorDestination =
-    ObjCModuleAnchorSource;
-
-// This anchor is used to force the linker to link the HICPPModule.
-extern volatile int HICPPModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED HICPPModuleAnchorDestination =
-    HICPPModuleAnchorSource;
-
-// This anchor is used to force the linker to link the ZirconModule.
-extern volatile int ZirconModuleAnchorSource;
-static int LLVM_ATTRIBUTE_UNUSED ZirconModuleAnchorDestination =
-    ZirconModuleAnchorSource;
-
-} // namespace tidy
-} // namespace clang
-
-#endif