[6.0] MandatoryPerformanceOptimizations: prevent inlining of dynamic-self class methods

SwiftCompilerSources/Sources/Optimizer/ModulePasses/MandatoryPerformanceOptimizations.swift

@@ -204,6 +204,12 @@ private func shouldInline(apply: FullApplySite, callee: Function, alreadyInlined
     return true
   }
 
+  if callee.mayBindDynamicSelf {
+    // We don't support inlining a function that binds dynamic self into a global-init function
+    // because the global-init function cannot provide the self metadata.
+    return false
+  }
+
   if apply.parentFunction.isGlobalInitOnceFunction && callee.inlineStrategy == .always {
     // Some arithmetic operations, like integer conversions, are not transparent but `inline(__always)`.
     // Force inlining them in global initializers so that it's possible to statically initialize the global.

SwiftCompilerSources/Sources/Optimizer/Utilities/OptUtils.swift

@@ -540,6 +540,10 @@ extension Function {
     }
     return nil
   }
+
+  var mayBindDynamicSelf: Bool {
+    self.bridged.mayBindDynamicSelf()
+  }
 }
 
 extension FullApplySite {

include/swift/SIL/SILBridging.h

@@ -560,6 +560,7 @@ struct BridgedFunction {
   BRIDGED_INLINE bool hasSemanticsAttr(BridgedStringRef attrName) const;
   BRIDGED_INLINE bool hasUnsafeNonEscapableResult() const;
   BRIDGED_INLINE bool hasResultDependsOnSelf() const;
+  bool mayBindDynamicSelf() const;  
   BRIDGED_INLINE EffectsKind getEffectAttribute() const;
   BRIDGED_INLINE PerformanceConstraints getPerformanceConstraints() const;
   BRIDGED_INLINE InlineStrategy getInlineStrategy() const;

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -1540,6 +1540,13 @@ void SwiftPassInvocation::endVerifyFunction() {
 
 SwiftPassInvocation::~SwiftPassInvocation() {}
 
+//===----------------------------------------------------------------------===//
+//                           SIL Bridging
+//===----------------------------------------------------------------------===//
+bool BridgedFunction::mayBindDynamicSelf() const {
+  return swift::mayBindDynamicSelf(getFunction());
+}
+
 //===----------------------------------------------------------------------===//
 //                           OptimizerBridging
 //===----------------------------------------------------------------------===//

test/embedded/classes.swift

@@ -43,6 +43,16 @@ func testCasting(_ title: StaticString, _ c: MyClass) {
   }
 }
 
+public class DynamicSelfClass {
+  public static let ds = DynamicSelfClass()
+  public static let i: Int = 42
+  var x: Int
+
+  public init() {
+    self.x = Self.i
+  }
+}
+
 @main
 struct Main {
   static var o: (MyClass?, MyClass?, MyClass?) = (nil, nil, nil)
@@ -95,5 +105,8 @@ struct Main {
     testCasting("subsub: ", MySubSubClass())
     // CHECK: other: -
     testCasting("other: ", OtherSubClass())
+
+    // CHECK: 42
+    print(DynamicSelfClass.ds.x)
   }
 }