Skip to content

Commit c21f73e

Browse files
committed
Auto merge of #39063 - ruuda:covered-switch, r=alexcrichton
Fix covered-switch-default warnings in RustWrapper These switch statements cover all possible values, so the default case is dead code (it contains an `llvm_unreachable anyway`), triggering a `-Wcovered-switch-default` warning that pollutes the build output. Moving the unreachable after the switch resolves these warnings. r? @rkruppe
2 parents 20ba64d + 004f18d commit c21f73e

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/rustllvm/RustWrapper.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,8 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) {
148148
return Attribute::ZExt;
149149
case InReg:
150150
return Attribute::InReg;
151-
default:
152-
llvm_unreachable("bad AttributeKind");
153151
}
152+
llvm_unreachable("bad AttributeKind");
154153
}
155154

156155
extern "C" void LLVMRustAddCallSiteAttribute(LLVMValueRef Instr, unsigned Index,
@@ -1233,9 +1232,8 @@ static LLVMLinkage fromRust(LLVMRustLinkage Linkage) {
12331232
return LLVMExternalWeakLinkage;
12341233
case LLVMRustLinkage::CommonLinkage:
12351234
return LLVMCommonLinkage;
1236-
default:
1237-
llvm_unreachable("Invalid LLVMRustLinkage value!");
12381235
}
1236+
llvm_unreachable("Invalid LLVMRustLinkage value!");
12391237
}
12401238

12411239
extern "C" LLVMRustLinkage LLVMRustGetLinkage(LLVMValueRef V) {
@@ -1282,10 +1280,8 @@ static LLVMRustVisibility toRust(LLVMVisibility Vis) {
12821280
return LLVMRustVisibility::Hidden;
12831281
case LLVMProtectedVisibility:
12841282
return LLVMRustVisibility::Protected;
1285-
1286-
default:
1287-
llvm_unreachable("Invalid LLVMRustVisibility value!");
12881283
}
1284+
llvm_unreachable("Invalid LLVMRustVisibility value!");
12891285
}
12901286

12911287
static LLVMVisibility fromRust(LLVMRustVisibility Vis) {
@@ -1296,10 +1292,8 @@ static LLVMVisibility fromRust(LLVMRustVisibility Vis) {
12961292
return LLVMHiddenVisibility;
12971293
case LLVMRustVisibility::Protected:
12981294
return LLVMProtectedVisibility;
1299-
1300-
default:
1301-
llvm_unreachable("Invalid LLVMRustVisibility value!");
13021295
}
1296+
llvm_unreachable("Invalid LLVMRustVisibility value!");
13031297
}
13041298

13051299
extern "C" LLVMRustVisibility LLVMRustGetVisibility(LLVMValueRef V) {

0 commit comments

Comments
 (0)