Skip to content

Commit ccfa4c6

Browse files
author
Igor S. Gerasimov
committed
funMode -> FunMode
1 parent 146642e commit ccfa4c6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

clang/lib/Sema/AnalysisBasedWarnings.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ struct CheckFallThroughDiagnostics {
547547
unsigned diag_FallThrough_HasNoReturn = 0;
548548
unsigned diag_FallThrough_ReturnsNonVoid = 0;
549549
unsigned diag_NeverFallThroughOrReturn = 0;
550-
unsigned funMode; // TODO: use diag::FunModes
550+
unsigned FunMode; // TODO: use diag::FunModes
551551
SourceLocation FuncLoc;
552552

553553
static CheckFallThroughDiagnostics MakeForFunction(const Decl *Func) {
@@ -570,45 +570,45 @@ struct CheckFallThroughDiagnostics {
570570
if (!isVirtualMethod && !isTemplateInstantiation)
571571
D.diag_NeverFallThroughOrReturn = diag::warn_suggest_noreturn_function;
572572

573-
D.funMode = diag::FunModes::Function;
573+
D.FunMode = diag::FunModes::Function;
574574
return D;
575575
}
576576

577577
static CheckFallThroughDiagnostics MakeForCoroutine(const Decl *Func) {
578578
CheckFallThroughDiagnostics D;
579579
D.FuncLoc = Func->getLocation();
580580
D.diag_FallThrough_ReturnsNonVoid = diag::warn_falloff_nonvoid;
581-
D.funMode = diag::FunModes::Coroutine;
581+
D.FunMode = diag::FunModes::Coroutine;
582582
return D;
583583
}
584584

585585
static CheckFallThroughDiagnostics MakeForBlock() {
586586
CheckFallThroughDiagnostics D;
587587
D.diag_FallThrough_HasNoReturn = diag::err_noreturn_has_return_expr;
588588
D.diag_FallThrough_ReturnsNonVoid = diag::err_falloff_nonvoid;
589-
D.funMode = diag::FunModes::Block;
589+
D.FunMode = diag::FunModes::Block;
590590
return D;
591591
}
592592

593593
static CheckFallThroughDiagnostics MakeForLambda() {
594594
CheckFallThroughDiagnostics D;
595595
D.diag_FallThrough_HasNoReturn = diag::err_noreturn_has_return_expr;
596596
D.diag_FallThrough_ReturnsNonVoid = diag::warn_falloff_nonvoid;
597-
D.funMode = diag::FunModes::Lambda;
597+
D.FunMode = diag::FunModes::Lambda;
598598
return D;
599599
}
600600

601601
bool checkDiagnostics(DiagnosticsEngine &D, bool ReturnsVoid,
602602
bool HasNoReturn) const {
603-
if (funMode == diag::FunModes::Function) {
603+
if (FunMode == diag::FunModes::Function) {
604604
return (ReturnsVoid ||
605605
D.isIgnored(diag::warn_falloff_nonvoid, FuncLoc)) &&
606606
(!HasNoReturn ||
607607
D.isIgnored(diag::warn_noreturn_has_return_expr, FuncLoc)) &&
608608
(!ReturnsVoid ||
609609
D.isIgnored(diag::warn_suggest_noreturn_block, FuncLoc));
610610
}
611-
if (funMode == diag::FunModes::Coroutine) {
611+
if (FunMode == diag::FunModes::Coroutine) {
612612
return (ReturnsVoid ||
613613
D.isIgnored(diag::warn_falloff_nonvoid, FuncLoc)) &&
614614
(!HasNoReturn);
@@ -681,15 +681,15 @@ static void CheckFallThroughForBody(Sema &S, const Decl *D, const Stmt *Body,
681681

682682
case MaybeFallThrough:
683683
if (HasNoReturn)
684-
EmitDiag(RBrace, CD.diag_FallThrough_HasNoReturn, CD.funMode);
684+
EmitDiag(RBrace, CD.diag_FallThrough_HasNoReturn, CD.FunMode);
685685
else if (!ReturnsVoid)
686-
S.Diag(RBrace, CD.diag_FallThrough_ReturnsNonVoid) << CD.funMode << 1;
686+
S.Diag(RBrace, CD.diag_FallThrough_ReturnsNonVoid) << CD.FunMode << 1;
687687
break;
688688
case AlwaysFallThrough:
689689
if (HasNoReturn)
690-
EmitDiag(RBrace, CD.diag_FallThrough_HasNoReturn, CD.funMode);
690+
EmitDiag(RBrace, CD.diag_FallThrough_HasNoReturn, CD.FunMode);
691691
else if (!ReturnsVoid)
692-
S.Diag(RBrace, CD.diag_FallThrough_ReturnsNonVoid) << CD.funMode << 0;
692+
S.Diag(RBrace, CD.diag_FallThrough_ReturnsNonVoid) << CD.FunMode << 0;
693693
break;
694694
case NeverFallThroughOrReturn:
695695
if (ReturnsVoid && !HasNoReturn && CD.diag_NeverFallThroughOrReturn) {

0 commit comments

Comments
 (0)