Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-12-01 20:07:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt rL364464: clang::FrontendAction::Execute returns llvm::Error instead of bool

Browse Source
This commit is contained in:
Fangrui Song 2019-06-27 01:10:04 -07:00
parent 2d11cc25c1
commit 6d0a096272
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/indexer.cc
View File

@ -1271,14 +1271,21 @@ Index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
std::unique_ptr<FrontendAction> Action = createIndexingAction( std::unique_ptr<FrontendAction> Action = createIndexingAction(
DataConsumer, IndexOpts, std::make_unique<IndexFrontendAction>(param)); DataConsumer, IndexOpts, std::make_unique<IndexFrontendAction>(param));
std::string reason;
{ {
llvm::CrashRecoveryContext CRC; llvm::CrashRecoveryContext CRC;
auto parse = [&]() { auto parse = [&]() {
if (!Action->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0])) if (!Action->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0]))
return; return;
#if LLVM_VERSION_MAJOR >= 9 // rL364464
if (llvm::Error E = Action->Execute()) {
reason = llvm::toString(std::move(E));
return;
}
#else
if (!Action->Execute()) if (!Action->Execute())
return; return;
#endif
Action->EndSourceFile(); Action->EndSourceFile();
ok = true; ok = true;
}; };
@ -1288,7 +1295,8 @@ Index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
} }
} }
if (!ok) { if (!ok) {
LOG_S(ERROR) << "failed to index " << main; LOG_S(ERROR) << "failed to index " << main
<< (reason.empty() ? "" : ": " + reason);
return {}; return {};
} }

7
src/sema_manager.cc
View File

@ -327,8 +327,15 @@ bool Parse(CompilerInstance &Clang) {
SyntaxOnlyAction Action; SyntaxOnlyAction Action;
if (!Action.BeginSourceFile(Clang, Clang.getFrontendOpts().Inputs[0])) if (!Action.BeginSourceFile(Clang, Clang.getFrontendOpts().Inputs[0]))
return false; return false;
#if LLVM_VERSION_MAJOR >= 9 // rL364464
if (llvm::Error E = Action.Execute()) {
llvm::consumeError(std::move(E));
return false;
}
#else
if (!Action.Execute()) if (!Action.Execute())
return false; return false;
#endif
Action.EndSourceFile(); Action.EndSourceFile();
return true; return true;
} }