diff options
author | Pavel Labath <pavel@labath.sk> | 2019-01-16 10:26:52 +0000 |
---|---|---|
committer | Pavel Labath <pavel@labath.sk> | 2019-01-16 10:26:52 +0000 |
commit | 559ddc10175c2560fc8086c0faa6efde8c324a93 (patch) | |
tree | a71fae6fdefd22a75b5ae875fbb319a79d55fe38 | |
parent | fa970076109609e1536d5ea84183980b69324f60 (diff) |
Fix build breakage from llvm r351317linaro-local/ci/tcwg_kernel/llvm-master-arm-lts-allnoconfig
The two-argument version of llvm::sys::fs::make_absolute no longer
returns an error code.
-rw-r--r-- | clang-tools-extra/clang-move/ClangMove.cpp | 5 | ||||
-rw-r--r-- | clang-tools-extra/clangd/tool/ClangdMain.cpp | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/clang-tools-extra/clang-move/ClangMove.cpp b/clang-tools-extra/clang-move/ClangMove.cpp index ec9db738d27..3ab3d4eb4b8 100644 --- a/clang-tools-extra/clang-move/ClangMove.cpp +++ b/clang-tools-extra/clang-move/ClangMove.cpp @@ -76,10 +76,7 @@ std::string MakeAbsolutePath(StringRef CurrentDir, StringRef Path) { return ""; llvm::SmallString<128> InitialDirectory(CurrentDir); llvm::SmallString<128> AbsolutePath(Path); - if (std::error_code EC = - llvm::sys::fs::make_absolute(InitialDirectory, AbsolutePath)) - llvm::errs() << "Warning: could not make absolute file: '" << EC.message() - << '\n'; + llvm::sys::fs::make_absolute(InitialDirectory, AbsolutePath); return CleanPath(std::move(AbsolutePath)); } diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index c5b3c98ae59..34e81d3ba59 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -223,9 +223,7 @@ public: Body = Body.ltrim('/'); llvm::SmallVector<char, 16> Path(Body.begin(), Body.end()); path::native(Path); - auto Err = fs::make_absolute(TestScheme::TestDir, Path); - if (Err) - llvm_unreachable("Failed to make absolute path in test scheme."); + fs::make_absolute(TestScheme::TestDir, Path); return std::string(Path.begin(), Path.end()); } |