[all-commits] [llvm/llvm-project] 879c15: [llvm-rc] Handle driveless absolute windows paths ...

Martin Storsjö via All-commits all-commits at lists.llvm.org
Thu Dec 10 04:15:33 PST 2020


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 879c15e890b4d25d28ea904e92497f091f796019
      https://github.com/llvm/llvm-project/commit/879c15e890b4d25d28ea904e92497f091f796019
  Author: Martin Storsjö <martin at martin.st>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M llvm/test/tools/llvm-rc/absolute.test
    M llvm/tools/llvm-rc/ResourceFileWriter.cpp

  Log Message:
  -----------
  [llvm-rc] Handle driveless absolute windows paths when loading external files

When llvm-rc loads an external file, it looks for it relative to
a number of include directories and the current working directory.
If the path is considered absolute, llvm-rc tries to open the
filename as such, and doesn't try to open it relative to other
paths.

On Windows, a path name like "\dir\file" isn't considered absolute
as it lacks the drive name, but by appending it on top of the search
dirs, it's not found.

LLVM's sys::path::append just appends such a path (same with a properly
absolute posix path) after the paths it's supposed to be relative to.

This fix doesn't handle the case if the resource script and the
external file are on a different drive than the current working
directory; to fix that, we'd have to make LLVM's sys::path::append
handle appending fully absolute and partially absolute paths (ones
lacking a drive prefix but containing a root directory), or switch
to C++17's std::filesystem.

Differential Revision: https://reviews.llvm.org/D92558




More information about the All-commits mailing list