Merge pull request #3488 from ahoppen/SR-2057-match-opt-enum

CodaFi · web-flow · commit a7ee8ba9cf0f · 2016-07-13T08:54:56.000-07:00
[Sema] Fix compiler crash when pattern matching optional enum
diff --git a/lib/Sema/TypeCheckPattern.cpp b/lib/Sema/TypeCheckPattern.cpp
@@ -1458,8 +1458,8 @@ bool TypeChecker::coercePatternToType(Pattern *&P, DeclContext *dc, Type type,
                           /*special kind*/0, Rename.str())
                 .fixItReplace(EEP->getLoc(), Rename.str());
 
+              return true;
             }
-            return true;
           }
 
           diagnose(EEP->getLoc(), diag::enum_element_pattern_member_not_found,
diff --git a/test/Constraints/patterns.swift b/test/Constraints/patterns.swift
@@ -222,3 +222,13 @@ func ugly(_ a: A<EE>) {
     }
   }
 }
+
+// SR-2057
+
+enum SR2057 {
+  case foo
+}
+
+let sr2057: SR2057? = nil
+if case .foo = sr2057 { } // expected-error{{enum case 'foo' not found in type 'SR2057?'}}
+

Original file line number	Diff line number	Diff line change
`@@ -1458,8 +1458,8 @@ bool TypeChecker::coercePatternToType(Pattern &P, DeclContext dc, Type type,`
`1458`	`1458`	`/special kind/0, Rename.str())`
`1459`	`1459`	`.fixItReplace(EEP->getLoc(), Rename.str());`
`1460`	`1460`
	`1461`	`+ return true;`
`1461`	`1462`	`}`
`1462`		`- return true;`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`	`1465`	`diagnose(EEP->getLoc(), diag::enum_element_pattern_member_not_found,`
Original file line number	Diff line number	Diff line change
`@@ -222,3 +222,13 @@ func ugly(_ a: A<EE>) {`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`}`
	`225`	`+`
	`226`	`+// SR-2057`
	`227`	`+`
	`228`	`+enum SR2057 {`
	`229`	`+ case foo`
	`230`	`+}`
	`231`	`+`
	`232`	`+let sr2057: SR2057? = nil`
	`233`	`+if case .foo = sr2057 { } // expected-error{{enum case 'foo' not found in type 'SR2057?'}}`
	`234`	`+`