Merge pull request #2020 from eeckstein/add_silcombine

Add SILCombine+SimplifyCFG passes between the ClosureSpecializer (and…

Author: eeckstein

lib/SILOptimizer/PassManager/Passes.cpp

@@ -330,6 +330,11 @@ void swift::runSILOptimizationPasses(SILModule &Module) {
   // Speculate virtual call targets.
   PM.addSpeculativeDevirtualization();
 
+  // There should be at least one SILCombine+SimplifyCFG between the
+  // ClosureSpecializer, etc. and the last inliner. Cleaning up after these
+  // passes can expose more inlining opportunities.
+  AddSimplifyCFGSILCombine(PM);
+
   // We do this late since it is a pass like the inline caches that we only want
   // to run once very late. Make sure to run at least one round of the ARC
   // optimizer after this.

test/SILOptimizer/closure_spec_and_inline.swift

@@ -0,0 +1,23 @@
+// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | FileCheck %s
+
+func closure(a: Int, b: Int) -> Bool {
+  return a < b
+}
+
+// Check that closure() is inlined into call_closure after call_closure is
+// specialized for it.
+
+// CHECK-LABEL: sil shared [noinline] @_TTSf1n_n_cl27_TF4test7closureFTSi1bSi_Sb___TF4test12call_closureFTSiSiFTSiSi_Sb_Sb
+// CHECK-NOT: apply
+// CHECK: builtin "cmp_slt_Int64"
+// CHECK-NOT: apply
+// CHECK: return
+@inline(never)
+func call_closure(a: Int, _ b: Int, _ f: (Int , Int) -> Bool) -> Bool {
+  return f(a, b)
+}
+
+public func testit() -> Bool {
+  return call_closure(0, 1, closure)
+}
+

test/SILOptimizer/devirt_single_module_in_multiple_files.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swiftc_driver -module-name devirt_single_module_in_multiple_files -O  %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -emit-sil 2>&1 | FileCheck %s
+// RUN: %target-swiftc_driver -module-name devirt_single_module_in_multiple_files -O  %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -Xllvm -sil-disable-pass="Performance Inliner" -emit-sil 2>&1 | FileCheck %s
 
 public func test() {
   let e = Evaluator()