Merge pull request #18871 from rjmccall/rename-can-inline-begin-apply
diff --git a/include/swift/SILOptimizer/Utils/SILInliner.h b/include/swift/SILOptimizer/Utils/SILInliner.h
index a64aa1e..4ed2827 100644
--- a/include/swift/SILOptimizer/Utils/SILInliner.h
+++ b/include/swift/SILOptimizer/Utils/SILInliner.h
@@ -44,9 +44,9 @@
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;
diff --git a/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp b/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
index 2eb1b11..85708f1 100644
--- a/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
+++ b/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
@@ -662,8 +662,8 @@
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();
diff --git a/lib/SILOptimizer/Utils/SILInliner.cpp b/lib/SILOptimizer/Utils/SILInliner.cpp
index 6793147..190dbd1 100644
--- a/lib/SILOptimizer/Utils/SILInliner.cpp
+++ b/lib/SILOptimizer/Utils/SILInliner.cpp
@@ -59,15 +59,15 @@
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;
}
