Merge pull request #13210 from aschwaighofer/outliner_objc_generic_methods

Author: swift-ci

lib/SILOptimizer/Transforms/Outliner.cpp

@@ -427,7 +427,8 @@ bool BridgedProperty::matchMethodCall(SILBasicBlock::iterator It) {
   SILValue Instance =
       FirstInst != ObjCMethod ? FirstInst : ObjCMethod->getOperand();
   if (!ObjCMethod || !ObjCMethod->hasOneUse() ||
-      ObjCMethod->getOperand() != Instance)
+      ObjCMethod->getOperand() != Instance ||
+      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic())
     return false;
 
   // Don't outline in the outlined function.
@@ -568,7 +569,7 @@ bool BridgedProperty::matchInstSequence(SILBasicBlock::iterator It) {
   if (!Load) {
     // Try to match without the load/strong_retain prefix.
     auto *CMI = dyn_cast<ObjCMethodInst>(It);
-    if (!CMI)
+    if (!CMI || CMI->getFunction()->getLoweredFunctionType()->isPolymorphic())
       return false;
     FirstInst = CMI;
   } else
@@ -1104,7 +1105,8 @@ bool ObjCMethodCall::matchInstSequence(SILBasicBlock::iterator I) {
   clearState();
 
   ObjCMethod = dyn_cast<ObjCMethodInst>(I);
-  if (!ObjCMethod)
+  if (!ObjCMethod ||
+      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic())
     return false;
   auto *Use = ObjCMethod->getSingleUse();
   if (!Use)

test/SILOptimizer/Inputs/Outliner.h

@@ -1,9 +1,17 @@
 #import <Foundation/Foundation.h>
 
+@protocol Proto
+- (id)requirement;
+@end
+
 @interface Gizmo : NSObject
 @property (nonatomic)NSString *stringProperty;
 - (NSString*) modifyString: (NSString *)str withNumber: (NSInteger) num withFoobar: (id)foobar;
 - (id) doSomething : (NSArray<NSString*>*) arr;
 @end
 
+@interface Gizmo2<ObjectType: id<Proto>> : NSObject
+- (NSString*) doSomething;
+@end
+
 

test/SILOptimizer/outliner.swift

@@ -134,3 +134,9 @@ public func testOutlining() {
 // CHECK:   %7 = apply %2(%6, %1) : $@convention(objc_method) (Optional<NSArray>, Gizmo) -> @autoreleased Optional<AnyObject>
 // CHECK:   strong_release %4 : $NSArray
 // CHECK:   return %7 : $Optional<AnyObject>
+
+public func dontCrash<T: Proto>(x : Gizmo2<T>) {
+  let s = x.doSomething()
+  print(s)
+
+}