Skip to content

[clang][DependencyScanning] Check for the Existence of CIWithContext before Finalizing #12029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qiongsiwu wants to merge 1 commit into
base: stable/21.x
Choose a base branch
from
+12 −2
Open

[clang][DependencyScanning] Check for the Existence of CIWithContext before Finalizing #12029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,17 @@ DependencyScanningWorker::computeDependenciesByNameWithContextOrError(

llvm::Error
DependencyScanningWorker::finalizeCompilerInstanceWithContextOrError() {
bool Success = finalizeCompilerInstance();
return CIWithContext->handleReturnStatus(Success);
// TODO: this finalization interface is not ideal. Finalizing the
// CIWithContext should happen automatically for successful scans, and
// when errors occur.
if (CIWithContext) {
bool Success = finalizeCompilerInstance();
return CIWithContext->handleReturnStatus(Success);
}

// There is nothing to finalize, so the finalization should not report an
// error.
return llvm::Error::success();
}

bool DependencyScanningWorker::initializeCompilerInstanceWithContext(
Expand All @@ -265,5 +274,6 @@ bool DependencyScanningWorker::computeDependenciesByNameWithContext(
}

bool DependencyScanningWorker::finalizeCompilerInstance() {
assert(CIWithContext && "Should not finalize without a CIWithContext");
return CIWithContext->finalize();
}