Fix test failures of SourceKit plugin on Linux

Author: ahoppen

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

@@ -2,33 +2,68 @@ sourcekitd_cancel_request
 sourcekitd_request_handle_dispose
 sourcekitd_initialize
 sourcekitd_request_array_create
+sourcekitd_request_array_get_bool
+sourcekitd_request_array_get_count
+sourcekitd_request_array_get_int64
+sourcekitd_request_array_get_string
+sourcekitd_request_array_get_uid
+sourcekitd_request_array_get_value
 sourcekitd_request_array_set_int64
 sourcekitd_request_array_set_string
 sourcekitd_request_array_set_stringbuf
 sourcekitd_request_array_set_uid
 sourcekitd_request_array_set_value
+sourcekitd_request_bool_get_value
 sourcekitd_request_create_from_yaml
 sourcekitd_request_description_copy
 sourcekitd_request_description_dump
 sourcekitd_request_dictionary_create
+sourcekitd_request_dictionary_get_bool
+sourcekitd_request_dictionary_get_int64
+sourcekitd_request_dictionary_get_string
+sourcekitd_request_dictionary_get_uid
+sourcekitd_request_dictionary_get_value
 sourcekitd_request_dictionary_set_int64
 sourcekitd_request_dictionary_set_string
 sourcekitd_request_dictionary_set_stringbuf
 sourcekitd_request_dictionary_set_uid
 sourcekitd_request_dictionary_set_value
+sourcekitd_request_get_type
 sourcekitd_request_int64_create
-sourcekitd_request_retain
+sourcekitd_request_int64_get_value
 sourcekitd_request_release
+sourcekitd_request_retain
 sourcekitd_request_string_create
+sourcekitd_request_string_get_length
+sourcekitd_request_string_get_ptr
 sourcekitd_request_uid_create
+sourcekitd_request_uid_get_value
+sourcekitd_response_array_create
+sourcekitd_response_array_set_int64
+sourcekitd_response_array_set_double
+sourcekitd_response_array_set_string
+sourcekitd_response_array_set_stringbuf
+sourcekitd_response_array_set_uid
+sourcekitd_response_array_set_value
 sourcekitd_response_description_copy
 sourcekitd_response_description_dump
 sourcekitd_response_description_dump_filedesc
+sourcekitd_response_dictionary_create
+sourcekitd_response_dictionary_set_bool
+sourcekitd_response_dictionary_set_double
+sourcekitd_response_dictionary_set_custom_buffer
+sourcekitd_response_dictionary_set_int64
+sourcekitd_response_dictionary_set_string
+sourcekitd_response_dictionary_set_stringbuf
+sourcekitd_response_dictionary_set_uid
+sourcekitd_response_dictionary_set_value
 sourcekitd_response_dispose
+sourcekitd_response_error_create
 sourcekitd_response_error_get_description
 sourcekitd_response_error_get_kind
 sourcekitd_response_get_value
 sourcekitd_response_is_error
+sourcekitd_response_retain
 sourcekitd_send_request
 sourcekitd_send_request_sync
 sourcekitd_set_interrupted_connection_handler
@@ -60,14 +95,14 @@ sourcekitd_variant_dictionary_get_bool
 sourcekitd_variant_dictionary_get_double
 sourcekitd_variant_dictionary_get_int64
 sourcekitd_variant_dictionary_get_string
-sourcekitd_variant_dictionary_get_value
 sourcekitd_variant_dictionary_get_uid
+sourcekitd_variant_dictionary_get_value
 sourcekitd_variant_get_type
 sourcekitd_variant_json_description_copy
 sourcekitd_variant_string_get_length
 sourcekitd_variant_string_get_ptr
-sourcekitd_variant_data_get_size
 sourcekitd_variant_data_get_ptr
+sourcekitd_variant_data_get_size
 sourcekitd_variant_int64_get_value
 sourcekitd_variant_uid_get_value
 sourcekitd_variant_functions_create

tools/SourceKit/tools/sourcekitd/include/sourcekitd/plugin.h

@@ -191,6 +191,8 @@ typedef const char *(*sourcekitd_uid_get_string_ptr_t)(sourcekitd_uid_t);
 typedef void *sourcekitd_plugin_initialize_params_t;
 typedef void (*sourcekitd_plugin_initialize_t)(
     sourcekitd_plugin_initialize_params_t);
+typedef void (*sourcekitd_plugin_initialize_2_t)(
+    sourcekitd_plugin_initialize_params_t, const char *sourcekit_path);
 
 SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL bool
     sourcekitd_plugin_initialize_is_client_only(

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp

@@ -27,6 +27,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/YAMLParser.h"
 #include <mutex>
+#include <dlfcn.h>
 
 using namespace SourceKit;
 using namespace sourcekitd;
@@ -268,6 +269,8 @@ bool sourcekitd::shutdownClient() {
   return true;
 }
 
+extern "C" const char __dso_handle[];
+
 static void loadPlugin(StringRef plugin, PluginInitParams &pluginParams) {
   std::string err;
   auto *handle = swift::loadLibrary(plugin.str().c_str(), &err);
@@ -277,17 +280,27 @@ static void loadPlugin(StringRef plugin, PluginInitParams &pluginParams) {
     return;
   }
 
+  auto *plugin_init_2 = (sourcekitd_plugin_initialize_2_t)swift::getAddressOfSymbol(
+      handle, "sourcekitd_plugin_initialize_2");
+  if (plugin_init_2) {
+    Dl_info dlinfo;
+    dladdr(__dso_handle, &dlinfo);
+    plugin_init_2(&pluginParams, dlinfo.dli_fname);
+    return;
+  }
+
+  // Fall back to the legacy sourcekitd_plugin_initialize function.
   auto *plugin_init = (sourcekitd_plugin_initialize_t)swift::getAddressOfSymbol(
       handle, "sourcekitd_plugin_initialize");
-  if (!plugin_init) {
-    LOG_WARN("plugin-loading",
-             "plugin '"
-                 << plugin
-                 << "' missing expected symbol: sourcekitd_plugin_initialize");
+  if (plugin_init) {
+    plugin_init(&pluginParams);
     return;
   }
 
-  plugin_init(&pluginParams);
+  LOG_WARN("plugin-loading",
+           "plugin '"
+              << plugin
+              << "' missing expected symbol: sourcekitd_plugin_initialize_2 or sourcekitd_plugin_initialize");
 }
 
 void sourcekitd::loadPlugins(ArrayRef<std::string> registeredPlugins,

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-InProc.cpp

@@ -518,7 +518,11 @@ sourcekitd_request_dictionary_get_value(sourcekitd_object_t dict,
 
 const char *sourcekitd_request_dictionary_get_string(sourcekitd_object_t dict,
                                                      sourcekitd_uid_t key) {
-  return static_cast<SKDObject *>(dict)->get(key)->getCString();
+  auto value = static_cast<SKDObject *>(dict)->get(key);
+  if (!value) {
+    return nullptr;
+  }
+  return value->getCString();
 }
 
 int64_t sourcekitd_request_dictionary_get_int64(sourcekitd_object_t dict,