From 1f597e6e6b75309557b591f5c5b2ca13bb7c31e5 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 8 Nov 2018 23:45:00 +0000 Subject: [PATCH] [llvm-rc] Support absolute filenames in manifests CMake generate manifests that contain absolute filenames and these currently result in assertion error. This change ensures that we handle these correctly. Differential Revision: https://reviews.llvm.org/D54194 llvm-svn: 346450 --- llvm/test/tools/llvm-rc/absolute.test | 3 +++ llvm/tools/llvm-rc/ResourceFileWriter.cpp | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 llvm/test/tools/llvm-rc/absolute.test diff --git a/llvm/test/tools/llvm-rc/absolute.test b/llvm/test/tools/llvm-rc/absolute.test new file mode 100644 index 000000000000..5e8a6c8c3366 --- /dev/null +++ b/llvm/test/tools/llvm-rc/absolute.test @@ -0,0 +1,3 @@ +; RUN: touch %t.manifest +; RUN: echo "1 24 \"%t.manifest\"" > %t.rc +; RUN: llvm-rc %t.rc diff --git a/llvm/tools/llvm-rc/ResourceFileWriter.cpp b/llvm/tools/llvm-rc/ResourceFileWriter.cpp index 4b561940d2ec..95d92a93c893 100644 --- a/llvm/tools/llvm-rc/ResourceFileWriter.cpp +++ b/llvm/tools/llvm-rc/ResourceFileWriter.cpp @@ -1502,6 +1502,10 @@ ResourceFileWriter::loadFile(StringRef File) const { SmallString<128> Cwd; std::unique_ptr Result; + // 0. The file path is absolute and the file exists. + if (sys::path::is_absolute(File)) + return errorOrToExpected(MemoryBuffer::getFile(File, -1, false)); + // 1. The current working directory. sys::fs::current_path(Cwd); Path.assign(Cwd.begin(), Cwd.end()); @@ -1510,8 +1514,7 @@ ResourceFileWriter::loadFile(StringRef File) const { return errorOrToExpected(MemoryBuffer::getFile(Path, -1, false)); // 2. The directory of the input resource file, if it is different from the - // current - // working directory. + // current working directory. StringRef InputFileDir = sys::path::parent_path(Params.InputFilePath); Path.assign(InputFileDir.begin(), InputFileDir.end()); sys::path::append(Path, File);