Merge pull request #53 from sx-aurora-dev/feature/merge-upstream-20210504

Feature/merge upstream 20210504

Author: kaz7

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

@@ -19,6 +19,7 @@ clang_target_link_libraries(clangQuery
   clangBasic
   clangDynamicASTMatchers
   clangFrontend
+  clangTooling
   clangSerialization
   )
 

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

@@ -12,6 +12,7 @@
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Frontend/TextDiagnostic.h"
+#include "clang/Tooling/NodeIntrospection.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang::ast_matchers;
@@ -66,6 +67,8 @@ bool HelpQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
         "Diagnostic location for bound nodes.\n"
         "  detailed-ast                      "
         "Detailed AST output for bound nodes.\n"
+        "  srcloc                            "
+        "Source locations and ranges for bound nodes.\n"
         "  dump                              "
         "Detailed AST output for bound nodes (alias of detailed-ast).\n\n";
   return true;
@@ -86,6 +89,90 @@ struct CollectBoundNodes : MatchFinder::MatchCallback {
   }
 };
 
+void dumpLocations(llvm::raw_ostream &OS, DynTypedNode Node, ASTContext &Ctx,
+                   const DiagnosticsEngine &Diags, SourceManager const &SM) {
+  auto Locs = clang::tooling::NodeIntrospection::GetLocations(Node);
+
+  auto PrintLocations = [](llvm::raw_ostream &OS, auto Iter, auto End) {
+    auto CommonEntry = Iter->first;
+    auto Scout = Iter;
+    SmallVector<std::string> LocationStrings;
+    while (Scout->first == CommonEntry) {
+      LocationStrings.push_back(
+          tooling::LocationCallFormatterCpp::format(*Iter->second));
+      if (Scout == End)
+        break;
+      ++Scout;
+      if (Scout->first == CommonEntry)
+        ++Iter;
+    }
+    llvm::sort(LocationStrings);
+    for (auto &LS : LocationStrings) {
+      OS << " * \"" << LS << "\"\n";
+    }
+    return Iter;
+  };
+
+  TextDiagnostic TD(OS, Ctx.getLangOpts(), &Diags.getDiagnosticOptions());
+
+  for (auto Iter = Locs.LocationAccessors.begin();
+       Iter != Locs.LocationAccessors.end(); ++Iter) {
+    if (!Iter->first.isValid())
+      continue;
+
+    TD.emitDiagnostic(FullSourceLoc(Iter->first, SM), DiagnosticsEngine::Note,
+                      "source locations here", None, None);
+
+    Iter = PrintLocations(OS, Iter, Locs.LocationAccessors.end());
+    OS << '\n';
+  }
+
+  for (auto Iter = Locs.RangeAccessors.begin();
+       Iter != Locs.RangeAccessors.end(); ++Iter) {
+
+    if (!Iter->first.getBegin().isValid())
+      continue;
+
+    if (SM.getPresumedLineNumber(Iter->first.getBegin()) !=
+        SM.getPresumedLineNumber(Iter->first.getEnd()))
+      continue;
+
+    TD.emitDiagnostic(FullSourceLoc(Iter->first.getBegin(), SM),
+                      DiagnosticsEngine::Note,
+                      "source ranges here " + Iter->first.printToString(SM),
+                      CharSourceRange::getTokenRange(Iter->first), None);
+
+    Iter = PrintLocations(OS, Iter, Locs.RangeAccessors.end());
+  }
+  for (auto Iter = Locs.RangeAccessors.begin();
+       Iter != Locs.RangeAccessors.end(); ++Iter) {
+
+    if (!Iter->first.getBegin().isValid())
+      continue;
+
+    if (SM.getPresumedLineNumber(Iter->first.getBegin()) ==
+        SM.getPresumedLineNumber(Iter->first.getEnd()))
+      continue;
+
+    TD.emitDiagnostic(
+        FullSourceLoc(Iter->first.getBegin(), SM), DiagnosticsEngine::Note,
+        "source range " + Iter->first.printToString(SM) + " starting here...",
+        CharSourceRange::getTokenRange(Iter->first), None);
+
+    auto ColNum = SM.getPresumedColumnNumber(Iter->first.getEnd());
+    auto LastLineLoc = Iter->first.getEnd().getLocWithOffset(-(ColNum - 1));
+
+    TD.emitDiagnostic(FullSourceLoc(Iter->first.getEnd(), SM),
+                      DiagnosticsEngine::Note, "... ending here",
+                      CharSourceRange::getTokenRange(
+                          SourceRange(LastLineLoc, Iter->first.getEnd())),
+                      None);
+
+    Iter = PrintLocations(OS, Iter, Locs.RangeAccessors.end());
+  }
+  OS << "\n";
+}
+
 } // namespace
 
 bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
