---

yaml
---
r: 347446
b: refs/heads/master
c: e0dcbb6
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp

@@ -15,6 +15,7 @@
 #include "SourceKit/Support/Concurrency.h"
 #include "SourceKit/Support/UIdent.h"
 
+#include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Mutex.h"
 #include "llvm/Support/Path.h"
 
@@ -82,14 +83,17 @@ UIdent sourcekitd::UIdentFromSKDUID(sourcekitd_uid_t uid) {
 std::string sourcekitd::getRuntimeLibPath() {
 #if defined(_WIN32)
   MEMORY_BASIC_INFORMATION mbi;
+  llvm::SmallString<128> libPath;
   char path[MAX_PATH + 1];
   if (!VirtualQuery(static_cast<void *>(sourcekitd_initialize), &mbi,
                     sizeof(mbi)))
     llvm_unreachable("call to VirtualQuery failed");
   if (!GetModuleFileNameA(static_cast<HINSTANCE>(mbi.AllocationBase), path,
                           MAX_PATH))
     llvm_unreachable("call to GetModuleFileNameA failed");
-  return llvm::sys::path::parent_path(path);
+  libPath = llvm::sys::path::parent_path(llvm::sys::path::parent_path(path));
+  llvm::sys::path::append(libPath, "lib");
+  return libPath.str();
 #else
   // This silly cast below avoids a C++ warning.
   Dl_info info;