---

yaml
---
r: 327167
b: refs/heads/tensorflow
c: 6842134
h: refs/heads/master
i:
  327165: f4c9952
  327163: db3acd2
  327159: 09602ef
  327151: 88e9eda
  327135: 79fc198
  327103: c8a3c2e
  327039: bd26268
  326911: 23f83a4
  326655: caf4a22

Author: aschwaighofer

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 6fcbb4046293e9484c98cd03aca45bf4e1313d97
+refs/heads/tensorflow: 684213415224f8367c35734e8996d26d01e3202a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/Parse/ParseType.cpp

@@ -391,7 +391,6 @@ Parser::TypeASTResult Parser::parseType(Diag<> MessageID,
   }
 
   if (Tok.is(tok::arrow)) {
-    auto InputNode = SyntaxContext->popIf<ParsedTypeSyntax>().getValue();
     // Handle type-function if we have an arrow.
     auto ArrowLoc = Tok.getLoc();
     auto Arrow = consumeTokenSyntax();
@@ -404,21 +403,23 @@ Parser::TypeASTResult Parser::parseType(Diag<> MessageID,
     }
     ParserResult<TypeRepr> SecondHalf =
         parseType(diag::expected_type_function_result);
-    auto SecondTy = SyntaxContext->popIf<ParsedTypeSyntax>();
     if (SecondHalf.isParseError()) {
-      SyntaxContext->addSyntax(InputNode);
       if (Throws)
         SyntaxContext->addSyntax(*Throws);
       SyntaxContext->addSyntax(Arrow);
-      if (SecondTy)
-        SyntaxContext->addSyntax(*SecondTy);
       if (SecondHalf.hasCodeCompletion())
         return makeParserCodeCompletionResult<TypeRepr>();
       if (SecondHalf.isNull())
         return nullptr;
     }
 
     ParsedFunctionTypeSyntaxBuilder Builder(*SyntaxContext);
+    Builder.useReturnType(SyntaxContext->popIf<ParsedTypeSyntax>().getValue());
+    Builder.useArrow(Arrow);
+    if (Throws)
+      Builder.useThrowsOrRethrowsKeyword(*Throws);
+
+    auto InputNode = SyntaxContext->popIf<ParsedTypeSyntax>().getValue();
     bool isVoid = false;
     if (auto TupleTypeNode = InputNode.getAs<ParsedTupleTypeSyntax>()) {
       // Decompose TupleTypeSyntax and repack into FunctionType.
@@ -446,13 +447,6 @@ Parser::TypeASTResult Parser::parseType(Diag<> MessageID,
       Builder.addArgumentsMember(ParsedSyntaxRecorder::makeTupleTypeElement(
           InputNode, /*TrailingComma=*/None, *SyntaxContext));
     }
-
-    Builder.useReturnType(*SecondTy);
-    if (Throws)
-      Builder.useThrowsOrRethrowsKeyword(*Throws);
-    Builder.useArrow(Arrow);
-    Builder.useReturnType(*SecondTy);
-
     SyntaxContext->addSyntax(Builder.build());
 
     auto FunctionType = SyntaxContext->topNode<FunctionTypeSyntax>();
@@ -1113,20 +1107,21 @@ Parser::TypeResult Parser::parseTypeTupleBody() {
     // Parse the type annotation.
     auto TypeLoc = Tok.getLoc();
     auto TypeASTResult = parseType(diag::expected_type);
-    auto Type = SyntaxContext->popIf<ParsedTypeSyntax>();
     if (TypeASTResult.hasCodeCompletion() || TypeASTResult.isNull()) {
       Junk.append(LocalJunk.begin(), LocalJunk.end());
-      if (Type)
-        Junk.push_back(*Type);
+      if (auto parsedT = SyntaxContext->popIf<ParsedTypeSyntax>())
+        Junk.push_back(*parsedT);
       skipListUntilDeclRBraceSyntax(Junk, LParenLoc, tok::r_paren, tok::comma);
       return TypeASTResult.hasCodeCompletion()
                  ? makeParserCodeCompletionStatus()
                  : makeParserError();
     }
 
+    auto Type = *SyntaxContext->popIf<ParsedTypeSyntax>();
+
     if (IsInOutObsoleted) {
       bool IsTypeAlreadyAttributed = false;
-      if (auto AttributedType = Type->getAs<ParsedAttributedTypeSyntax>())
+      if (auto AttributedType = Type.getAs<ParsedAttributedTypeSyntax>())
         IsTypeAlreadyAttributed = AttributedType->getDeferredSpecifier().hasValue();
 
       if (IsTypeAlreadyAttributed) {
@@ -1172,7 +1167,7 @@ Parser::TypeResult Parser::parseTypeTupleBody() {
     Comma = consumeTokenSyntaxIf(tok::comma);
 
     auto Element = ParsedSyntaxRecorder::makeTupleTypeElement(
-        InOut, Name, SecondName, Colon, *Type, ElementEllipsis, Initializer,
+        InOut, Name, SecondName, Colon, Type, ElementEllipsis, Initializer,
         Comma, *SyntaxContext);
 
     Junk.push_back(Element);

branches/tensorflow/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())

branches/tensorflow/test/Frontend/dump-parse.swift

@@ -1,4 +1,4 @@
-// RUN: not %target-swift-frontend -dump-parse %s | %FileCheck %s
+// RUN: not %target-swift-frontend -dump-parse %s 2>&1 | %FileCheck %s
 // RUN: not %target-swift-frontend -dump-ast %s | %FileCheck %s -check-prefix=CHECK-AST
 
 // CHECK-LABEL: (func_decl{{.*}}"foo(_:)"

branches/tensorflow/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;

branches/tensorflow/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
+  }
+}

branches/tensorflow/test/Syntax/round_trip_misc.swift

@@ -19,9 +19,6 @@ do {
 do {
   typealias Alias3 = (a b C, 
 }
-do {
-  typealias Alias3 = () -> @objc func
-}
 
 // Orphan '}' at top level
 }