Link _CompilerPluginSupport into the compiler and SourceKit.

Ensure that we link `swift_CompilerPluginSupport` into the compiler and
SourceKit, and set the rpath appropriately to find the library in its
installed location.

A number of driver tests copy the driver executable into a temporary
directory to isolate it from the build tree. Also copy the plugin
support library into its appropriate place near the driver executable
to ensure these tests keep working. To help with this, add a
`swift_swift_parser` lit feature, which we can use in tests that
involve the new parser's capabilities.

Author: DougGregor

lib/CompilerPluginSupport/CMakeLists.txt

@@ -80,4 +80,6 @@ if(SWIFT_SWIFT_PARSER)
     swift_install_in_component(DIRECTORY "${module_base}"
                                DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift"
                                COMPONENT compiler)
+
+    set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${library_name})
 endif()

test/Driver/driver-compile.swift

@@ -45,8 +45,10 @@
 
 // RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %S/../Inputs/empty.swift -module-name main -driver-filelist-threshold=0 2>&1 | %FileCheck -check-prefix=FILELIST %s
 
-// RUN: %empty-directory(%t)/DISTINCTIVE-PATH/usr/bin/
+// RUN: %empty-directory(%t/DISTINCTIVE-PATH/usr/bin/)
+// RUN: %empty-directory(%t/DISTINCTIVE-PATH/usr/lib/)
 // RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
+// RUN: %copy-plugin-support-library(%t/DISTINCTIVE-PATH/usr/lib/)
 // RUN: ln -s "swiftc" %t/DISTINCTIVE-PATH/usr/bin/swift-update
 // RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc -driver-print-jobs -c -update-code -target x86_64-apple-macosx10.9 %s 2>&1 > %t.upd.txt
 // RUN: %FileCheck -check-prefix UPDATE-CODE %s < %t.upd.txt

test/Driver/linker-clang_rt.swift

@@ -6,7 +6,9 @@
 
 // RUN: rm -rf %t
 // RUN: %empty-directory(%t/bin)
+// RUN: %empty-directory(%t/lib)
 // RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/bin/swiftc)
+// RUN: %copy-plugin-support-library(%t/lib/)
 // RUN: %empty-directory(%t/lib/swift/clang/lib/darwin/)
 
 // RUN: %t/bin/swiftc -driver-print-jobs -target x86_64-apple-macosx10.9 %S/../Inputs/empty.swift | %FileCheck -check-prefix CHECK -check-prefix CHECK-NO-RUNTIME %s

test/Driver/options-repl-darwin.swift

@@ -5,7 +5,9 @@
 // the Swift driver really thinks it's been moved.
 
 // RUN: %empty-directory(%t/usr/bin/)
+// RUN: %empty-directory(%t/usr/lib/)
 // RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/usr/bin/swift)
+// RUN: %copy-plugin-support-library(%t/usr/lib/)
 
 // RUN: %t/usr/bin/swift -repl -### | %FileCheck -check-prefix=INTEGRATED %s
 // RUN: %t/usr/bin/swift -### | %FileCheck -check-prefix=INTEGRATED %s
@@ -16,7 +18,9 @@
 // RUN: %t/usr/bin/swift -### | %FileCheck -check-prefix=LLDB %s
 
 // RUN: %empty-directory(%t/Toolchains/Test.xctoolchain/usr/bin)
+// RUN: %empty-directory(%t/Toolchains/Test.xctoolchain/usr/lib)
 // RUN: mv %t/usr/bin/swift %t/Toolchains/Test.xctoolchain/usr/bin/swift
+// RUN: %copy-plugin-support-library(%t/Toolchains/Test.xctoolchain/usr/lib/)
 // RUN: %t/Toolchains/Test.xctoolchain/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s
 
 // Clean up the test executable because hard links are expensive.

test/Driver/options-repl.swift

@@ -7,6 +7,8 @@
 
 // RUN: %empty-directory(%t)
 // RUN: mkdir -p %t/usr/bin
+// RUN: mkdir -p %t/usr/lib
+// RUN: %copy-plugin-support-library(%t/usr/lib/)
 // RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/usr/bin/swift)
 
 // RUN: %t/usr/bin/swift -sdk "" -deprecated-integrated-repl -### | %FileCheck -check-prefix=INTEGRATED %s

