Merge pull request #13855 from aschwaighofer/swift-4.1-branch_outliner_generic_objc_class_fix

[4.1] Outliner: Can't handle generic ObjC classes

Author: aschwaighofer

lib/SILOptimizer/Transforms/Outliner.cpp

@@ -428,7 +428,8 @@ bool BridgedProperty::matchMethodCall(SILBasicBlock::iterator It) {
       FirstInst != ObjCMethod ? FirstInst : ObjCMethod->getOperand();
   if (!ObjCMethod || !ObjCMethod->hasOneUse() ||
       ObjCMethod->getOperand() != Instance ||
-      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic())
+      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic() ||
+      ObjCMethod->getType().castTo<SILFunctionType>()->isPolymorphic())
     return false;
 
   // Don't outline in the outlined function.
@@ -569,7 +570,8 @@ 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 || CMI->getFunction()->getLoweredFunctionType()->isPolymorphic())
+    if (!CMI || CMI->getFunction()->getLoweredFunctionType()->isPolymorphic() ||
+        CMI->getType().castTo<SILFunctionType>()->isPolymorphic())
       return false;
     FirstInst = CMI;
   } else
@@ -608,7 +610,6 @@ bool BridgedProperty::matchInstSequence(SILBasicBlock::iterator It) {
     if (!Release || NumUses != 4)
       return false;
   }
-
   return true;
 }
 
@@ -1106,8 +1107,10 @@ bool ObjCMethodCall::matchInstSequence(SILBasicBlock::iterator I) {
 
   ObjCMethod = dyn_cast<ObjCMethodInst>(I);
   if (!ObjCMethod ||
-      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic())
+      ObjCMethod->getFunction()->getLoweredFunctionType()->isPolymorphic() ||
+      ObjCMethod->getType().castTo<SILFunctionType>()->isPolymorphic())
     return false;
+
   auto *Use = ObjCMethod->getSingleUse();
   if (!Use)
     return false;

test/SILOptimizer/Inputs/Outliner.h

@@ -14,4 +14,11 @@
 - (NSString*) doSomething;
 @end
 
+@protocol FooProto <NSObject>
+@end
 
+@protocol SomeGenericClass <FooProto>
+@property (nonatomic, nullable, readonly, strong) NSString *version;
+- (NSString*) doSomething;
+- (id) doSomething2 : (NSArray<NSString*>*) arr;
+@end

test/SILOptimizer/outliner.swift

@@ -140,3 +140,17 @@ public func dontCrash<T: Proto>(x : Gizmo2<T>) {
   print(s)
 
 }
+
+public func dontCrash2(_ c: SomeGenericClass) -> Bool {
+  guard let str = c.version else {
+      return false
+  }
+  guard let str2 = c.doSomething() else {
+      return false
+  }
+
+  let arr = [ "foo", "bar"]
+  c.doSomething2(arr)
+
+  return true
+}