Removing unused default switch cases in switches over enums that already account for all enumeration values explicitly.

(This time I believe I've checked all the -Wreturn-type warnings from GCC & added the couple of llvm_unreachables necessary to silence them. If I've missed any, I'll happily fix them as soon as I know about them)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148262 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2012-01-16 23:24:27 +00:00
parent 17d2dbd5f9
commit 2dd674fdce
9 changed files with 3 additions and 26 deletions

View File

@ -24,7 +24,6 @@ using namespace llvm;
const char *DwarfAccelTable::Atom::AtomTypeString(enum AtomType AT) { const char *DwarfAccelTable::Atom::AtomTypeString(enum AtomType AT) {
switch (AT) { switch (AT) {
default: llvm_unreachable("invalid AtomType!");
case eAtomTypeNULL: return "eAtomTypeNULL"; case eAtomTypeNULL: return "eAtomTypeNULL";
case eAtomTypeDIEOffset: return "eAtomTypeDIEOffset"; case eAtomTypeDIEOffset: return "eAtomTypeDIEOffset";
case eAtomTypeCUOffset: return "eAtomTypeCUOffset"; case eAtomTypeCUOffset: return "eAtomTypeCUOffset";
@ -32,6 +31,7 @@ const char *DwarfAccelTable::Atom::AtomTypeString(enum AtomType AT) {
case eAtomTypeNameFlags: return "eAtomTypeNameFlags"; case eAtomTypeNameFlags: return "eAtomTypeNameFlags";
case eAtomTypeTypeFlags: return "eAtomTypeTypeFlags"; case eAtomTypeTypeFlags: return "eAtomTypeTypeFlags";
} }
llvm_unreachable("invalid AtomType!");
} }
// The general case would need to have a less hard coded size for the // The general case would need to have a less hard coded size for the

View File

@ -292,12 +292,6 @@ static inline bool ProvideOption(Option *Handler, StringRef ArgName,
break; break;
case ValueOptional: case ValueOptional:
break; break;
default:
errs() << ProgramName
<< ": Bad ValueMask flag! CommandLine usage error:"
<< Handler->getValueExpectedFlag() << "\n";
llvm_unreachable(0);
} }
// If this isn't a multi-arg option, just run the handler. // If this isn't a multi-arg option, just run the handler.

View File

@ -244,7 +244,6 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const {
} }
switch (Kind) { switch (Kind) {
default: assert(0 && "Unknown diagnostic kind");
case SourceMgr::DK_Error: S << "error: "; break; case SourceMgr::DK_Error: S << "error: "; break;
case SourceMgr::DK_Warning: S << "warning: "; break; case SourceMgr::DK_Warning: S << "warning: "; break;
case SourceMgr::DK_Note: S << "note: "; break; case SourceMgr::DK_Note: S << "note: "; break;

View File

@ -727,7 +727,6 @@ UnOpInit *UnOpInit::get(UnaryOp opc, Init *lhs, RecTy *Type) {
Init *UnOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { Init *UnOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const {
switch (getOpcode()) { switch (getOpcode()) {
default: assert(0 && "Unknown unop");
case CAST: { case CAST: {
if (getType()->getAsString() == "string") { if (getType()->getAsString() == "string") {
StringInit *LHSs = dynamic_cast<StringInit*>(LHS); StringInit *LHSs = dynamic_cast<StringInit*>(LHS);
@ -880,7 +879,6 @@ BinOpInit *BinOpInit::get(BinaryOp opc, Init *lhs,
Init *BinOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { Init *BinOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const {
switch (getOpcode()) { switch (getOpcode()) {
default: assert(0 && "Unknown binop");
case CONCAT: { case CONCAT: {
DagInit *LHSs = dynamic_cast<DagInit*>(LHS); DagInit *LHSs = dynamic_cast<DagInit*>(LHS);
DagInit *RHSs = dynamic_cast<DagInit*>(RHS); DagInit *RHSs = dynamic_cast<DagInit*>(RHS);
@ -1129,7 +1127,6 @@ static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type,
Init *TernOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { Init *TernOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const {
switch (getOpcode()) { switch (getOpcode()) {
default: assert(0 && "Unknown binop");
case SUBST: { case SUBST: {
DefInit *LHSd = dynamic_cast<DefInit*>(LHS); DefInit *LHSd = dynamic_cast<DefInit*>(LHS);
VarInit *LHSv = dynamic_cast<VarInit*>(LHS); VarInit *LHSv = dynamic_cast<VarInit*>(LHS);

View File

@ -48,7 +48,6 @@ ARMConstantPoolValue::~ARMConstantPoolValue() {}
const char *ARMConstantPoolValue::getModifierText() const { const char *ARMConstantPoolValue::getModifierText() const {
switch (Modifier) { switch (Modifier) {
default: llvm_unreachable("Unknown modifier!");
// FIXME: Are these case sensitive? It'd be nice to lower-case all the // FIXME: Are these case sensitive? It'd be nice to lower-case all the
// strings if that's legal. // strings if that's legal.
case ARMCP::no_modifier: return "none"; case ARMCP::no_modifier: return "none";
@ -58,6 +57,7 @@ const char *ARMConstantPoolValue::getModifierText() const {
case ARMCP::GOTTPOFF: return "gottpoff"; case ARMCP::GOTTPOFF: return "gottpoff";
case ARMCP::TPOFF: return "tpoff"; case ARMCP::TPOFF: return "tpoff";
} }
llvm_unreachable("Unknown modifier!");
} }
int ARMConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP, int ARMConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP,

View File

@ -2866,8 +2866,6 @@ parseVectorList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
if (Res != MatchOperand_Success) if (Res != MatchOperand_Success)
return Res; return Res;
switch (LaneKind) { switch (LaneKind) {
default:
assert(0 && "unexpected lane kind!");
case NoLanes: case NoLanes:
E = Parser.getTok().getLoc(); E = Parser.getTok().getLoc();
Operands.push_back(ARMOperand::CreateVectorList(Reg, 1, false, S, E)); Operands.push_back(ARMOperand::CreateVectorList(Reg, 1, false, S, E));
@ -2891,8 +2889,6 @@ parseVectorList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
if (Res != MatchOperand_Success) if (Res != MatchOperand_Success)
return Res; return Res;
switch (LaneKind) { switch (LaneKind) {
default:
assert(0 && "unexpected lane kind!");
case NoLanes: case NoLanes:
E = Parser.getTok().getLoc(); E = Parser.getTok().getLoc();
Operands.push_back(ARMOperand::CreateVectorList(Reg, 2, false, S, E)); Operands.push_back(ARMOperand::CreateVectorList(Reg, 2, false, S, E));
@ -3063,8 +3059,6 @@ parseVectorList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
Parser.Lex(); // Eat '}' token. Parser.Lex(); // Eat '}' token.
switch (LaneKind) { switch (LaneKind) {
default:
assert(0 && "unexpected lane kind in register list.");
case NoLanes: case NoLanes:
Operands.push_back(ARMOperand::CreateVectorList(FirstReg, Count, Operands.push_back(ARMOperand::CreateVectorList(FirstReg, Count,
(Spacing == 2), S, E)); (Spacing == 2), S, E));

View File

@ -228,9 +228,6 @@ void MipsJITInfo::relocate(void *Function, MachineRelocation *MR,
*((unsigned*) RelocPos) |= (unsigned) ResultPtr; *((unsigned*) RelocPos) |= (unsigned) ResultPtr;
break; break;
} }
default:
llvm_unreachable("ERROR: Unknown Mips relocation.");
} }
} }
} }

View File

@ -690,12 +690,11 @@ static LLVMOpcode map_to_llvmopcode(int opcode)
static int map_from_llvmopcode(LLVMOpcode code) static int map_from_llvmopcode(LLVMOpcode code)
{ {
switch (code) { switch (code) {
default:
assert(0 && "Unhandled Opcode.");
#define HANDLE_INST(num, opc, clas) case LLVM##opc: return num; #define HANDLE_INST(num, opc, clas) case LLVM##opc: return num;
#include "llvm/Instruction.def" #include "llvm/Instruction.def"
#undef HANDLE_INST #undef HANDLE_INST
} }
llvm_unreachable("Unhandled Opcode.");
} }
/*--.. Constant expressions ................................................--*/ /*--.. Constant expressions ................................................--*/

View File

@ -178,9 +178,6 @@ namespace {
} }
break; break;
} }
default:
assert(1 && "Invalid Action");
return true;
} }
return false; return false;