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 | 7b5565418f4d6e113ba805dad40d471d23bca6f6 (patch) | |
| tree | d5b408164baaa6e0e145dc9f2eee22721886c429 /clang-tools-extra | |
| parent | [SelectionDAG] Update check in createOperands to reflect max() is a valid value. (diff) | |
| download | llvm-project-7b5565418f4d6e113ba805dad40d471d23bca6f6.tar.gz llvm-project-7b5565418f4d6e113ba805dad40d471d23bca6f6.tar.bz2 llvm-project-7b5565418f4d6e113ba805dad40d471d23bca6f6.zip | |
Fix build breakage from llvm r351317
The two-argument version of llvm::sys::fs::make_absolute no longer
returns an error code.
llvm-svn: 351319
Diffstat (limited to 'clang-tools-extra')
| -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 ec9db738d274..3ab3d4eb4b82 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 c5b3c98ae59a..34e81d3ba59c 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()); } |