Adapt rL364464: clang::FrontendAction::Execute returns llvm::Error in…

…stead of bool
MaskRay · Jun 27, 2019 · a858567 · a858567
1 parent aab9dd6
commit a858567
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/indexer.cc b/src/indexer.cc
@@ -1270,14 +1270,21 @@ Index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
 
   std::unique_ptr<FrontendAction> Action = createIndexingAction(
       DataConsumer, IndexOpts, std::make_unique<IndexFrontendAction>(param));
-
+  std::string reason;
   {
     llvm::CrashRecoveryContext CRC;
     auto parse = [&]() {
       if (!Action->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0]))
         return;
+#if LLVM_VERSION_MAJOR >= 9 // rL364464
+      if (llvm::Error E = Action->Execute()) {
+        reason = llvm::toString(std::move(E));
+        return;
+      }
+#else
       if (!Action->Execute())
         return;
+#endif
       Action->EndSourceFile();
       ok = true;
     };
@@ -1287,7 +1294,8 @@ Index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
     }
   }
   if (!ok) {
-    LOG_S(ERROR) << "failed to index " << main;
+    LOG_S(ERROR) << "failed to index " << main
+                 << (reason.empty() ? "" : ": " + reason);
     return {};
   }
   for (auto &Buf : Bufs)

diff --git a/src/sema_manager.cc b/src/sema_manager.cc
@@ -324,8 +324,15 @@ bool Parse(CompilerInstance &Clang) {
   SyntaxOnlyAction Action;
   if (!Action.BeginSourceFile(Clang, Clang.getFrontendOpts().Inputs[0]))
     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())
     return false;
+#endif
   Action.EndSourceFile();
   return true;
 }