---

yaml
---
r: 318974
b: refs/heads/master-rebranch
c: e04e7fe
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: a9cae779f444a8ea3156b6562a309af954ed01f4
+refs/heads/master-rebranch: e04e7fe03c15a1768406a45f5c42ae0f5e3aec97

branches/master-rebranch/lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -520,6 +520,10 @@ class swift::ParseableInterfaceBuilder {
         return;
       }
 
+      // Optimize emitted modules. This has to happen after we parse arguments,
+      // because parseSILOpts would override the current optimization mode.
+      subInvocation.getSILOptions().OptMode = OptimizationMode::ForSpeed;
+
       // Build the .swiftmodule; this is a _very_ abridged version of the logic
       // in performCompile in libFrontendTool, specialized, to just the one
       // module-serialization task we're trying to do here.

branches/master-rebranch/test/ParseableInterface/optimization-level.swift

@@ -30,6 +30,6 @@ func f(s : inout [Int]) {
 // Test we can generate the interface of a module loaded via a .swiftinterface file correctly
 
 // RUN: %empty-directory(%t.mod)
-// RUN: %swift -emit-module -o /dev/null -emit-parseable-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library
+// RUN: %swift -emit-module -o /dev/null -emit-parseable-module-interface-path %t.mod/swift_mod.swiftinterface %S/Inputs/swift_mod.swift -parse-as-library
 // RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -I %t.mod -module-cache-path %t.mod/mcp > %t.response
 // RUN: diff -u %s.from_swiftinterface.response %t.response

branches/master-rebranch/test/SourceKit/InterfaceGen/gen_swift_module.swift

@@ -42,20 +42,6 @@ from swift_build_support.swift_build_support.toolchain import host_toolchain
 
 isMac = platform.system() == 'Darwin'
 
-def call_without_sleeping(command, env=None, dry_run=False, echo=False):
-    """
-    Execute a command during which system sleep is disabled.
-
-    By default, this ignores the state of the `shell.dry_run` flag.
-    """
-
-    # Disable system sleep, if possible.
-    if platform.system() == 'Darwin':
-        # Don't mutate the caller's copy of the arguments.
-        command = ["caffeinate"] + list(command)
-
-    shell.call(command, env=env, dry_run=dry_run, echo=echo)
-
 class Builder(object):
     def __init__(self, toolchain, args):
         self.toolchain = toolchain
@@ -76,7 +62,7 @@ class Builder(object):
 
     def call(self, command, env=None, without_sleeping=False):
         if without_sleeping:
-            call_without_sleeping(command, env=env, dry_run=self.dry_run, echo=self.verbose)
+            shell.call_without_sleeping(command, env=env, dry_run=self.dry_run, echo=self.verbose)
         else:
             shell.call(command, env=env, dry_run=self.dry_run, echo=self.verbose)
 

branches/master-rebranch/utils/build-parser-lib

@@ -56,21 +56,6 @@ def exit_rejecting_arguments(message, parser=None):
     sys.exit(2)  # 2 is the same as `argparse` error exit code.
 
 
-def call_without_sleeping(command, env=None, dry_run=False, echo=False):
-    """
-    Execute a command during which system sleep is disabled.
-
-    By default, this ignores the state of the `shell.dry_run` flag.
-    """
-
-    # Disable system sleep, if possible.
-    if platform.system() == 'Darwin':
-        # Don't mutate the caller's copy of the arguments.
-        command = ["caffeinate"] + list(command)
-
-    shell.call(command, env=env, dry_run=dry_run, echo=echo)
-
-
 class HostSpecificConfiguration(object):
 
     """Configuration information for an individual host."""
@@ -906,8 +891,8 @@ class BuildScriptInvocation(object):
         # `build-script-impl`.
         if self.args.legacy_impl:
             # Execute the underlying build script implementation.
-            call_without_sleeping([build_script_impl] + impl_args,
-                                  env=impl_env, echo=True)
+            shell.call_without_sleeping([build_script_impl] + impl_args,
+                                        env=impl_env, echo=True)
             return
 
         # Otherwise, we compute and execute the individual actions ourselves.
@@ -924,7 +909,7 @@ class BuildScriptInvocation(object):
                 assert name is not None, "invalid action"
                 action_name = "{}-{}-{}".format(
                     host.name, product_class.product_name(), name)
-            call_without_sleeping(
+            shell.call_without_sleeping(
                 [build_script_impl] + impl_args + [
                     "--only-execute", action_name],
                 env=impl_env, echo=self.args.verbose_build)
@@ -1143,7 +1128,7 @@ def main_preset():
     if args.expand_build_script_invocation:
         return 0
 
-    call_without_sleeping(build_script_args)
+    shell.call_without_sleeping(build_script_args)
     return 0
 
 

branches/master-rebranch/utils/build-script

@@ -17,6 +17,7 @@
 
 import os
 import pipes
+import platform
 import shutil
 import subprocess
 import sys
@@ -93,6 +94,21 @@ def call(command, stderr=None, env=None, dry_run=None, echo=True):
             "': " + e.strerror)
 
 
+def call_without_sleeping(command, env=None, dry_run=False, echo=False):
+    """
+    Execute a command during which system sleep is disabled.
+
+    By default, this ignores the state of the `shell.dry_run` flag.
+    """
+
+    # Disable system sleep, if possible.
+    if platform.system() == 'Darwin':
+        # Don't mutate the caller's copy of the arguments.
+        command = ["caffeinate"] + list(command)
+
+    call(command, env=env, dry_run=dry_run, echo=echo)
+
+
 def capture(command, stderr=None, env=None, dry_run=None, echo=True,
             optional=False, allow_non_zero_exit=False):
     """