Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/IRGen/SwitchBuilder.h

@@ -165,10 +165,9 @@ class SwitchSwitchBuilder final : public SwitchBuilder {
   }
 };
 
-std::unique_ptr<SwitchBuilder> SwitchBuilder::create(IRGenFunction &IGF,
-                                                     llvm::Value *Subject,
-                                                     SwitchDefaultDest Default,
-                                                     unsigned NumCases) {
+inline std::unique_ptr<SwitchBuilder>
+SwitchBuilder::create(IRGenFunction &IGF, llvm::Value *Subject,
+                      SwitchDefaultDest Default, unsigned NumCases) {
   // Pick a builder based on how many total reachable destinations we intend
   // to have.
   switch (NumCases + (Default.getInt() == IsNotUnreachable)) {

utils/build-overlay

@@ -923,7 +923,8 @@ def main_preset():
         "--distcc",
         help="use distcc",
         action=argparse.actions.StoreTrueAction,
-        nargs=argparse.Nargs.OPTIONAL)
+        nargs=argparse.Nargs.OPTIONAL,
+        default=os.environ.get('USE_DISTCC') == '1')
     parser.add_argument(
         "--cmake-c-launcher",
         help="the absolute path to set CMAKE_C_COMPILER_LAUNCHER",

utils/build-script

@@ -400,6 +400,7 @@ def create_argument_parser():
     option('--host-libtool', store_path(executable=True),
            help='the absolute path to libtool. Default is auto detected.')
     option('--distcc', toggle_true,
+           default=os.environ.get('USE_DISTCC') == '1',
            help='use distcc in pump mode')
     option('--enable-asan', toggle_true,
            help='enable Address Sanitizer')