Merge pull request swiftlang#26931 from aschwaighofer/outliner_fix

Outliner fix: Make sure the enum actually has an operand before we access it
athas · Aug 29, 2019 · f1f75ca · f1f75ca
2 parents 6fcbb40 + 6842134
commit f1f75ca
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 1 deletion.
diff --git a/lib/SILOptimizer/Transforms/Outliner.cpp b/lib/SILOptimizer/Transforms/Outliner.cpp
@@ -737,7 +737,7 @@ BridgedArgument BridgedArgument::match(unsigned ArgIdx, SILValue Arg,
   // release_value %17 : $Optional<NSString>
   //
   auto *Enum = dyn_cast<EnumInst>(Arg);
-  if (!Enum)
+  if (!Enum || !Enum->hasOperand())
     return BridgedArgument();
 
   if (SILBasicBlock::iterator(Enum) == Enum->getParent()->begin())

diff --git a/test/SILOptimizer/Inputs/Outliner.h b/test/SILOptimizer/Inputs/Outliner.h
@@ -23,6 +23,37 @@
 - (id) doSomething2 : (NSArray<NSString*>*) arr;
 @end
 
+typedef NS_ENUM(NSUInteger, MyEventType) {
+    MyEventTypeA = 1,
+    MyEventTypeB = 2
+};
+
+@interface MyWindow : NSObject
+@property NSInteger windowNumber;
+@end
+
+@interface MyView : NSObject
+@property (nonatomic, nullable, readonly, strong) MyWindow *window;
+@end
+
+typedef struct MyPoint {
+NSInteger x;
+NSInteger y;
+} MyPoint;
+
+@interface MyGraphicsContext : NSObject
+@end
+
+@interface MyEvent : NSObject
++ (nullable MyEvent *)mouseEventWithType:(MyEventType)type
+                                location:(MyPoint)pt
+                            windowNumber:(NSInteger)wNum
+                                 context:(nullable MyGraphicsContext * __unused)context
+                             eventNumber:(NSInteger)eNum
+                              clickCount:(NSInteger)cnt
+                                pressure:(float)pressure;
+@end
+
 NS_ASSUME_NONNULL_BEGIN
 @protocol Treeish <NSObject>
 - (nullable NSArray *) treeishChildren;

diff --git a/test/SILOptimizer/outliner.swift b/test/SILOptimizer/outliner.swift
@@ -184,3 +184,27 @@ extension Operation {
 public func dontCrash(a: Any)  {
   (a as AnyObject).treeishChildren()
 }
+
+public class Foo : NSObject {
+  var x: MyView? = nil
+
+  public func dontCrash(_ pt: MyPoint) -> Bool {
+    guard let somView = x,
+          let window = somView.window else {
+      return false
+    }
+
+    guard let event = MyEvent.mouseEvent(with: .A,
+                                         location: pt,
+                                         windowNumber: window.windowNumber,
+                                         context: nil,
+                                         eventNumber: 0,
+                                         clickCount: 1,
+                                         pressure:1) else {
+      print("failure")
+      return false
+    }
+    print(event)
+    return true
+  }
+}