test/Driver/subcommands.swift

@@ -3,7 +3,9 @@
 
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/usr/bin
+// RUN: mkdir -p %t.dir/usr/lib
 // RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t.dir/usr/bin/swift)
+// RUN: %copy-plugin-support-library(%t.dir/usr/lib/)
 
 // RUN: %t.dir/usr/bin/swift -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s
 // RUN: %t.dir/usr/bin/swift repl -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s

test/Driver/windows-link-job.swift

@@ -1,5 +1,7 @@
 // RUN: %empty-directory(%t/DISTINCTIVE-WINDOWS-PATH/usr/bin)
+// RUN: %empty-directory(%t/DISTINCTIVE-WINDOWS-PATH/usr/lib)
 // RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/DISTINCTIVE-WINDOWS-PATH/usr/bin/swiftc)
+// RUN: %copy-plugin-support-library(%t/DISTINCTIVE-WINDOWS-PATH/usr/lib/)
 // RUN: env PATH= %t/DISTINCTIVE-WINDOWS-PATH/usr/bin/swiftc -target x86_64-unknown-windows-msvc -### -module-name link -emit-library %s 2>&1 | %FileCheck %s
 
 // swift-frontend cannot be copied to another location with bootstrapping because

test/lit.cfg

@@ -469,6 +469,7 @@ lit_config.note("Using code completion cache: " + completion_cache_path)
 
 config.substitutions.append( ('%validate-incrparse', '%{python} %utils/incrparse/validate_parse.py --temp-dir %t --swift-syntax-test %swift-syntax-test') )
 config.substitutions.append( ('%llvm_obj_root', config.llvm_obj_root) )
+config.substitutions.append( ('%swift-lib-dir', config.swift_lib_dir) )
 config.substitutions.append( ('%llvm_src_root', config.llvm_src_root) )
 config.substitutions.append( ('%swift_obj_root', config.swift_obj_root) )
 config.substitutions.append( ('%swift_src_root', config.swift_src_root) )
@@ -2472,6 +2473,25 @@ config.substitutions.append(('%target-resilience-test', config.target_resilience
 config.substitutions.append(('%llvm-profdata', config.llvm_profdata))
 config.substitutions.append(('%llvm-cov', config.llvm_cov))
 
+# Name of the compiler plugin support library.
+plugin_support_shared_lib_name = ("%sswift_CompilerPluginSupport%s" %
+    (config.target_shared_library_prefix, config.target_shared_library_suffix))
+plugin_support_shared_lib = make_path(config.swift_lib_dir, plugin_support_shared_lib_name)
+config.substitutions.append(('%compiler_plugin_library',
+                             plugin_support_shared_lib))
+
+if "swift_swift_parser" in config.available_features:
+  config.substitutions.append(
+      (r'%copy-plugin-support-library\(*(.*)\)',
+       SubstituteCaptures(
+           r'cp %s \1' %
+           (escape_for_substitute_captures(plugin_support_shared_lib)))))
+else:
+  config.substitutions.append(
+      (r'%copy-plugin-support-library\(*(.*)\)',
+       r'echo "No plugin support library to copy"'))
+
+
 if hasattr(config, 'otool_classic'):
     config.substitutions.append(('%otool-classic', config.otool_classic))
 

test/lit.site.cfg.in

@@ -152,6 +152,9 @@ config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
 if "@BOOTSTRAPPING_MODE@" != "OFF":
   config.available_features.add('swift_in_compiler')
 
+if "@SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR@" != "":
+  config.available_features.add('swift_swift_parser')
+
 if "@BOOTSTRAPPING_MODE@" == 'HOSTTOOLS':
   config.available_features.add('hosttools_mode')
 elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING':

tools/SourceKit/lib/SwiftLang/CMakeLists.txt

@@ -67,3 +67,8 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
   clangAPINotes
   clangBasic)
 add_dependencies(SourceKitSwiftLang clang-tablegen-targets)
+
+if (SWIFT_SWIFT_PARSER)
+  target_link_libraries(SourceKitSwiftLang
+    PRIVATE swift_CompilerPluginSupport)
+endif()