Merge pull request #40018 from CodaFi/unusedual

CodaFi · web-flow · commit 6b4231bde3d0 · 2021-11-04T08:35:19.000-07:00
diff --git a/lib/Sema/TypeCheckPattern.cpp b/lib/Sema/TypeCheckPattern.cpp
@@ -1087,7 +1087,6 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,
   case PatternKind::Typed: {
     TypedPattern *TP = cast<TypedPattern>(P);
     Type patternType = TypeChecker::typeCheckPattern(pattern);
-    bool hadError = false;
     if (!patternType->hasError()) {
       if (!type->isEqual(patternType) && !type->hasError()) {
         if (options & TypeResolutionFlags::OverrideType) {
@@ -1101,11 +1100,8 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,
         } else {
           diags.diagnose(P->getLoc(), diag::pattern_type_mismatch_context,
                          type);
-          hadError = true;
         }
       }
-    } else {
-      hadError = true;
     }
 
     Pattern *sub = TP->getSubPattern();

Original file line number	Diff line number	Diff line change
`@@ -1087,7 +1087,6 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,`
`1087`	`1087`	`case PatternKind::Typed: {`
`1088`	`1088`	`TypedPattern *TP = cast<TypedPattern>(P);`
`1089`	`1089`	`Type patternType = TypeChecker::typeCheckPattern(pattern);`
`1090`		`- bool hadError = false;`
`1091`	`1090`	`if (!patternType->hasError()) {`
`1092`	`1091`	`if (!type->isEqual(patternType) && !type->hasError()) {`
`1093`	`1092`	`if (options & TypeResolutionFlags::OverrideType) {`
`@@ -1101,11 +1100,8 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,`
`1101`	`1100`	`} else {`
`1102`	`1101`	`diags.diagnose(P->getLoc(), diag::pattern_type_mismatch_context,`
`1103`	`1102`	`type);`
`1104`		`- hadError = true;`
`1105`	`1103`	`}`
`1106`	`1104`	`}`
`1107`		`- } else {`
`1108`		`- hadError = true;`
`1109`	`1105`	`}`
`1110`	`1106`
`1111`	`1107`	`Pattern *sub = TP->getSubPattern();`