Merge pull request #3564 from jtbandes/jtbandes/fix-nil

Author: swift-ci

lib/Sema/TypeCheckPattern.cpp

@@ -385,10 +385,9 @@ class ResolvePattern : public ASTVisitor<ResolvePattern,
 
   // Convert a paren expr to a pattern if it contains a pattern.
   Pattern *visitParenExpr(ParenExpr *E) {
-    if (Pattern *subPattern = visit(E->getSubExpr()))
-      return new (TC.Context) ParenPattern(E->getLParenLoc(), subPattern,
-                                           E->getRParenLoc());
-    return nullptr;
+    Pattern *subPattern = getSubExprPattern(E->getSubExpr());
+    return new (TC.Context) ParenPattern(E->getLParenLoc(), subPattern,
+                                         E->getRParenLoc());
   }
 
   // Convert all tuples to patterns.

test/Constraints/patterns.swift

@@ -127,6 +127,22 @@ case let x?: break
 case nil: break
 }
 
+func SR2066(x: Int?) {
+    // nil literals should still work when wrapped in parentheses
+    switch x {
+    case (nil): break
+    case _?: break
+    }
+    switch x {
+    case ((nil)): break
+    case _?: break
+    }
+    switch (x, x) {
+    case ((nil), _): break
+    case (_?, _): break
+    }
+}
+
 // Test x???? patterns.
 switch (nil as Int???) {
 case let x???: print(x, terminator: "")