code review

Author: MythreyaK

clang/lib/Tooling/Tooling.cpp

@@ -644,13 +644,13 @@ namespace {
 
 class ASTBuilderAction : public ToolAction {
   std::vector<std::unique_ptr<ASTUnit>> &ASTs;
-  CaptureDiagsKind CaptureKinds;
+  CaptureDiagsKind CaptureKind;
 
 public:
   ASTBuilderAction(
       std::vector<std::unique_ptr<ASTUnit>> &ASTs,
-      CaptureDiagsKind CaptureDiagnosticKinds = CaptureDiagsKind::None)
-      : ASTs(ASTs), CaptureKinds(CaptureDiagnosticKinds) {}
+      CaptureDiagsKind CaptureDiagnosticsKind = CaptureDiagsKind::None)
+      : ASTs(ASTs), CaptureKind(CaptureDiagnosticsKind) {}
 
   bool runInvocation(std::shared_ptr<CompilerInvocation> Invocation,
                      FileManager *Files,
@@ -662,7 +662,7 @@ class ASTBuilderAction : public ToolAction {
                                             Invocation->getDiagnosticOpts(),
                                             DiagConsumer,
                                             /*ShouldOwnClient=*/false),
-        Files, false, CaptureKinds);
+        Files, false, CaptureKind);
     if (!AST)
       return false;
 

clang/unittests/Sema/HeuristicResolverTest.cpp

@@ -10,7 +10,6 @@
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallSet.h"
 #include "gmock/gmock-matchers.h"
 #include "gtest/gtest.h"
 
@@ -33,24 +32,6 @@ template <typename InputNode>
 using ResolveFnT = std::function<std::vector<const NamedDecl *>(
     const HeuristicResolver *, InputNode)>;
 
-std::string format_error(const clang::StoredDiagnostic &D) {
-  std::ostringstream Msg{};
-  if (D.getLevel() == DiagnosticsEngine::Level::Ignored)
-    Msg << "Ignored: ";
-  if (D.getLevel() == DiagnosticsEngine::Level::Note)
-    Msg << "Note: ";
-  if (D.getLevel() == DiagnosticsEngine::Level::Remark)
-    Msg << "Remark: ";
-  if (D.getLevel() == DiagnosticsEngine::Level::Warning)
-    Msg << "Warning: ";
-  if (D.getLevel() == DiagnosticsEngine::Level::Error)
-    Msg << "Error: ";
-  if (D.getLevel() == DiagnosticsEngine::Level::Fatal)
-    Msg << "Fatal: ";
-  Msg << D.getID() << ": " << D.getMessage().str();
-  return Msg.str();
-}
-
 // Test heuristic resolution on `Code` using the resolution procedure
 // `ResolveFn`, which takes a `HeuristicResolver` and an input AST node of type
 // `InputNode` and returns a `std::vector<const NamedDecl *>`.
@@ -61,10 +42,17 @@ template <typename InputNode, typename ParamT, typename InputMatcher,
           typename... OutputMatchers>
 void expectResolution(llvm::StringRef Code, ResolveFnT<ParamT> ResolveFn,
                       const InputMatcher &IM, const OutputMatchers &...OMS) {
-  auto TU = tooling::buildASTFromCodeWithArgs(Code, {"-std=c++23"});
+  auto TU = tooling::buildASTFromCodeWithArgs(
+      Code, {"-std=c++23"}, "input.cc", "clang-tool",
+      std::make_shared<PCHContainerOperations>(),
+      tooling::getClangStripDependencyFileAdjuster(),
+      tooling::FileContentMappings(), nullptr, llvm::vfs::getRealFileSystem(),
+      CaptureDiagsKind::All);
 
   for (const auto &D : TU->storedDiagnostics()) {
-    EXPECT_TRUE(D.getLevel() < DiagnosticsEngine::Error) << format_error(D);
+    EXPECT_TRUE(D.getLevel() < DiagnosticsEngine::Error)
+        << "Unexpected error diagnostic while building AST for test code: "
+        << D.getMessage();
   }
 
   auto &Ctx = TU->getASTContext();