Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 550c574

Browse files
adrian-prantladrian-prantl
committed
Silence a bunch of implicit fallthrough warnings
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@321115 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 24f2ba0 commit 550c574

28 files changed

+74
-69
lines changed

‎lib/AST/ASTDumper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ void ASTDumper::VisitTemplateDeclSpecialization(const SpecializationDecl *D,
15371537
case TSK_ExplicitInstantiationDefinition:
15381538
if (!DumpExplicitInst)
15391539
break;
1540-
// Fall through.
1540+
LLVM_FALLTHROUGH;
15411541
case TSK_Undeclared:
15421542
case TSK_ImplicitInstantiation:
15431543
if (DumpRefOnly)

‎lib/AST/Expr.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -3116,7 +3116,8 @@ bool Expr::HasSideEffects(const ASTContext &Ctx,
31163116
if (DCE->getTypeAsWritten()->isReferenceType() &&
31173117
DCE->getCastKind() == CK_Dynamic)
31183118
return true;
3119-
} // Fall through.
3119+
}
3120+
LLVM_FALLTHROUGH;
31203121
case ImplicitCastExprClass:
31213122
case CStyleCastExprClass:
31223123
case CXXStaticCastExprClass:

‎lib/AST/ExprCXX.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -857,15 +857,15 @@ LambdaCapture::LambdaCapture(SourceLocation Loc, bool Implicit,
857857
switch (Kind) {
858858
case LCK_StarThis:
859859
Bits |= Capture_ByCopy;
860-
// Fall through
860+
LLVM_FALLTHROUGH;
861861
case LCK_This:
862862
assert(!Var && "'this' capture cannot have a variable!");
863863
Bits |= Capture_This;
864864
break;
865865

866866
case LCK_ByCopy:
867867
Bits |= Capture_ByCopy;
868-
// Fall through
868+
LLVM_FALLTHROUGH;
869869
case LCK_ByRef:
870870
assert(Var && "capture must have a variable!");
871871
break;

‎lib/AST/ExprConstant.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -5913,7 +5913,7 @@ bool PointerExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
59135913
<< (std::string("'") + Info.Ctx.BuiltinInfo.getName(BuiltinOp) + "'");
59145914
else
59155915
Info.CCEDiag(E, diag::note_invalid_subexpr_in_const_expr);
5916-
// Fall through.
5916+
LLVM_FALLTHROUGH;
59175917
case Builtin::BI__builtin_strchr:
59185918
case Builtin::BI__builtin_wcschr:
59195919
case Builtin::BI__builtin_memchr:
@@ -5952,7 +5952,7 @@ bool PointerExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
59525952
Desired))
59535953
return ZeroInitialization(E);
59545954
StopAtNull = true;
5955-
// Fall through.
5955+
LLVM_FALLTHROUGH;
59565956
case Builtin::BImemchr:
59575957
case Builtin::BI__builtin_memchr:
59585958
case Builtin::BI__builtin_char_memchr:
@@ -5965,7 +5965,7 @@ bool PointerExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
59655965
case Builtin::BIwcschr:
59665966
case Builtin::BI__builtin_wcschr:
59675967
StopAtNull = true;
5968-
// Fall through.
5968+
LLVM_FALLTHROUGH;
59695969
case Builtin::BIwmemchr:
59705970
case Builtin::BI__builtin_wmemchr:
59715971
// wcschr and wmemchr are given a wchar_t to look for. Just use it.
@@ -7209,6 +7209,7 @@ static int EvaluateBuiltinClassifyType(const CallExpr *E,
72097209
case BuiltinType::Dependent:
72107210
llvm_unreachable("CallExpr::isBuiltinClassifyType(): unimplemented type");
72117211
};
7212+
break;
72127213

