Index: clang/test/VFS/vfsroot-include.c =================================================================== --- clang/test/VFS/vfsroot-include.c +++ clang/test/VFS/vfsroot-include.c @@ -1,6 +1,3 @@ -// FIXME: PR43272 -// XFAIL: system-windows - // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: sed -e "s@TEST_DIR@%/S@g" -e "s@OUT_DIR@%/t@g" %S/Inputs/vfsroot.yaml > %t.yaml Index: clang/test/VFS/vfsroot-module.m =================================================================== --- clang/test/VFS/vfsroot-module.m +++ clang/test/VFS/vfsroot-module.m @@ -1,6 +1,3 @@ -// FIXME: PR43272 -// XFAIL: system-windows - // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: sed -e "s@TEST_DIR@%/S@g" -e "s@OUT_DIR@%/t@g" %S/Inputs/vfsroot.yaml > %t.yaml Index: clang/test/VFS/vfsroot-with-overlay.c =================================================================== --- clang/test/VFS/vfsroot-with-overlay.c +++ clang/test/VFS/vfsroot-with-overlay.c @@ -1,6 +1,3 @@ -// FIXME: PR43272 -// XFAIL: system-windows - // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: sed -e "s@TEST_DIR@%/S@g" -e "s@OUT_DIR@%/t@g" %S/Inputs/vfsroot.yaml > %t.yaml Index: llvm/include/llvm/Support/VirtualFileSystem.h =================================================================== --- llvm/include/llvm/Support/VirtualFileSystem.h +++ llvm/include/llvm/Support/VirtualFileSystem.h @@ -293,7 +293,7 @@ /// \param Path A path that is modified to be an absolute path. /// \returns success if \a path has been made absolute, otherwise a /// platform-specific error_code. - std::error_code makeAbsolute(SmallVectorImpl &Path) const; + virtual std::error_code makeAbsolute(SmallVectorImpl &Path) const; }; /// Gets an \p vfs::FileSystem for the 'real' file system, as seen by @@ -749,6 +749,8 @@ std::error_code isLocal(const Twine &Path, bool &Result) override; + std::error_code makeAbsolute(SmallVectorImpl &Path) const override; + directory_iterator dir_begin(const Twine &Dir, std::error_code &EC) override; void setExternalContentsPrefixDir(StringRef PrefixDir); Index: llvm/lib/Support/VirtualFileSystem.cpp =================================================================== --- llvm/lib/Support/VirtualFileSystem.cpp +++ llvm/lib/Support/VirtualFileSystem.cpp @@ -1073,6 +1073,19 @@ return ExternalFS->isLocal(Path, Result); } +std::error_code RedirectingFileSystem::makeAbsolute(SmallVectorImpl &Path) const { + if (llvm::sys::path::is_absolute(Path, llvm::sys::path::Style::posix) || + llvm::sys::path::is_absolute(Path, llvm::sys::path::Style::windows)) + return {}; + + auto WorkingDir = getCurrentWorkingDirectory(); + if (!WorkingDir) + return WorkingDir.getError(); + + llvm::sys::fs::make_absolute(WorkingDir.get(), Path); + return {}; +} + directory_iterator RedirectingFileSystem::dir_begin(const Twine &Dir, std::error_code &EC) { ErrorOr E = lookupPath(Dir); @@ -1428,21 +1441,31 @@ return nullptr; } - if (IsRootEntry && !sys::path::is_absolute(Name)) { - assert(NameValueNode && "Name presence should be checked earlier"); - error(NameValueNode, - "entry with relative path at the root level is not discoverable"); - return nullptr; + sys::path::Style path_style = sys::path::Style::native; + if (IsRootEntry) { + // VFS root entries may be in either Posix or Windows style. Figure out + // which style we have, and use it consistently. + if (sys::path::is_absolute(Name, sys::path::Style::posix)) { + path_style = sys::path::Style::posix; + } else if (sys::path::is_absolute(Name, sys::path::Style::windows)) { + path_style = sys::path::Style::windows; + } else { + assert(NameValueNode && "Name presence should be checked earlier"); + error(NameValueNode, + "entry with relative path at the root level is not discoverable"); + return nullptr; + } } // Remove trailing slash(es), being careful not to remove the root path StringRef Trimmed(Name); - size_t RootPathLen = sys::path::root_path(Trimmed).size(); + size_t RootPathLen = sys::path::root_path(Trimmed, path_style).size(); while (Trimmed.size() > RootPathLen && - sys::path::is_separator(Trimmed.back())) + sys::path::is_separator(Trimmed.back(), path_style)) Trimmed = Trimmed.slice(0, Trimmed.size() - 1); + // Get the last component - StringRef LastComponent = sys::path::filename(Trimmed); + StringRef LastComponent = sys::path::filename(Trimmed, path_style); std::unique_ptr Result; switch (Kind) { @@ -1460,12 +1483,12 @@ break; } - StringRef Parent = sys::path::parent_path(Trimmed); + StringRef Parent = sys::path::parent_path(Trimmed, path_style); if (Parent.empty()) return Result; // if 'name' contains multiple components, create implicit directory entries - for (sys::path::reverse_iterator I = sys::path::rbegin(Parent), + for (sys::path::reverse_iterator I = sys::path::rbegin(Parent, path_style), E = sys::path::rend(Parent); I != E; ++I) { std::vector> Entries;