Merge pull request #17327 from shajrawi/devirt_inline

Author: swift-ci

lib/SILOptimizer/Utils/Devirtualize.cpp

@@ -516,7 +516,9 @@ bool swift::canDevirtualizeClassMethod(FullApplySite AI,
 
   // We need to disable the  “effectively final” opt if a function is inlinable
   if (isEffectivelyFinalMethod &&
-      F->getResilienceExpansion() == ResilienceExpansion::Minimal) {
+      ((F->getResilienceExpansion() == ResilienceExpansion::Minimal) ||
+       AI.getFunction()->getResilienceExpansion() ==
+           ResilienceExpansion::Minimal)) {
     DEBUG(llvm::dbgs() << "        FAIL: Could not optimize function because "
                           "it is an effectively-final inlinable: "
                        << F->getName() << "\n");

test/SILOptimizer/devirtualize_inlinable_mandatory.swift

@@ -0,0 +1,13 @@
+// RUN: %target-swift-frontend %s -whole-module-optimization -emit-sil | %FileCheck %s
+
+public class C {
+  public func f() {}
+}
+
+//CHECK-LABEL: sil [serialized] @$S32devirtualize_inlinable_mandatory1gyyAA1CCF : $@convention(thin) (@guaranteed C) -> () {
+//CHECK: class_method %0 : $C, #C.f!1 : (C) -> () -> (), $@convention(method) (@guaranteed C) -> ()
+//CHECK-NOT: function_ref
+//CHECK: return 
+@inlinable public func g(_ x: C) {
+  x.f()
+}