Remove unreachable code. (replace with llvm_unreachable to help GCC where necessary)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148284 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2012-01-17 04:43:56 +00:00
parent 21506061ef
commit fdebc38523
11 changed files with 11 additions and 15 deletions

View File

@ -61,6 +61,8 @@ static bool GetX86CpuIDAndInfo(unsigned value, unsigned *rEAX,
*rECX = registers[2]; *rECX = registers[2];
*rEDX = registers[3]; *rEDX = registers[3];
return false; return false;
#else
return true;
#endif #endif
#elif defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86) #elif defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
#if defined(__GNUC__) #if defined(__GNUC__)
@ -87,9 +89,14 @@ static bool GetX86CpuIDAndInfo(unsigned value, unsigned *rEAX,
mov dword ptr [esi],edx mov dword ptr [esi],edx
} }
return false; return false;
#endif // pedantic #else returns to appease -Wunreachable-code (so we don't generate
#endif // postprocessed code that looks like "return true; return false;")
#else
return true; return true;
#endif
#else
return true;
#endif
} }
static void DetectX86FamilyModel(unsigned EAX, unsigned &Family, static void DetectX86FamilyModel(unsigned EAX, unsigned &Family,

View File

@ -1886,7 +1886,6 @@ Depends(DependenceKind Flavor, Instruction *Inst, const Value *Arg,
} }
llvm_unreachable("Invalid dependence flavor"); llvm_unreachable("Invalid dependence flavor");
return true;
} }
/// FindDependencies - Walk up the CFG from StartPos (which is in StartBB) and /// FindDependencies - Walk up the CFG from StartPos (which is in StartBB) and

View File

@ -249,7 +249,6 @@ unsigned llvm::GetSuccessorNumber(BasicBlock *BB, BasicBlock *Succ) {
if (Term->getSuccessor(i) == Succ) if (Term->getSuccessor(i) == Succ)
return i; return i;
} }
return 0;
} }
/// SplitEdge - Split the edge connecting specified block. Pass P must /// SplitEdge - Split the edge connecting specified block. Pass P must

View File

@ -59,7 +59,6 @@ unsigned llvm::getICmpCode(const ICmpInst *ICI, bool InvertPred) {
// True -> 7 // True -> 7
default: default:
llvm_unreachable("Invalid ICmp predicate!"); llvm_unreachable("Invalid ICmp predicate!");
return 0;
} }
} }

View File

@ -458,7 +458,6 @@ struct ConstantCreator<ConstantExpr, Type, ExprMapKeyType> {
return new CompareConstantExpr(Ty, Instruction::FCmp, V.subclassdata, return new CompareConstantExpr(Ty, Instruction::FCmp, V.subclassdata,
V.operands[0], V.operands[1]); V.operands[0], V.operands[1]);
llvm_unreachable("Invalid ConstantExpr!"); llvm_unreachable("Invalid ConstantExpr!");
return 0;
} }
}; };

View File

@ -1092,8 +1092,7 @@ LLVMLinkage LLVMGetLinkage(LLVMValueRef Global) {
return LLVMCommonLinkage; return LLVMCommonLinkage;
} }
// Should never get here. llvm_unreachable("Make GCC's unreachability happy");
return static_cast<LLVMLinkage>(0);
} }
void LLVMSetLinkage(LLVMValueRef Global, LLVMLinkage Linkage) { void LLVMSetLinkage(LLVMValueRef Global, LLVMLinkage Linkage) {

View File

@ -166,8 +166,6 @@ const char *Instruction::getOpcodeName(unsigned OpCode) {
default: return "<Invalid operator> "; default: return "<Invalid operator> ";
} }
return 0;
} }
/// isIdenticalTo - Return true if the specified instruction is exactly /// isIdenticalTo - Return true if the specified instruction is exactly

View File

@ -526,6 +526,4 @@ int main(int argc, char **argv) {
case AC_EDisassemble: case AC_EDisassemble:
return DisassembleInput(argv[0], true); return DisassembleInput(argv[0], true);
} }
return 0;
} }

View File

@ -163,6 +163,4 @@ int main(int argc, char **argv) {
case AC_Execute: case AC_Execute:
return executeInput(); return executeInput();
} }
return 0;
} }

View File

@ -18,6 +18,7 @@
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include <set> #include <set>
#include <algorithm> #include <algorithm>
using namespace llvm; using namespace llvm;
@ -912,7 +913,7 @@ bool SDTypeConstraint::ApplyTypeConstraint(TreePatternNode *N,
EnforceVectorSubVectorTypeIs(NodeToApply->getExtType(ResNo), TP); EnforceVectorSubVectorTypeIs(NodeToApply->getExtType(ResNo), TP);
} }
} }
return false; llvm_unreachable("Make GCC's unreachability happy");
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//

View File

@ -102,7 +102,6 @@ static inline bool inheritsFrom(InstructionContext child,
return false; return false;
default: default:
llvm_unreachable("Unknown instruction class"); llvm_unreachable("Unknown instruction class");
return false;
} }
} }