Merge pull request #28744 from aschwaighofer/outliner_fix_57849479

Outliner: Check that we have a self argument before we ask for it

Author: aschwaighofer

lib/SILOptimizer/Transforms/Outliner.cpp

@@ -764,7 +764,8 @@ BridgedArgument BridgedArgument::match(unsigned ArgIdx, SILValue Arg,
   auto *BridgeCall =
       dyn_cast<ApplyInst>(std::prev(SILBasicBlock::iterator(Enum)));
   if (!BridgeCall || BridgeCall->getNumArguments() != 1 ||
-      Enum->getOperand() != BridgeCall || !BridgeCall->hasOneUse())
+      Enum->getOperand() != BridgeCall || !BridgeCall->hasOneUse() ||
+      !FullApplySite(BridgeCall).hasSelfArgument())
     return BridgedArgument();
 
   auto &selfArg = FullApplySite(BridgeCall).getSelfArgumentOperand();

test/SILOptimizer/Inputs/Outliner.h

@@ -60,3 +60,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSArray *) treeishChildren;
 @end
 NS_ASSUME_NONNULL_END
+
+NS_ASSUME_NONNULL_BEGIN
+@interface MyObject : NSObject
+@property (nullable) NSError *error;
+@end
+NS_ASSUME_NONNULL_END

test/SILOptimizer/outliner.swift

@@ -239,3 +239,20 @@ open class Test
      return view
    }
 }
+
+internal extension NSError {
+   convenience init(myError code: Int) {
+     self.init(domain: "error", code: code, userInfo: [:])
+   }
+}
+
+public class AnotherTest {
+  public let obj: MyObject
+  public init(obj: MyObject) {
+    self.obj = obj
+  }
+
+  public func dontCrash() {
+      self.obj.error = NSError(myError: 10)
+  }
+}