72137214
case Type::Enum:
72147215
return LangOpts.CPlusPlus ? enumeral_type_class : integer_type_class;
@@ -7821,7 +7822,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
78217822
<< (std::string("'") + Info.Ctx.BuiltinInfo.getName(BuiltinOp) + "'");
78227823
else
78237824
Info.CCEDiag(E, diag::note_invalid_subexpr_in_const_expr);
7824-
// Fall through.
7825+
LLVM_FALLTHROUGH;
78257826
case Builtin::BI__builtin_strlen:
78267827
case Builtin::BI__builtin_wcslen: {
78277828
// As an extension, we support __builtin_strlen() as a constant expression,
@@ -7881,7 +7882,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
78817882
<< (std::string("'") + Info.Ctx.BuiltinInfo.getName(BuiltinOp) + "'");
78827883
else
78837884
Info.CCEDiag(E, diag::note_invalid_subexpr_in_const_expr);
7884-
// Fall through.
7885+
LLVM_FALLTHROUGH;
78857886
case Builtin::BI__builtin_strcmp:
78867887
case Builtin::BI__builtin_wcscmp:
78877888
case Builtin::BI__builtin_strncmp:

‎lib/AST/ItaniumMangle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
14681468
if (!MD->isStatic())
14691469
Arity++;
14701470
}
1471-
// FALLTHROUGH
1471+
LLVM_FALLTHROUGH;
14721472
case DeclarationName::CXXConversionFunctionName:
14731473
case DeclarationName::CXXLiteralOperatorName:
14741474
mangleOperatorName(Name, Arity);

‎lib/AST/TypeLoc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ SourceLocation TypeLoc::getBeginLoc() const {
201201
LeftMost = Cur;
202202
break;
203203
}
204-
/* Fall through */
204+
LLVM_FALLTHROUGH;
205205
case FunctionNoProto:
206206
case ConstantArray:
207207
case DependentSizedArray:

