Switch to using an API that handles non-ASCII paths appropriately on Windows.

llvm-svn: 273262

2 files changed, 37 insertions, 10 deletions

diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc
index 8e5931ce6d8..fab6aeca54a 100644
--- a/llvm/lib/Support/Windows/Path.inc
+++ b/llvm/lib/Support/Windows/Path.inc
@@ -820,33 +820,34 @@ std::error_code getPathFromOpenFD(int FD, SmallVectorImpl<char> &ResultPath) {
     return make_error_code(errc::bad_file_descriptor);
 
   DWORD CharCount;
+  SmallVector<wchar_t, 1024> TempPath;
   do {
-    // FIXME: We should be using the W version of this API and converting the
-    // resulting path to UTF-8 to handle non-ASCII file paths.
-    CharCount = ::GetFinalPathNameByHandleA(FileHandle, ResultPath.begin(),
-                                            ResultPath.capacity(),
+    CharCount = ::GetFinalPathNameByHandleW(FileHandle, TempPath.begin(),
+                                            TempPath.capacity(),
                                             FILE_NAME_NORMALIZED);
-    if (CharCount < ResultPath.capacity())
+    if (CharCount < TempPath.capacity())
       break;
 
     // Reserve sufficient space for the path as well as the null character. Even
     // though the API does not document that it is required, if we reserve just
     // CharCount space, the function call will not store the resulting path and
     // still report success.
-    ResultPath.reserve(CharCount + 1);
+    TempPath.reserve(CharCount + 1);
   } while (true);
 
   if (CharCount == 0)
     return mapWindowsError(::GetLastError());
 
-  ResultPath.set_size(CharCount);
+  TempPath.set_size(CharCount);
 
   // On earlier Windows releases, the character count includes the terminating
   // null.
-  if (ResultPath.back() == '\0')
-    ResultPath.pop_back();
+  if (TempPath.back() == L'\0') {
+    --CharCount;
+    TempPath.pop_back();
+  }
 
-  return std::error_code();
+  return windows::UTF16ToUTF8(TempPath.data(), CharCount, ResultPath);
 }
 } // end namespace fs
 
diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp
index 74b74ac4195..1a6ffa50e98 100644
--- a/llvm/unittests/Support/Path.cpp
+++ b/llvm/unittests/Support/Path.cpp
@@ -1057,6 +1057,32 @@ TEST_F(FileSystemTest, PathFromFDWin32) {
   ::close(FileDescriptor);
 }
 
+TEST_F(FileSystemTest, PathFromFDUnicode) {
+  // Create a temp file.
+  int FileDescriptor;
+  SmallString<64> TempPath;
+
+  // Test Unicode: "<temp directory>/(pi)r^2<temp rand chars>.aleth.0"
+  ASSERT_NO_ERROR(
+    fs::createTemporaryFile("\xCF\x80r\xC2\xB2",
+                            "\xE2\x84\xB5.0", FileDescriptor, TempPath));
+
+  // Make sure it exists.
+  ASSERT_TRUE(sys::fs::exists(Twine(TempPath)));
+
+  SmallVector<char, 8> ResultPath;
+  std::error_code ErrorCode =
+    fs::getPathFromOpenFD(FileDescriptor, ResultPath);
+
+  if (!ErrorCode) {
+    fs::UniqueID D1, D2;
+    ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), D1));
+    ASSERT_NO_ERROR(fs::getUniqueID(Twine(ResultPath), D2));
+    ASSERT_EQ(D1, D2);
+  }
+  ::close(FileDescriptor);
+}
+
 TEST_F(FileSystemTest, OpenFileForRead) {
   // Create a temp file.
   int FileDescriptor;