Merge pull request #2085 from nkcsgexi/master

[AST] Correctly set implicit for enum element patterns. rdar://24870746

Author: nkcsgexi

include/swift/AST/Pattern.h

@@ -566,7 +566,7 @@ class EnumElementPattern : public Pattern {
     : Pattern(PatternKind::EnumElement),
       ParentType(ParentType), DotLoc(DotLoc), NameLoc(NameLoc), Name(Name),
       ElementDecl(Element), SubPattern(SubPattern) {
-    if (Implicit.hasValue() ? *Implicit : !ParentType.hasLocation())
+    if (Implicit.hasValue() && *Implicit)
       setImplicit();
   }
 
@@ -579,6 +579,10 @@ class EnumElementPattern : public Pattern {
   Pattern *getSubPattern() {
     return SubPattern;
   }
+
+  bool isParentTypeImplicit() {
+    return !ParentType.hasLocation();
+  }
 
   void setSubPattern(Pattern *p) { SubPattern = p; }