---

yaml
---
r: 349599
b: refs/heads/master-next
c: a073fd7
h: refs/heads/master
i:
  349597: 90f3cd5
  349595: e0da040
  349591: 5c7fa61
  349583: 84cd44f
  349567: 2c11f94

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: e305a2076d09621e8569fdc9e59502f2277d5676
+refs/heads/master-next: a073fd76213196bc07a8baf3b1a3dc218eacb2ca
 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/SILOptimizer/PassManager/Passes.def

@@ -36,7 +36,7 @@
 ///   This macro follows the same conventions as PASS(Id, Tag, Description),
 ///   but is used for IRGen passes which are built outside of the
 ///   SILOptimizer library.
-///
+///   
 ///   An IRGen pass is created by IRGen and needs to be registered with the pass
 ///   manager dynamically.
 #ifndef IRGEN_PASS
@@ -312,8 +312,6 @@ PASS(SerializeSILPass, "serialize-sil",
 PASS(YieldOnceCheck, "yield-once-check",
     "Check correct usage of yields in yield-once coroutines")
 PASS(OSLogOptimization, "os-log-optimization", "Optimize os log calls")
-PASS(MandatoryCombiner, "mandatory-combiner",
-    "Perform mandatory peephole combines")
 PASS(BugReducerTester, "bug-reducer-tester",
      "sil-bug-reducer Tool Testing by Asserting on a Sentinel Function")
 PASS_RANGE(AllPasses, AADumper, BugReducerTester)

branches/master-next/lib/SILOptimizer/Mandatory/CMakeLists.txt

@@ -21,6 +21,5 @@ silopt_register_sources(
   SemanticARCOpts.cpp
   SILGenCleanup.cpp
   YieldOnceCheck.cpp
-  MandatoryCombiner.cpp
   OSLogOptimization.cpp
 )