Merge pull request #6650 from practicalswift/gardening-20170107

Author: swift-ci

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

@@ -430,9 +430,9 @@ runOnFunctionRecursively(SILFunction *F, FullApplySite AI,
         // Finding a valid insertion point is tricky:
         // Inlining might add new basic blocks and/or remove the apply
         // We want to add the fix up *just before* where the current apply is!
-        // Unfortunately, we *can’t* add the fix up code here:
+        // Unfortunately, we *can't* add the fix up code here:
         // Inlining might fail for any reason -
-        // If that occurred we’d need to undo our fix up code.
+        // If that occurred we'd need to undo our fix up code.
         // Instead, we split the current basic block -
         // Making sure we have a basic block that starts with our apply.
         SILBuilderWithScope B(I);

utils/swift_build_support/swift_build_support/shell.py

@@ -178,6 +178,7 @@ def copytree(src, dest, dry_run=None, echo=True):
 # Initialized later
 lock = None
 
+
 def run(*args, **kwargs):
     repo_path = os.getcwd()
     echo_output = kwargs.pop('echo', False)
@@ -187,7 +188,8 @@ def run(*args, **kwargs):
         _echo_command(dry_run, *args, env=env)
         return(None, 0, args)
 
-    my_pipe = subprocess.Popen(*args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
+    my_pipe = subprocess.Popen(
+        *args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
     (stdout, stderr) = my_pipe.communicate()
     ret = my_pipe.wait()
 
@@ -223,7 +225,8 @@ def init(l):
         n_processes = cpu_count() * 2
 
     l = Lock()
-    print("Running ``%s`` with up to %d processes." % (fn.__name__, n_processes))
+    print("Running ``%s`` with up to %d processes." %
+          (fn.__name__, n_processes))
     pool = Pool(processes=n_processes, initializer=init, initargs=(l,))
     results = pool.map_async(func=fn, iterable=pool_args).get(9999999)
     pool.close()

utils/swift_build_support/tests/products/test_swift.py

@@ -95,8 +95,8 @@ def test_swift_runtime_tsan(self):
             build_dir='/path/to/build')
         self.assertEqual(set(swift.cmake_options),
                          set(['-DSWIFT_RUNTIME_USE_SANITIZERS=Thread',
-                          '-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE',
-                          '-DSWIFT_STDLIB_ENABLE_SIL_OWNERSHIP=FALSE']))
+                              '-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE',
+                              '-DSWIFT_STDLIB_ENABLE_SIL_OWNERSHIP=FALSE']))
 
     def test_swift_compiler_vendor_flags(self):
         self.args.compiler_vendor = "none"

validation-test/SIL/crashers/011-swift-typechecker-validatetype.sil renamed to validation-test/SIL/crashers_fixed/011-swift-typechecker-validatetype.sil

@@ -5,6 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// REQUIRES: OS=linux-gnu
 // RUN: not %target-swift-frontend %s -emit-ir
 {{return 0 &+ 1 + 2){}}t