Import LLVM 5.0.0 release including clang, lld and lldb.

1 files changed, 5 insertions, 2 deletions

diff --git a/gnu/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp b/gnu/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp
index 5a44061cbd4..9e9689e6b25 100644
--- a/gnu/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp
+++ b/gnu/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp
@@ -116,7 +116,11 @@ CommonOptionsParser::CommonOptionsParser(
 
   cl::HideUnrelatedOptions(Category);
 
-  Compilations.reset(FixedCompilationDatabase::loadFromCommandLine(argc, argv));
+  std::string ErrorMessage;
+  Compilations =
+      FixedCompilationDatabase::loadFromCommandLine(argc, argv, ErrorMessage);
+  if (!Compilations && !ErrorMessage.empty())
+    llvm::errs() << ErrorMessage;
   cl::ParseCommandLineOptions(argc, argv, Overview);
   cl::PrintOptionValues();
 
@@ -125,7 +129,6 @@ CommonOptionsParser::CommonOptionsParser(
       SourcePathList.empty())
     return;
   if (!Compilations) {
-    std::string ErrorMessage;
     if (!BuildPath.empty()) {
       Compilations =
           CompilationDatabase::autoDetectFromDirectory(BuildPath, ErrorMessage);