---

yaml
---
r: 347625
b: refs/heads/master
c: 520a2d7
h: refs/heads/master
i:
  347623: 39f4980

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 38af24e29e2967e754c2d30fba17947e673d553c
+refs/heads/master: 520a2d7afeca4c51efb1b1020453d509216a113a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/SourceKit/CursorInfo/cursor_symlink.swift

@@ -1,3 +1,5 @@
+// ln doesn't create a proper symlink on Windows
+// XFAIL: windows
 // RUN: %empty-directory(%t.dir)
 // RUN: echo "let foo = 0" > %t.dir/real.swift
 // RUN: ln -s %t.dir/real.swift %t.dir/linked.swift

trunk/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp

@@ -31,6 +31,7 @@
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/Hashing.h"
+#include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
@@ -849,19 +850,28 @@ std::string SwiftLangSupport::resolvePathSymlinks(StringRef FilePath) {
 
   return InputPath;
 #else
-  char full_path[MAX_PATH];
+  wchar_t full_path[MAX_PATH] = {0};
+  llvm::SmallVector<llvm::UTF16, 50> utf16Path;
+  llvm::convertUTF8ToUTF16String(InputPath.c_str(), utf16Path);
 
-  HANDLE fileHandle = CreateFileA(
-      InputPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING,
-      FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, nullptr);
+  HANDLE fileHandle = CreateFileW(
+      (LPCWSTR)utf16Path.data(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
+      OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
 
   if (fileHandle == INVALID_HANDLE_VALUE)
     return InputPath;
 
-  DWORD success = GetFinalPathNameByHandleA(
-      fileHandle, full_path, sizeof(full_path), FILE_NAME_NORMALIZED);
+  bool success = GetFinalPathNameByHandleW(fileHandle, full_path, MAX_PATH,
+                                            FILE_NAME_NORMALIZED);
   CloseHandle(fileHandle);
-  return (success ? full_path : InputPath);
+  std::string utf8Path;
+  if (success) {
+    llvm::ArrayRef<char> pathRef((const char *)full_path,
+                                 (const char *)(full_path + MAX_PATH));
+    success &= llvm::convertUTF16ToUTF8String(pathRef, utf8Path);
+  }
+
+  return (success ? utf8Path : InputPath);
 #endif
 }
 

trunk/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp

@@ -12,20 +12,21 @@
 
 #include "sourcekitd/sourcekitd.h"
 
-#include "TestOptions.h"
 #include "SourceKit/Support/Concurrency.h"
-#include "clang/Rewrite/Core/RewriteBuffer.h"
+#include "TestOptions.h"
 #include "swift/Demangling/ManglingMacros.h"
+#include "clang/Rewrite/Core/RewriteBuffer.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/ConvertUTF.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Regex.h"
-#include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/FormatVariadic.h"
+#include "llvm/Support/raw_ostream.h"
 #include <fstream>
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
@@ -48,11 +49,31 @@ namespace {
 int STDOUT_FILENO = _fileno(stdout);
 const constexpr size_t MAXPATHLEN = MAX_PATH + 1;
 char *realpath(const char *path, char *resolved_path) {
-  DWORD dwLength = GetFullPathNameA(path, 0, nullptr, nullptr);
-  if (dwLength == 0)
+  wchar_t full_path[MAXPATHLEN] = {0};
+  llvm::SmallVector<llvm::UTF16, 50> utf16Path;
+  llvm::convertUTF8ToUTF16String(path, utf16Path);
+
+  HANDLE fileHandle = CreateFileW(
+      (LPCWSTR)utf16Path.data(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
+      OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+
+  if (fileHandle == INVALID_HANDLE_VALUE)
     return nullptr;
-  if ((resolved_path = static_cast<char *>(malloc(dwLength + 1))))
-    GetFullPathNameA(path, dwLength, resolved_path, nullptr);
+  DWORD success = GetFinalPathNameByHandleW(fileHandle, full_path, MAX_PATH,
+                                            FILE_NAME_NORMALIZED);
+  CloseHandle(fileHandle);
+  if (!success) return nullptr;
+
+  std::string utf8Path;
+  llvm::ArrayRef<char> pathRef((const char *)full_path,
+                               (const char *)(full_path + MAX_PATH));
+  if (!llvm::convertUTF16ToUTF8String(pathRef, utf8Path))
+    return nullptr;
+
+  if (!resolved_path) {
+    resolved_path = static_cast<char *>(malloc(utf8Path.length() + 1));
+  }
+  std::copy(std::begin(utf8Path), std::end(utf8Path), resolved_path);
   return resolved_path;
 }
 }