@@ -106,8 +193,10 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
       return false;
     }
 
-    AST->getASTContext().getParentMapContext().setTraversalKind(QS.TK);
-    Finder.matchAST(AST->getASTContext());
+    auto &Ctx = AST->getASTContext();
+    const auto &SM = Ctx.getSourceManager();
+    Ctx.getParentMapContext().setTraversalKind(QS.TK);
+    Finder.matchAST(Ctx);
 
     if (QS.PrintMatcher) {
       SmallVector<StringRef, 4> Lines;
@@ -159,6 +248,13 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
           Dumper.Visit(BI->second);
           OS << "\n";
         }
+        if (QS.SrcLocOutput) {
+          OS << "\n  \"" << BI->first << "\" Source locations\n";
+          OS << "  " << std::string(19 + BI->first.size(), '-') << '\n';
+
+          dumpLocations(OS, BI->second, Ctx, AST->getDiagnostics(), SM);
+          OS << "\n";
+        }
       }
 
       if (MI->getMap().empty())

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

@@ -18,7 +18,7 @@
 namespace clang {
 namespace query {
 
-enum OutputKind { OK_Diag, OK_Print, OK_DetailedAST };
+enum OutputKind { OK_Diag, OK_Print, OK_DetailedAST, OK_SrcLoc };
 
 enum QueryKind {
   QK_Invalid,
@@ -149,6 +149,7 @@ struct SetExclusiveOutputQuery : Query {
     QS.DiagOutput = false;
     QS.DetailedASTOutput = false;
     QS.PrintOutput = false;
+    QS.SrcLocOutput = false;
     QS.*Var = true;
     return true;
   }

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

@@ -11,6 +11,7 @@
 #include "QuerySession.h"
 #include "clang/ASTMatchers/Dynamic/Parser.h"
 #include "clang/Basic/CharInfo.h"
+#include "clang/Tooling/NodeIntrospection.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
 #include <set>
@@ -104,16 +105,19 @@ QueryRef QueryParser::parseSetBool(bool QuerySession::*Var) {
 
 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);
+  bool HasIntrospection = tooling::NodeIntrospection::hasIntrospectionSupport();
+  unsigned OutKind =
+      LexOrCompleteWord<unsigned>(this, ValStr)
+          .Case("diag", OK_Diag)
+          .Case("print", OK_Print)
+          .Case("detailed-ast", OK_DetailedAST)
+          .Case("srcloc", OK_SrcLoc, /*IsCompletion=*/HasIntrospection)
+          .Case("dump", OK_DetailedAST)
+          .Default(~0u);
   if (OutKind == ~0u) {
-    return new InvalidQuery(
-        "expected 'diag', 'print', 'detailed-ast' or 'dump', got '" + ValStr +
-        "'");
+    return new InvalidQuery("expected 'diag', 'print', 'detailed-ast'" +
+                            StringRef(HasIntrospection ? ", 'srcloc'" : "") +
+                            " or 'dump', got '" + ValStr + "'");
   }
 
   switch (OutKind) {
@@ -123,6 +127,10 @@ template <typename QueryType> QueryRef QueryParser::parseSetOutputKind() {
     return new QueryType(&QuerySession::DiagOutput);
   case OK_Print:
     return new QueryType(&QuerySession::PrintOutput);
+  case OK_SrcLoc:
+    if (HasIntrospection)
+      return new QueryType(&QuerySession::SrcLocOutput);
+    return new InvalidQuery("'srcloc' output support is not available.");
   }
 
   llvm_unreachable("Invalid output kind");

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

@@ -25,14 +25,15 @@ 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), TK(TK_AsIs) {}
+        DetailedASTOutput(false), SrcLocOutput(false), BindRoot(true),
+        PrintMatcher(false), Terminate(false), TK(TK_AsIs) {}
 
   llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs;
 
   bool PrintOutput;
   bool DiagOutput;
   bool DetailedASTOutput;
+  bool SrcLocOutput;
 
   bool BindRoot;
   bool PrintMatcher;

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

@@ -147,7 +147,7 @@ llvm::Optional<int64_t> ClangTidyCheck::OptionsView::getEnumInt(
 
   StringRef Value = Iter->getValue().Value;
   StringRef Closest;
-  unsigned EditDistance = -1;
+  unsigned EditDistance = 3;
   for (const auto &NameAndEnum : Mapping) {
     if (IgnoreCase) {
       if (Value.equals_lower(NameAndEnum.second))
@@ -159,7 +159,8 @@ llvm::Optional<int64_t> ClangTidyCheck::OptionsView::getEnumInt(
       EditDistance = 0;
       continue;
     }
-    unsigned Distance = Value.edit_distance(NameAndEnum.second);
+    unsigned Distance =
+        Value.edit_distance(NameAndEnum.second, true, EditDistance);
     if (Distance < EditDistance) {
       EditDistance = Distance;
       Closest = NameAndEnum.second;

clang-tools-extra/clang-tidy/bugprone/MacroParenthesesCheck.cpp

@@ -158,6 +158,9 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok,
   // Skip variable declaration.
   bool VarDecl = possibleVarDecl(MI, MI->tokens_begin());
 
+  // Skip the goto argument with an arbitrary number of subsequent stars.
+  bool FoundGoto = false;
+
   for (auto TI = MI->tokens_begin(), TE = MI->tokens_end(); TI != TE; ++TI) {
     // First token.
     if (TI == MI->tokens_begin())
@@ -179,9 +182,17 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok,
       continue;
     }
 
+    // There should not be extra parentheses for the goto argument.
+    if (Tok.is(tok::kw_goto)) {
+      FoundGoto = true;
+      continue;
+    }
+
     // Only interested in identifiers.
-    if (!Tok.isOneOf(tok::identifier, tok::raw_identifier))
+    if (!Tok.isOneOf(tok::identifier, tok::raw_identifier)) {
+      FoundGoto = false;
       continue;
+    }
 
     // Only interested in macro arguments.
     if (MI->getParameterNum(Tok.getIdentifierInfo()) < 0)
@@ -239,12 +250,16 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok,
     if (MI->isVariadic())
       continue;
 
-    Check->diag(Tok.getLocation(), "macro argument should be enclosed in "
-                                   "parentheses")
-        << FixItHint::CreateInsertion(Tok.getLocation(), "(")
-        << FixItHint::CreateInsertion(Tok.getLocation().getLocWithOffset(
-                                          PP->getSpelling(Tok).length()),
-                                      ")");
+    if (!FoundGoto) {
+      Check->diag(Tok.getLocation(), "macro argument should be enclosed in "
+                                     "parentheses")
+          << FixItHint::CreateInsertion(Tok.getLocation(), "(")
+          << FixItHint::CreateInsertion(Tok.getLocation().getLocWithOffset(
+                                            PP->getSpelling(Tok).length()),
+                                        ")");
+    }
+
+    FoundGoto = false;
   }
 }