LemonBoy created this revision.
LemonBoy added a reviewer: rsmith.
LemonBoy added a project: clang.
Herald added a subscriber: cfe-commits.
Some early errors during the ASTUnit creation were not transferred to the
`FailedParseDiagnostic` so when the code in `LoadFromCommandLine` swaps its
content with the content of `StoredDiagnostics` they cannot be retrieved by the
user in any way.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D78658
Files:
clang/lib/Frontend/ASTUnit.cpp
clang/unittests/Frontend/ASTUnitTest.cpp
Index: clang/unittests/Frontend/ASTUnitTest.cpp
===================================================================
--- clang/unittests/Frontend/ASTUnitTest.cpp
+++ clang/unittests/Frontend/ASTUnitTest.cpp
@@ -111,4 +111,30 @@
llvm::MemoryBuffer::MemoryBuffer_MMap);
}
+TEST_F(ASTUnitTest, LoadFromCommandLineEarlyError) {
+ EXPECT_FALSE(
+ llvm::sys::fs::createTemporaryFile("ast-unit", "c", FD, InputFileName));
+ input_file = std::make_unique<ToolOutputFile>(InputFileName, FD);
+ input_file->os() << "";
+
+ const char *Args[] = {"clang", "-target", "foobar", InputFileName.c_str()};
+
+ auto Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions());
+ auto PCHContainerOps = std::make_shared<PCHContainerOperations>();
+ std::unique_ptr<clang::ASTUnit> ErrUnit;
+
+ ASTUnit *AST = ASTUnit::LoadFromCommandLine(
+ &Args[0], &Args[4], PCHContainerOps, Diags, "", false,
+ CaptureDiagsKind::All, None, true, 0, TU_Complete, false, false, false,
+ SkipFunctionBodiesScope::None, false, true, false, false, None, &ErrUnit,
+ nullptr);
+
+ if (!AST)
+ FAIL() << "failed to create ASTUnit";
+
+ ASSERT_NE(ErrUnit, nullptr);
+ ASSERT_TRUE(Diags->hasErrorOccurred());
+ ASSERT_NE(ErrUnit->stored_diag_size(), 0U);
+}
+
} // anonymous namespace
Index: clang/lib/Frontend/ASTUnit.cpp
===================================================================
--- clang/lib/Frontend/ASTUnit.cpp
+++ clang/lib/Frontend/ASTUnit.cpp
@@ -1118,6 +1118,18 @@
std::unique_ptr<CompilerInstance> Clang(
new CompilerInstance(std::move(PCHContainerOps)));
+ auto OnError = [&]() {
+ // Remove the overridden buffer we used for the preamble.
+ SavedMainFileBuffer = nullptr;
+
+ // Keep the ownership of the data in the ASTUnit because the client may
+ // want to see the diagnostics.
+ transferASTDataFromCompilerInstance(*Clang);
+ FailedParseDiagnostics.swap(StoredDiagnostics);
+ StoredDiagnostics.clear();
+ NumStoredDiagnosticsFromDriver = 0;
+ };
+
// Ensure that Clang has a FileManager with the right VFS, which may have
// changed above in AddImplicitPreamble. If VFS is nullptr, rely on
// createFileManager to create one.
@@ -1141,8 +1153,10 @@
// Create the target instance.
Clang->setTarget(TargetInfo::CreateTargetInfo(
Clang->getDiagnostics(), Clang->getInvocation().TargetOpts));
- if (!Clang->hasTarget())
+ if (!Clang->hasTarget()) {
+ OnError();
return true;
+ }
// Inform the target of the language options.
//
@@ -1199,8 +1213,10 @@
llvm::CrashRecoveryContextCleanupRegistrar<TopLevelDeclTrackerAction>
ActCleanup(Act.get());
- if (!Act->BeginSourceFile(*Clang.get(), Clang->getFrontendOpts().Inputs[0]))
- goto error;
+ if (!Act->BeginSourceFile(*Clang.get(), Clang->getFrontendOpts().Inputs[0])) {
+ OnError();
+ return true;
+ }
if (SavedMainFileBuffer)
TranslateStoredDiagnostics(getFileManager(), getSourceManager(),
@@ -1210,7 +1226,8 @@
if (llvm::Error Err = Act->Execute()) {
consumeError(std::move(Err)); // FIXME this drops errors on the floor.
- goto error;
+ OnError();
+ return true;
}
transferASTDataFromCompilerInstance(*Clang);
@@ -1220,18 +1237,6 @@
FailedParseDiagnostics.clear();
return false;
-
-error:
- // Remove the overridden buffer we used for the preamble.
- SavedMainFileBuffer = nullptr;
-
- // Keep the ownership of the data in the ASTUnit because the client may
- // want to see the diagnostics.
- transferASTDataFromCompilerInstance(*Clang);
- FailedParseDiagnostics.swap(StoredDiagnostics);
- StoredDiagnostics.clear();
- NumStoredDiagnosticsFromDriver = 0;
- return true;
}
static std::pair<unsigned, unsigned>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
