[sourcekit] Sink UID handling into the API library

This fixes a layering violation where UID handling was provided by a
dependent library, creating a dependency cycle if you tried to link the
lower level libraries dynamically.

Author: benlangmuir

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

@@ -33,56 +33,8 @@
 
 using namespace SourceKit;
 
-static llvm::sys::Mutex GlobalHandlersMtx;
-static sourcekitd_uid_handler_t UidMappingHandler;
-static sourcekitd_str_from_uid_handler_t StrFromUidMappingHandler;
-
 static void postNotification(sourcekitd_response_t Notification);
 
-void
-sourcekitd_set_uid_handler(sourcekitd_uid_handler_t handler) {
-  llvm::sys::ScopedLock L(GlobalHandlersMtx);
-  sourcekitd_uid_handler_t newHandler = Block_copy(handler);
-  Block_release(UidMappingHandler);
-  UidMappingHandler = newHandler;
-}
-
-void
-sourcekitd_set_uid_handlers(sourcekitd_uid_from_str_handler_t uid_from_str,
-                            sourcekitd_str_from_uid_handler_t str_from_uid) {
-  llvm::sys::ScopedLock L(GlobalHandlersMtx);
-
-  sourcekitd_uid_handler_t newUIDFromStrHandler = Block_copy(uid_from_str);
-  Block_release(UidMappingHandler);
-  UidMappingHandler = newUIDFromStrHandler;
-
-  sourcekitd_str_from_uid_handler_t newStrFromUIDHandler = Block_copy(str_from_uid);
-  Block_release(StrFromUidMappingHandler);
-  StrFromUidMappingHandler = newStrFromUIDHandler;
-}
-
-sourcekitd_uid_t sourcekitd::SKDUIDFromUIdent(UIdent UID) {
-  if (void *Tag = UID.getTag())
-    return reinterpret_cast<sourcekitd_uid_t>(Tag);
-
-  if (UidMappingHandler) {
-    sourcekitd_uid_t skduid = UidMappingHandler(UID.c_str());
-    if (skduid) {
-      UID.setTag(skduid);
-      return skduid;
-    }
-  }
-
-  return reinterpret_cast<sourcekitd_uid_t>(UID.getAsOpaqueValue());
-}
-
-UIdent sourcekitd::UIdentFromSKDUID(sourcekitd_uid_t uid) {
-  if (StrFromUidMappingHandler)
-    return UIdent(StrFromUidMappingHandler(uid));
-
-  return UIdent::getFromOpaqueValue(uid);
-}
-
 static void getToolchainPrefixPath(llvm::SmallVectorImpl<char> &Path) {
 #if defined(_WIN32)
   MEMORY_BASIC_INFORMATION mbi;

tools/SourceKit/tools/sourcekitd/bin/XPC/Service/XPCService.cpp

@@ -71,7 +71,7 @@ class SKUIDToUIDMap {
 
 static SKUIDToUIDMap UIDMap;
 
-sourcekitd_uid_t sourcekitd::SKDUIDFromUIdent(UIdent UID) {
+static sourcekitd_uid_t xpcSKDUIDFromUIdent(UIdent UID) {
   if (void *Tag = UID.getTag())
     return reinterpret_cast<sourcekitd_uid_t>(Tag);
 
@@ -108,7 +108,7 @@ sourcekitd_uid_t sourcekitd::SKDUIDFromUIdent(UIdent UID) {
   return skduid;
 }
 
-UIdent sourcekitd::UIdentFromSKDUID(sourcekitd_uid_t SKDUID) {
+static UIdent xpcUIdentFromSKDUID(sourcekitd_uid_t SKDUID) {
   // This should be used only for debugging/logging purposes.
 
   UIdent UID = UIDMap.get(SKDUID);
@@ -341,6 +341,13 @@ static void fatal_error_handler(void *user_data, const std::string& reason,
 int main(int argc, const char *argv[]) {
   llvm::install_fatal_error_handler(fatal_error_handler, 0);
   sourcekitd::enableLogging("sourcekit-serv");
+  sourcekitd_set_uid_handlers(
+      ^sourcekitd_uid_t(const char *uidStr) {
+        return xpcSKDUIDFromUIdent(UIdent(uidStr));
+      },
+      ^const char *(sourcekitd_uid_t uid) {
+        return xpcUIdentFromSKDUID(uid).c_str();
+      });
   sourcekitd::initializeService(
       getRuntimeLibPath(), getDiagnosticDocumentationPath(), postNotification);
 

tools/SourceKit/tools/sourcekitd/lib/API/CMakeLists.txt

@@ -12,6 +12,7 @@ add_sourcekit_library(sourcekitdAPI
   sourcekitdAPI-Common.cpp
   TokenAnnotationsArray.cpp
   ExpressionTypeArray.cpp
+  UIDHandling.cpp
 )
 target_link_libraries(sourcekitdAPI PRIVATE
   swiftBasic

tools/SourceKit/tools/sourcekitd/lib/API/UIDHandling.cpp

@@ -0,0 +1,68 @@
+//===--- UIDHandling.cpp --------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#include "SourceKit/Support/UIdent.h"
+#include "sourcekitd/Internal.h"
+
+#include "llvm/Support/Mutex.h"
+
+#include <Block.h>
+
+using namespace SourceKit;
+
+static llvm::sys::Mutex GlobalHandlersMtx;
+static sourcekitd_uid_handler_t UidMappingHandler;
+static sourcekitd_str_from_uid_handler_t StrFromUidMappingHandler;
+
+void sourcekitd_set_uid_handler(sourcekitd_uid_handler_t handler) {
+  llvm::sys::ScopedLock L(GlobalHandlersMtx);
+  sourcekitd_uid_handler_t newHandler = Block_copy(handler);
+  Block_release(UidMappingHandler);
+  UidMappingHandler = newHandler;
+}
+
+void sourcekitd_set_uid_handlers(
+    sourcekitd_uid_from_str_handler_t uid_from_str,
+    sourcekitd_str_from_uid_handler_t str_from_uid) {
+  llvm::sys::ScopedLock L(GlobalHandlersMtx);
+
+  sourcekitd_uid_handler_t newUIDFromStrHandler = Block_copy(uid_from_str);
+  Block_release(UidMappingHandler);
+  UidMappingHandler = newUIDFromStrHandler;
+
+  sourcekitd_str_from_uid_handler_t newStrFromUIDHandler =
+      Block_copy(str_from_uid);
+  Block_release(StrFromUidMappingHandler);
+  StrFromUidMappingHandler = newStrFromUIDHandler;
+}
+
+sourcekitd_uid_t sourcekitd::SKDUIDFromUIdent(UIdent UID) {
+  if (void *Tag = UID.getTag())
+    return reinterpret_cast<sourcekitd_uid_t>(Tag);
+
+  if (UidMappingHandler) {
+    sourcekitd_uid_t skduid = UidMappingHandler(UID.c_str());
+    if (skduid) {
+      UID.setTag(skduid);
+      return skduid;
+    }
+  }
+
+  return reinterpret_cast<sourcekitd_uid_t>(UID.getAsOpaqueValue());
+}
+
+UIdent sourcekitd::UIdentFromSKDUID(sourcekitd_uid_t uid) {
+  if (StrFromUidMappingHandler)
+    return UIdent(StrFromUidMappingHandler(uid));
+
+  return UIdent::getFromOpaqueValue(uid);
+}