---

yaml
---
r: 349362
b: refs/heads/master-next
c: aad01f7
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 226cd140b9414cea26e4f43260502839f36bfae4
+refs/heads/master-next: aad01f7c3085b04e1cfcf570fe223302dd9d6a60
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/AST/NameLookupTypeIDZone.def

@@ -21,4 +21,4 @@ SWIFT_TYPEID(ExtendedNominalRequest)
 SWIFT_TYPEID(SelfBoundsFromWhereClauseRequest)
 SWIFT_TYPEID(TypeDeclsFromWhereClauseRequest)
 SWIFT_TYPEID(CustomAttrNominalRequest)
-SWIFT_TYPEID(GetDestructorRequest)
+SWIFT_TYPEID(GetDestructorRequest)

branches/master-next/utils/build-presets.ini

@@ -740,6 +740,7 @@ install-xctest
 install-libicu
 install-prefix=/usr
 install-libcxx
+install-sourcekit-lsp
 build-swift-static-stdlib
 build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
@@ -1067,7 +1068,6 @@ enable-asan
 indexstore-db=0
 sourcekit-lsp=0
 
-
 # This does not currently pass due to leakers in the optimizer.
 [preset: buildbot_incremental_linux,lsan,tools=RDA,stdlib=RDA,test=no]
 build-subdir=buildbot_incremental_lsan
@@ -1150,6 +1150,7 @@ install-skstresstester
 install-swiftevolve
 install-playgroundsupport
 install-libcxx
+install-sourcekit-lsp
 
 install-destdir=%(install_destdir)s
 

branches/master-next/utils/build-script

@@ -793,6 +793,7 @@ class BuildScriptInvocation(object):
                         host_target, product_name))
                 product.build(host_target)
                 product.test(host_target)
+                product.install(host_target)
 
         # Extract symbols...
         for host_target in all_hosts:

branches/master-next/utils/build_swift/driver_arguments.py

@@ -562,6 +562,8 @@ def create_argument_parser():
            help='build IndexStoreDB')
     option(['--sourcekit-lsp'], toggle_true('build_sourcekitlsp'),
            help='build SourceKitLSP')
+    option(['--install-sourcekit-lsp'], toggle_true('install_sourcekitlsp'),
+           help='install SourceKitLSP')
     option(['--toolchain-benchmarks'],
            toggle_true('build_toolchainbenchmarks'),
            help='build Swift Benchmarks using swiftpm against the just built '

branches/master-next/utils/build_swift/tests/expected_options.py

@@ -88,6 +88,7 @@
     'build_swiftevolve': False,
     'build_indexstoredb': False,
     'build_sourcekitlsp': False,
+    'install_sourcekitlsp': False,
     'build_toolchainbenchmarks': False,
     'build_tvos': True,
     'build_tvos_device': False,
@@ -459,6 +460,7 @@ class IgnoreOption(_BaseOption):
     EnableOption('--libicu', dest='build_libicu'),
     EnableOption('--indexstore-db', dest='build_indexstoredb'),
     EnableOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
+    EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
     EnableOption('--tsan-libdispatch-test'),
     EnableOption('--long-test'),

branches/master-next/utils/swift_build_support/swift_build_support/products/benchmarks.py

@@ -45,6 +45,9 @@ def test(self, host_target):
         bench_Osize = os.path.join(self.build_dir, 'bin', 'Benchmark_Osize')
         shell.call([bench_Osize] + cmdline)
 
+    def install(self, host_target):
+        pass
+
 
 def run_build_script_helper(host_target, product, args):
     toolchain_path = args.install_destdir

branches/master-next/utils/swift_build_support/swift_build_support/products/indexstoredb.py

@@ -34,6 +34,9 @@ def test(self, host_target):
         if self.args.test and self.args.test_indexstoredb:
             run_build_script_helper('test', host_target, self, self.args)
 
+    def install(self, host_target):
+        pass
+
 
 def run_build_script_helper(action, host_target, product, args):
     script_path = os.path.join(

branches/master-next/utils/swift_build_support/swift_build_support/products/product.py

@@ -56,6 +56,13 @@ def test(self, host_target):
         """
         raise NotImplementedError
 
+    def install(self, host_target):
+        """install() -> void
+
+        Install to the toolchain, for a non-build-script-impl product.
+        """
+        raise NotImplementedError
+
     def __init__(self, args, toolchain, source_dir, build_dir):
         self.args = args
         self.toolchain = toolchain

branches/master-next/utils/swift_build_support/swift_build_support/products/sourcekitlsp.py

@@ -31,3 +31,8 @@ def test(self, host_target):
         if self.args.test and self.args.test_sourcekitlsp:
             indexstoredb.run_build_script_helper(
                 'test', host_target, self, self.args)
+
+    def install(self, host_target):
+        if self.args.install_sourcekitlsp:
+            indexstoredb.run_build_script_helper(
+                'install', host_target, self, self.args)

branches/master-next/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

@@ -66,3 +66,6 @@ def test(self, host_target):
 
         with shell.pushd(self.build_dir):
             shell.call(cmd, env=env)
+
+    def install(self, host_target):
+        pass