Merge pull request #656 from alexbatashev/private/aabader/pulldown

LLVM pulldown

Author: vladimirlaz

.git-blame-ignore-revs

@@ -0,0 +1,18 @@
+# Since version 2.23 (released in August 2019), git-blame has a feature
+# to ignore or bypass certain commits.
+#
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# r365730: [Coding style change][lld] Rename variables for non-ELF ports
+136d27ab4de0c1d5dedfecc32a9857be78fa0648
+
+# r365595: [Coding style change] Rename variables so that they start with a lowercase letter
+3837f4273fcc40cc519035479aefe78e5cbd3055
+
+# r280751: [Coding style change][lldb] Moved LLDB code base to use LLVM style
+b9c1b51e45b845debb76d8658edabca70ca56079

.gitignore

@@ -22,7 +22,7 @@
 .DS_store
 
 # Nested build directory
-/build
+/build*
 
 #==============================================================================#
 # Explicit files to ignore (only matches one).
@@ -53,4 +53,4 @@ autoconf/autom4te.cache
 .vscode
 .vs
 # clangd index
-.clangd
+.clangd

clang-tools-extra/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(clang-apply-replacements)
 add_subdirectory(clang-reorder-fields)
 add_subdirectory(modularize)
 add_subdirectory(clang-tidy)
-add_subdirectory(clang-tidy-vs)
 
 add_subdirectory(clang-change-namespace)
 add_subdirectory(clang-doc)

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

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// \brief This file provides the interface for deduplicating, detecting
+/// This file provides the interface for deduplicating, detecting
 /// conflicts in, and applying collections of Replacements.
 ///
 //===----------------------------------------------------------------------===//
@@ -31,21 +31,21 @@ class Rewriter;
 
 namespace replace {
 
-/// \brief Collection of TranslationUnitReplacements.
+/// Collection of TranslationUnitReplacements.
 typedef std::vector<clang::tooling::TranslationUnitReplacements> TUReplacements;
 
-/// \brief Collection of TranslationUnitReplacement files.
+/// Collection of TranslationUnitReplacement files.
 typedef std::vector<std::string> TUReplacementFiles;
 
-/// \brief Collection of TranslationUniDiagnostics.
+/// Collection of TranslationUniDiagnostics.
 typedef std::vector<clang::tooling::TranslationUnitDiagnostics> TUDiagnostics;
 
-/// \brief Map mapping file name to a set of AtomicChange targeting that file.
+/// 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
+/// 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.
@@ -70,7 +70,7 @@ 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
+/// 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() <=
@@ -90,7 +90,7 @@ bool mergeAndDeduplicate(const TUReplacements &TUs, const TUDiagnostics &TUDs,
                          FileToChangesMap &FileChanges,
                          clang::SourceManager &SM);
 
-/// \brief Apply \c AtomicChange on File and rewrite it.
+/// Apply \c AtomicChange on File and rewrite it.
 ///
 /// \param[in] File Path of the file where to apply AtomicChange.
 /// \param[in] Changes to apply.
@@ -104,7 +104,7 @@ applyChanges(StringRef File, const std::vector<tooling::AtomicChange> &Changes,
              const tooling::ApplyChangesSpec &Spec,
              DiagnosticsEngine &Diagnostics);
 
-/// \brief Delete the replacement files.
+/// Delete the replacement files.
 ///
 /// \param[in] Files Replacement files to delete.
 /// \param[in] Diagnostics DiagnosticsEngine used for error output.

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

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// \brief This file provides the implementation for deduplicating, detecting
+/// This file provides the implementation for deduplicating, detecting
 /// conflicts in, and applying collections of Replacements.
 ///
 /// FIXME: Use Diagnostics for output instead of llvm::errs().
@@ -124,7 +124,7 @@ std::error_code collectReplacementsFromDirectory(
   return ErrorCode;
 }
 
-/// \brief Extract replacements from collected TranslationUnitReplacements and
+/// Extract replacements from collected TranslationUnitReplacements and
 /// TranslationUnitDiagnostics and group them per file. Identical replacements
 /// from diagnostics are deduplicated.
 ///
@@ -151,13 +151,13 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
   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 (auto Entry = SM.getFileManager().getFile(R.getFilePath())) {
       if (FromDiag) {
-        auto &Replaces = DiagReplacements[Entry];
+        auto &Replaces = DiagReplacements[*Entry];
         if (!Replaces.insert(R).second)
           return;
       }
-      GroupedReplacements[Entry].push_back(R);
+      GroupedReplacements[*Entry].push_back(R);
     } else if (Warned.insert(R.getFilePath()).second) {
       errs() << "Described file '" << R.getFilePath()
              << "' doesn't exist. Ignoring...\n";

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

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// \brief This file provides the main function for the
+/// This file provides the main function for the
 /// clang-apply-replacements tool.
 ///
 //===----------------------------------------------------------------------===//
@@ -152,7 +152,7 @@ int main(int argc, char **argv) {
 
     // Write new file to disk
     std::error_code EC;
-    llvm::raw_fd_ostream FileStream(FileName, EC, llvm::sys::fs::F_None);
+    llvm::raw_fd_ostream FileStream(FileName, EC, llvm::sys::fs::OF_None);
     if (EC) {
       llvm::errs() << "Could not open " << FileName << " for writing\n";
       continue;

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

@@ -109,7 +109,7 @@ getLexerStartingFromLoc(SourceLocation Loc, const SourceManager &SM,
 
   const char *TokBegin = File.data() + LocInfo.second;
   // Lex from the start of the given location.
-  return llvm::make_unique<Lexer>(SM.getLocForStartOfFile(LocInfo.first),
+  return std::make_unique<Lexer>(SM.getLocForStartOfFile(LocInfo.first),
                                   LangOpts, File.begin(), TokBegin, File.end());
 }
 

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

@@ -147,8 +147,8 @@ int main(int argc, const char **argv) {
       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);
+        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);
@@ -165,9 +165,9 @@ int main(int argc, const char **argv) {
   }
 
   for (const auto &File : ChangedFiles) {
-    const auto *Entry = FileMgr.getFile(File);
+    const auto Entry = FileMgr.getFile(File);
 
-    auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
+    auto ID = Sources.getOrCreateFileID(*Entry, SrcMgr::C_User);
     outs() << "============== " << File << " ==============\n";
     Rewrite.getEditBuffer(ID).write(llvm::outs());
     outs() << "\n============================================\n";