jansvoboda11 created this revision.
jansvoboda11 added reviewers: Bigcheese, dexonsmith, arphaman.
jansvoboda11 requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
In `ToolInvocation::run`, the driver -> cc1 command-line transformation uses
`DiagnosticsEngine` that wasn't completely initialized. This patch ensures
`ProcessWarningOptions(DiagnosticsEngine&, const DiagnosticOptions &)` is
called.
Depends on D108918 <https://reviews.llvm.org/D108918>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D108974
Files:
clang/lib/Tooling/Tooling.cpp
clang/unittests/Tooling/ToolingTest.cpp
Index: clang/unittests/Tooling/ToolingTest.cpp
===================================================================
--- clang/unittests/Tooling/ToolingTest.cpp
+++ clang/unittests/Tooling/ToolingTest.cpp
@@ -224,6 +224,47 @@
EXPECT_TRUE(Invocation.run());
}
+struct ErrorCountingDiagnosticConsumer : public DiagnosticConsumer {
+ ErrorCountingDiagnosticConsumer() : NumErrorsSeen(0) {}
+ void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
+ const Diagnostic &Info) override {
+ if (DiagLevel == DiagnosticsEngine::Level::Error)
+ ++NumErrorsSeen;
+ }
+ unsigned NumErrorsSeen;
+};
+
+TEST(ToolInvocation, DiagnosticsEngineProperlyInitializedForCC1Construction) {
+ llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
+ new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
+ llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
+ new llvm::vfs::InMemoryFileSystem);
+ OverlayFileSystem->pushOverlay(InMemoryFileSystem);
+ llvm::IntrusiveRefCntPtr<FileManager> Files(
+ new FileManager(FileSystemOptions(), OverlayFileSystem));
+
+ std::vector<std::string> Args;
+ Args.push_back("tool-executable");
+ Args.push_back("-target");
+ // Invalid argument that by default results in an error diagnostic:
+ Args.push_back("i386-apple-ios14.0-simulator");
+ // Argument that downgrades the error into a warning:
+ Args.push_back("-Wno-error=invalid-ios-deployment-target");
+ Args.push_back("-fsyntax-only");
+ Args.push_back("test.cpp");
+
+ clang::tooling::ToolInvocation Invocation(
+ Args, std::make_unique<SyntaxOnlyAction>(), Files.get());
+ InMemoryFileSystem->addFile(
+ "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int a() {}\n"));
+ ErrorCountingDiagnosticConsumer Consumer;
+ Invocation.setDiagnosticConsumer(&Consumer);
+ EXPECT_TRUE(Invocation.run());
+ // Check that `-Wno-error=invalid-ios-deployment-target` downgraded the error
+ // into a warning.
+ EXPECT_EQ(Consumer.NumErrorsSeen, 0u);
+}
+
struct DiagnosticConsumerExpectingSourceManager : public DiagnosticConsumer {
bool SawSourceManager;
Index: clang/lib/Tooling/Tooling.cpp
===================================================================
--- clang/lib/Tooling/Tooling.cpp
+++ clang/lib/Tooling/Tooling.cpp
@@ -347,16 +347,16 @@
CreateAndPopulateDiagOpts(Argv);
TextDiagnosticPrinter DiagnosticPrinter(
llvm::errs(), &*DiagOpts);
- DiagnosticsEngine Diagnostics(
- IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
- DiagConsumer ? DiagConsumer : &DiagnosticPrinter, false);
+ IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
+ CompilerInstance::createDiagnostics(
+ &*DiagOpts, DiagConsumer ? DiagConsumer : &DiagnosticPrinter, false);
// Although `Diagnostics` are used only for command-line parsing, the custom
// `DiagConsumer` might expect a `SourceManager` to be present.
- SourceManager SrcMgr(Diagnostics, *Files);
- Diagnostics.setSourceManager(&SrcMgr);
+ SourceManager SrcMgr(*Diagnostics, *Files);
+ Diagnostics->setSourceManager(&SrcMgr);
const std::unique_ptr<driver::Driver> Driver(
- newDriver(&Diagnostics, BinaryName, &Files->getVirtualFileSystem()));
+ newDriver(&*Diagnostics, BinaryName, &Files->getVirtualFileSystem()));
// The "input file not found" diagnostics from the driver are useful.
// The driver is only aware of the VFS working directory, but some clients
// change this at the FileManager level instead.
@@ -368,11 +368,11 @@
if (!Compilation)
return false;
const llvm::opt::ArgStringList *const CC1Args = getCC1Arguments(
- &Diagnostics, Compilation.get());
+ &*Diagnostics, Compilation.get());
if (!CC1Args)
return false;
std::unique_ptr<CompilerInvocation> Invocation(
- newInvocation(&Diagnostics, *CC1Args, BinaryName));
+ newInvocation(&*Diagnostics, *CC1Args, BinaryName));
return runInvocation(BinaryName, Compilation.get(), std::move(Invocation),
std::move(PCHContainerOps));
}
Index: clang/unittests/Tooling/ToolingTest.cpp
===================================================================
--- clang/unittests/Tooling/ToolingTest.cpp
+++ clang/unittests/Tooling/ToolingTest.cpp
@@ -224,6 +224,47 @@
EXPECT_TRUE(Invocation.run());
}
+struct ErrorCountingDiagnosticConsumer : public DiagnosticConsumer {
+ ErrorCountingDiagnosticConsumer() : NumErrorsSeen(0) {}
+ void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
+ const Diagnostic &Info) override {
+ if (DiagLevel == DiagnosticsEngine::Level::Error)
+ ++NumErrorsSeen;
+ }
+ unsigned NumErrorsSeen;
+};
+
+TEST(ToolInvocation, DiagnosticsEngineProperlyInitializedForCC1Construction) {
+ llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
+ new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
+ llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
+ new llvm::vfs::InMemoryFileSystem);
+ OverlayFileSystem->pushOverlay(InMemoryFileSystem);
+ llvm::IntrusiveRefCntPtr<FileManager> Files(
+ new FileManager(FileSystemOptions(), OverlayFileSystem));
+
+ std::vector<std::string> Args;
+ Args.push_back("tool-executable");
+ Args.push_back("-target");
+ // Invalid argument that by default results in an error diagnostic:
+ Args.push_back("i386-apple-ios14.0-simulator");
+ // Argument that downgrades the error into a warning:
+ Args.push_back("-Wno-error=invalid-ios-deployment-target");
+ Args.push_back("-fsyntax-only");
+ Args.push_back("test.cpp");
+
+ clang::tooling::ToolInvocation Invocation(
+ Args, std::make_unique<SyntaxOnlyAction>(), Files.get());
+ InMemoryFileSystem->addFile(
+ "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int a() {}\n"));
+ ErrorCountingDiagnosticConsumer Consumer;
+ Invocation.setDiagnosticConsumer(&Consumer);
+ EXPECT_TRUE(Invocation.run());
+ // Check that `-Wno-error=invalid-ios-deployment-target` downgraded the error
+ // into a warning.
+ EXPECT_EQ(Consumer.NumErrorsSeen, 0u);
+}
+
struct DiagnosticConsumerExpectingSourceManager : public DiagnosticConsumer {
bool SawSourceManager;
Index: clang/lib/Tooling/Tooling.cpp
===================================================================
--- clang/lib/Tooling/Tooling.cpp
+++ clang/lib/Tooling/Tooling.cpp
@@ -347,16 +347,16 @@
CreateAndPopulateDiagOpts(Argv);
TextDiagnosticPrinter DiagnosticPrinter(
llvm::errs(), &*DiagOpts);
- DiagnosticsEngine Diagnostics(
- IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
- DiagConsumer ? DiagConsumer : &DiagnosticPrinter, false);
+ IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
+ CompilerInstance::createDiagnostics(
+ &*DiagOpts, DiagConsumer ? DiagConsumer : &DiagnosticPrinter, false);
// Although `Diagnostics` are used only for command-line parsing, the custom
// `DiagConsumer` might expect a `SourceManager` to be present.
- SourceManager SrcMgr(Diagnostics, *Files);
- Diagnostics.setSourceManager(&SrcMgr);
+ SourceManager SrcMgr(*Diagnostics, *Files);
+ Diagnostics->setSourceManager(&SrcMgr);
const std::unique_ptr<driver::Driver> Driver(
- newDriver(&Diagnostics, BinaryName, &Files->getVirtualFileSystem()));
+ newDriver(&*Diagnostics, BinaryName, &Files->getVirtualFileSystem()));
// The "input file not found" diagnostics from the driver are useful.
// The driver is only aware of the VFS working directory, but some clients
// change this at the FileManager level instead.
@@ -368,11 +368,11 @@
if (!Compilation)
return false;
const llvm::opt::ArgStringList *const CC1Args = getCC1Arguments(
- &Diagnostics, Compilation.get());
+ &*Diagnostics, Compilation.get());
if (!CC1Args)
return false;
std::unique_ptr<CompilerInvocation> Invocation(
- newInvocation(&Diagnostics, *CC1Args, BinaryName));
+ newInvocation(&*Diagnostics, *CC1Args, BinaryName));
return runInvocation(BinaryName, Compilation.get(), std::move(Invocation),
std::move(PCHContainerOps));
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
