---

yaml
---
r: 344951
b: refs/heads/master
c: 6dea8d7
h: refs/heads/master
i:
  344949: f400563
  344947: e0b0821
  344943: 470b7ca

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: af9a0cb825026e5902e718b6849efd26f20273a8
+refs/heads/master: 6dea8d75bfe2148b5613587f4e9c3640d2c72bd9
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/SILOptimizer/Utils/SILInliner.h

@@ -44,9 +44,9 @@ class SILInliner : public TypeSubstCloner<SILInliner, SILOptFunctionBuilder> {
 public:
   enum class InlineKind { MandatoryInline, PerformanceInline };
 
-  // Returns true if this an begin_apply instruction that we can inline or
-  // another application site.
-  static bool canInlineBeginApply(FullApplySite AI);
+  // Returns true if this an apply site that can't be inlined for some
+  // structural reason.
+  static bool canInline(FullApplySite AI);
 
 private:
   InlineKind IKind;

trunk/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp

@@ -662,8 +662,8 @@ SILFunction *swift::getEligibleFunction(FullApplySite AI,
     return nullptr;
   }
 
-  // We don't currently support inlining co-routines with several yields.
-  if (!SILInliner::canInlineBeginApply(AI))
+  // Not all apply sites can be inlined, even if they're direct.
+  if (!SILInliner::canInline(AI))
     return nullptr;
 
   auto ModuleName = Callee->getModule().getSwiftModule()->getName().str();

trunk/lib/SILOptimizer/Utils/SILInliner.cpp

@@ -59,15 +59,15 @@ static bool canInlineBeginApply(BeginApplyInst *BA) {
   return true;
 }
 
-bool SILInliner::canInlineBeginApply(FullApplySite AI) {
+bool SILInliner::canInline(FullApplySite AI) {
   if (auto BA = dyn_cast<BeginApplyInst>(AI)) {
-    return ::canInlineBeginApply(BA);
+    return canInlineBeginApply(BA);
   }
   return true;
 }
 
 bool SILInliner::canInlineFunction(FullApplySite AI) {
-  if (!canInlineBeginApply(AI))
+  if (!canInline(AI))
     return false;
   return AI.getFunction() != &Original;
 }