‎lib/AST/TypePrinter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ bool TypePrinter::canPrefixQualifiers(const Type *T,
213213
case Type::VariableArray:
214214
case Type::DependentSizedArray:
215215
NeedARCStrongQualifier = true;
216-
// Fall through
216+
LLVM_FALLTHROUGH;
217217

218218
case Type::Adjusted:
219219
case Type::Decayed:

‎lib/CodeGen/CGAtomic.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
573573

574574
case AtomicExpr::AO__atomic_add_fetch:
575575
PostOp = llvm::Instruction::Add;
576-
// Fall through.
576+
LLVM_FALLTHROUGH;
577577
case AtomicExpr::AO__c11_atomic_fetch_add:
578578
case AtomicExpr::AO__opencl_atomic_fetch_add:
579579
case AtomicExpr::AO__atomic_fetch_add:
@@ -582,7 +582,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
582582

583583
case AtomicExpr::AO__atomic_sub_fetch:
584584
PostOp = llvm::Instruction::Sub;
585-
// Fall through.
585+
LLVM_FALLTHROUGH;
586586
case AtomicExpr::AO__c11_atomic_fetch_sub:
587587
case AtomicExpr::AO__opencl_atomic_fetch_sub:
588588
case AtomicExpr::AO__atomic_fetch_sub:
@@ -601,7 +601,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
601601

602602
case AtomicExpr::AO__atomic_and_fetch:
603603
PostOp = llvm::Instruction::And;
604-
// Fall through.
604+
LLVM_FALLTHROUGH;
605605
case AtomicExpr::AO__c11_atomic_fetch_and:
606606
case AtomicExpr::AO__opencl_atomic_fetch_and:
607607
case AtomicExpr::AO__atomic_fetch_and:
@@ -610,7 +610,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
610610

611611
case AtomicExpr::AO__atomic_or_fetch:
612612
PostOp = llvm::Instruction::Or;
613-
// Fall through.
613+
LLVM_FALLTHROUGH;
614614
case AtomicExpr::AO__c11_atomic_fetch_or:
615615
case AtomicExpr::AO__opencl_atomic_fetch_or:
616616
case AtomicExpr::AO__atomic_fetch_or:
@@ -619,7 +619,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
619619

620620
case AtomicExpr::AO__atomic_xor_fetch:
621621
PostOp = llvm::Instruction::Xor;
622-
// Fall through.
622+
LLVM_FALLTHROUGH;
623623
case AtomicExpr::AO__c11_atomic_fetch_xor:
624624
case AtomicExpr::AO__opencl_atomic_fetch_xor:
625625
case AtomicExpr::AO__atomic_fetch_xor:
@@ -628,7 +628,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
628628

629629
case AtomicExpr::AO__atomic_nand_fetch:
630630
PostOp = llvm::Instruction::And; // the NOT is special cased below
631-
// Fall through.
631+
LLVM_FALLTHROUGH;
632632
case AtomicExpr::AO__atomic_fetch_nand:
633633
Op = llvm::AtomicRMWInst::Nand;
634634
break;
@@ -828,7 +828,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
828828
EmitStoreOfScalar(Val1Scalar, MakeAddrLValue(Temp, Val1Ty));
829829
break;
830830
}
831-
// Fall through.
831+
LLVM_FALLTHROUGH;
832832
case AtomicExpr::AO__atomic_fetch_add:
833833
case AtomicExpr::AO__atomic_fetch_sub:
834834
case AtomicExpr::AO__atomic_add_fetch:
@@ -1035,7 +1035,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
10351035
// T __atomic_fetch_add_N(T *mem, T val, int order)
10361036
case AtomicExpr::AO__atomic_add_fetch:
10371037
PostOp = llvm::Instruction::Add;
1038-
// Fall through.
1038+
LLVM_FALLTHROUGH;
10391039
case AtomicExpr::AO__c11_atomic_fetch_add:
10401040
case AtomicExpr::AO__opencl_atomic_fetch_add:
10411041
case AtomicExpr::AO__atomic_fetch_add:
@@ -1047,7 +1047,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
10471047
// T __atomic_fetch_and_N(T *mem, T val, int order)
10481048
case AtomicExpr::AO__atomic_and_fetch:
10491049
PostOp = llvm::Instruction::And;
1050-
// Fall through.
1050+
LLVM_FALLTHROUGH;
10511051
case AtomicExpr::AO__c11_atomic_fetch_and:
10521052
case AtomicExpr::AO__opencl_atomic_fetch_and:
10531053
case AtomicExpr::AO__atomic_fetch_and:
@@ -1059,7 +1059,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
10591059
// T __atomic_fetch_or_N(T *mem, T val, int order)
10601060
case AtomicExpr::AO__atomic_or_fetch:
10611061
PostOp = llvm::Instruction::Or;
1062-
// Fall through.
1062+
LLVM_FALLTHROUGH;
10631063
case AtomicExpr::AO__c11_atomic_fetch_or:
10641064
case AtomicExpr::AO__opencl_atomic_fetch_or:
10651065
case AtomicExpr::AO__atomic_fetch_or:
@@ -1071,7 +1071,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
10711071
// T __atomic_fetch_sub_N(T *mem, T val, int order)
10721072
case AtomicExpr::AO__atomic_sub_fetch:
10731073
PostOp = llvm::Instruction::Sub;
1074-
// Fall through.
1074+
LLVM_FALLTHROUGH;
10751075
case AtomicExpr::AO__c11_atomic_fetch_sub:
10761076
case AtomicExpr::AO__opencl_atomic_fetch_sub:
10771077
case AtomicExpr::AO__atomic_fetch_sub:
@@ -1083,7 +1083,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
10831083
// T __atomic_fetch_xor_N(T *mem, T val, int order)
10841084
case AtomicExpr::AO__atomic_xor_fetch:
10851085
PostOp = llvm::Instruction::Xor;
1086-
// Fall through.
1086+
LLVM_FALLTHROUGH;
10871087
case AtomicExpr::AO__c11_atomic_fetch_xor:
10881088
case AtomicExpr::AO__opencl_atomic_fetch_xor:
10891089
case AtomicExpr::AO__atomic_fetch_xor:
@@ -1109,7 +1109,7 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
11091109
// T __atomic_fetch_nand_N(T *mem, T val, int order)
11101110
case AtomicExpr::AO__atomic_nand_fetch:
11111111
PostOp = llvm::Instruction::And; // the NOT is special cased below
1112-
// Fall through.
1112+
LLVM_FALLTHROUGH;
11131113
case AtomicExpr::AO__atomic_fetch_nand:
11141114
LibCallName = "__atomic_fetch_nand";
11151115
AddDirectArgument(*this, Args, UseOptimizedLibcall, Val1.getPointer(),

‎lib/CodeGen/CGBuiltin.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -5393,7 +5393,7 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID,
53935393
SV = llvm::ConstantDataVector::get(getLLVMContext(), Indices);
53945394
return Builder.CreateShuffleVector(Ops[1], Ld, SV, "vld1q_lane");
53955395
}
5396-
// fall through
5396+
LLVM_FALLTHROUGH;
53975397
case NEON::BI__builtin_neon_vld1_lane_v: {
53985398
Ops[1] = Builder.CreateBitCast(Ops[1], Ty);
53995399
PtrOp0 = Builder.CreateElementBitCast(PtrOp0, VTy->getElementType());
@@ -5518,7 +5518,7 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID,
55185518
return Builder.CreateCall(CGM.getIntrinsic(Intrinsic::arm_neon_vst1,
55195519
Tys), Ops);
55205520
}
5521-
// fall through
5521+
LLVM_FALLTHROUGH;
55225522
case NEON::BI__builtin_neon_vst1_lane_v: {
55235523
Ops[1] = Builder.CreateBitCast(Ops[1], Ty);
55245524
Ops[1] = Builder.CreateExtractElement(Ops[1], Ops[2]);
@@ -6011,7 +6011,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
60116011
case NEON::BI__builtin_neon_vcvts_u32_f32:
60126012
case NEON::BI__builtin_neon_vcvtd_u64_f64:
60136013
usgn = true;
6014-
// FALL THROUGH
6014+
LLVM_FALLTHROUGH;
60156015
case NEON::BI__builtin_neon_vcvts_s32_f32:
60166016
case NEON::BI__builtin_neon_vcvtd_s64_f64: {
60176017
Ops.push_back(EmitScalarExpr(E->getArg(0)));
@@ -6026,7 +6026,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
60266026
case NEON::BI__builtin_neon_vcvts_f32_u32:
60276027
case NEON::BI__builtin_neon_vcvtd_f64_u64:
60286028
usgn = true;
6029-
// FALL THROUGH
6029+
LLVM_FALLTHROUGH;
60306030
case NEON::BI__builtin_neon_vcvts_f32_s32:
60316031
case NEON::BI__builtin_neon_vcvtd_f64_s64: {
60326032
Ops.push_back(EmitScalarExpr(E->getArg(0)));
@@ -6824,7 +6824,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
68246824
case NEON::BI__builtin_neon_vaddv_u8:
68256825
// FIXME: These are handled by the AArch64 scalar code.
68266826
usgn = true;
6827-
// FALLTHROUGH
6827+
LLVM_FALLTHROUGH;
68286828
case NEON::BI__builtin_neon_vaddv_s8: {
68296829
Int = usgn ? Intrinsic::aarch64_neon_uaddv : Intrinsic::aarch64_neon_saddv;
68306830
Ty = Int32Ty;
@@ -6836,7 +6836,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
68366836
}
68376837
case NEON::BI__builtin_neon_vaddv_u16:
68386838
usgn = true;
6839-
// FALLTHROUGH
6839+
LLVM_FALLTHROUGH;
68406840
case NEON::BI__builtin_neon_vaddv_s16: {
68416841
Int = usgn ? Intrinsic::aarch64_neon_uaddv : Intrinsic::aarch64_neon_saddv;
68426842
Ty = Int32Ty;
@@ -6848,7 +6848,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
68486848
}
68496849
case NEON::BI__builtin_neon_vaddvq_u8:
68506850
usgn = true;
6851-
// FALLTHROUGH
6851+
LLVM_FALLTHROUGH;
68526852
case NEON::BI__builtin_neon_vaddvq_s8: {
68536853
Int = usgn ? Intrinsic::aarch64_neon_uaddv : Intrinsic::aarch64_neon_saddv;
68546854
Ty = Int32Ty;
@@ -6860,7 +6860,7 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID,
68606860
}
68616861
case NEON::BI__builtin_neon_vaddvq_u16:
68626862
usgn = true;
6863-
// FALLTHROUGH
6863+
LLVM_FALLTHROUGH;
68646864
case NEON::BI__builtin_neon_vaddvq_s16: {
68656865
Int = usgn ? Intrinsic::aarch64_neon_uaddv : Intrinsic::aarch64_neon_saddv;
68666866
Ty = Int32Ty;

‎lib/CodeGen/CGCall.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1929,7 +1929,7 @@ void CodeGenModule::ConstructAttributeList(
19291929
RetAttrs.addAttribute(llvm::Attribute::SExt);
19301930
else if (RetTy->hasUnsignedIntegerRepresentation())
19311931
RetAttrs.addAttribute(llvm::Attribute::ZExt);
1932-
// FALL THROUGH
1932+
LLVM_FALLTHROUGH;
19331933
case ABIArgInfo::Direct:
19341934
if (RetAI.getInReg())
19351935
RetAttrs.addAttribute(llvm::Attribute::InReg);
@@ -2014,7 +2014,7 @@ void CodeGenModule::ConstructAttributeList(
20142014
else
20152015
Attrs.addAttribute(llvm::Attribute::ZExt);
20162016
}
2017-
// FALL THROUGH
2017+
LLVM_FALLTHROUGH;
20182018
case ABIArgInfo::Direct:
20192019
if (ArgNo == 0 && FI.isChainCall())
20202020
Attrs.addAttribute(llvm::Attribute::Nest);

‎lib/CodeGen/CGException.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static const EHPersonality &getObjCPersonality(const llvm::Triple &T,
133133
case ObjCRuntime::GNUstep:
134134
if (L.ObjCRuntime.getVersion() >= VersionTuple(1, 7))
135135
return EHPersonality::GNUstep_ObjC;
136-
// fallthrough
136+
LLVM_FALLTHROUGH;
137137
case ObjCRuntime::GCC:
138138
case ObjCRuntime::ObjFW:
139139
if (L.SjLjExceptions)

‎lib/CodeGen/CGExprAgg.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) {
692692
return Visit(E->getSubExpr());
693693
}
694694

695-
// fallthrough
695+
LLVM_FALLTHROUGH;
696696

697697
case CK_NoOp:
698698
case CK_UserDefinedConversion:

‎lib/CodeGen/CGExprCXX.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ CodeGenFunction::EmitCXXConstructExpr(const CXXConstructExpr *E,
613613

614614
case CXXConstructExpr::CK_VirtualBase:
615615
ForVirtualBase = true;
616-
// fall-through
616+
LLVM_FALLTHROUGH;
617617

618618
case CXXConstructExpr::CK_NonVirtualBase:
619619
Type = Ctor_Base;

‎lib/Sema/CodeCompleteConsumer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void CodeCompletionResult::computeCursorKindAndAvailability(bool Accessible) {
562562
// Do nothing: Patterns can come with cursor kinds!
563563
break;
564564
}
565-
// Fall through
565+
LLVM_FALLTHROUGH;
566566

567567
case RK_Declaration: {
568568
// Set the availability based on attributes.

‎lib/Sema/JumpDiagnostics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S,
323323
BuildScopeInformation(Var, ParentScope);
324324
++StmtsToSkip;
325325
}
326-
// Fall through
326+
LLVM_FALLTHROUGH;
327327

328328
case Stmt::GotoStmtClass:
329329
// Remember both what scope a goto is in as well as the fact that we have

‎lib/Sema/SemaChecking.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3020,7 +3020,7 @@ ExprResult Sema::SemaAtomicOpsOverloaded(ExprResult TheCallResult,
30203020
case AtomicExpr::AO__atomic_add_fetch:
30213021
case AtomicExpr::AO__atomic_sub_fetch:
30223022
IsAddSub = true;
3023-
// Fall through.
3023+
LLVM_FALLTHROUGH;
30243024
case AtomicExpr::AO__c11_atomic_fetch_and:
30253025
case AtomicExpr::AO__c11_atomic_fetch_or:
30263026
case AtomicExpr::AO__c11_atomic_fetch_xor:
@@ -8487,7 +8487,7 @@ static IntRange GetExprRange(ASTContext &C, const Expr *E, unsigned MaxWidth) {
84878487
return IntRange(R.Width, /*NonNegative*/ true);
84888488
}
84898489
}
8490-
// fallthrough
8490+
LLVM_FALLTHROUGH;
84918491

84928492
case BO_ShlAssign:
84938493
return IntRange::forValueOfType(C, GetExprType(E));

0 commit comments

Comments
 (0)