@@ -544,9 +544,9 @@ static ControlFlowKind CheckFallThrough(AnalysisDeclContext &AC) {
544
544
namespace {
545
545
546
546
struct CheckFallThroughDiagnostics {
547
- unsigned diag_FallThrough_HasNoReturn;
548
- unsigned diag_FallThrough_ReturnsNonVoid;
549
- unsigned diag_NeverFallThroughOrReturn;
547
+ unsigned diag_FallThrough_HasNoReturn = 0 ;
548
+ unsigned diag_FallThrough_ReturnsNonVoid = 0 ;
549
+ unsigned diag_NeverFallThroughOrReturn = 0 ;
550
550
unsigned funMode; // TODO: use diag::FunModes
551
551
SourceLocation FuncLoc;
552
552
@@ -569,8 +569,6 @@ struct CheckFallThroughDiagnostics {
569
569
570
570
if (!isVirtualMethod && !isTemplateInstantiation)
571
571
D.diag_NeverFallThroughOrReturn = diag::warn_suggest_noreturn_function;
572
- else
573
- D.diag_NeverFallThroughOrReturn = 0 ;
574
572
575
573
D.funMode = diag::FunModes::Function;
576
574
return D;
@@ -579,9 +577,7 @@ struct CheckFallThroughDiagnostics {
579
577
static CheckFallThroughDiagnostics MakeForCoroutine (const Decl *Func) {
580
578
CheckFallThroughDiagnostics D;
581
579
D.FuncLoc = Func->getLocation ();
582
- D.diag_FallThrough_HasNoReturn = 0 ;
583
580
D.diag_FallThrough_ReturnsNonVoid = diag::warn_falloff_nonvoid;
584
- D.diag_NeverFallThroughOrReturn = 0 ;
585
581
D.funMode = diag::FunModes::Coroutine;
586
582
return D;
587
583
}
@@ -590,7 +586,6 @@ struct CheckFallThroughDiagnostics {
590
586
CheckFallThroughDiagnostics D;
591
587
D.diag_FallThrough_HasNoReturn = diag::err_noreturn_has_return_expr;
592
588
D.diag_FallThrough_ReturnsNonVoid = diag::err_falloff_nonvoid;
593
- D.diag_NeverFallThroughOrReturn = 0 ;
594
589
D.funMode = diag::FunModes::Block;
595
590
return D;
596
591
}
@@ -599,7 +594,6 @@ struct CheckFallThroughDiagnostics {
599
594
CheckFallThroughDiagnostics D;
600
595
D.diag_FallThrough_HasNoReturn = diag::err_noreturn_has_return_expr;
601
596
D.diag_FallThrough_ReturnsNonVoid = diag::warn_falloff_nonvoid;
602
- D.diag_NeverFallThroughOrReturn = 0 ;
603
597
D.funMode = diag::FunModes::Lambda;
604
598
return D;
605
599
}
0 commit comments