diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2016-06-04 01:13:22 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2016-06-04 01:13:22 +0000 |
| commit | bdf3f27871b94ec92b0fd74abc4839308ee681d9 (patch) | |
| tree | 346bb712394d96f5672ae16cdfca8b7dd4b7e5e7 | |
| parent | 684e1d2a1690f7f0380d873dc7141dd4406815d4 (diff) | |
[Modules] Improve diagnostics for LockFileManager errors
Uses error message now provided by LockFileManager in LLVM r271755.
rdar://problem/26529101
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@271758 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticCommonKinds.td | 2 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInstance.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticCommonKinds.td b/include/clang/Basic/DiagnosticCommonKinds.td index 837fc6126e..f3fdeb283c 100644 --- a/include/clang/Basic/DiagnosticCommonKinds.td +++ b/include/clang/Basic/DiagnosticCommonKinds.td @@ -89,7 +89,7 @@ def err_module_unavailable : Error< def err_module_header_missing : Error< "%select{|umbrella }0header '%1' not found">; def err_module_lock_failure : Error< - "could not acquire lock file for module '%0'">, DefaultFatal; + "could not acquire lock file for module '%0': %1">, DefaultFatal; def err_module_lock_timeout : Error< "timed out waiting to acquire lock file for module '%0'">, DefaultFatal; def err_module_cycle : Error<"cyclic dependency in module '%0': %1">, diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 5648b90be8..64f571e17a 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -1086,7 +1086,7 @@ static bool compileAndLoadModule(CompilerInstance &ImportingInstance, switch (Locked) { case llvm::LockFileManager::LFS_Error: Diags.Report(ModuleNameLoc, diag::err_module_lock_failure) - << Module->Name; + << Module->Name << Locked.getErrorMessage(); return false; case llvm::LockFileManager::LFS_Owned: |