From 7b5565418f4d6e113ba805dad40d471d23bca6f6 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 16 Jan 2019 10:26:52 +0000 Subject: [PATCH] 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 --- clang-tools-extra/clang-move/ClangMove.cpp | 5 +---- 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 ec9db73..3ab3d4e 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 c5b3c98..34e81d3 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 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()); } -- 2.7.4