diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2012-01-10 20:47:20 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2012-01-10 20:47:20 +0000 |
| commit | 233149cf069143ed0f9784700d5ced9e5bff73e9 (patch) | |
| tree | aef4a6a4e32c99f861311a048e094ae6828f8e4e /llvm/lib | |
| parent | c89aa9d96468e763c27da8668e4201e657dc2a4f (diff) | |
| download | bcm5719-llvm-233149cf069143ed0f9784700d5ced9e5bff73e9.tar.gz bcm5719-llvm-233149cf069143ed0f9784700d5ced9e5bff73e9.zip | |
Fix some leftover control reaches end of non-void function warnings.
llvm-svn: 147874
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 11 | ||||
| -rw-r--r-- | llvm/lib/Target/PTX/PTXSubtarget.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Target/Sparc/Sparc.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/Sparc/SparcInstrInfo.cpp | 1 |
4 files changed, 9 insertions, 8 deletions
diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp index 86983357336..46869dac768 100644 --- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp @@ -79,19 +79,18 @@ static int getLLVMSyntaxVariant(Triple::ArchType arch, case EDDisassembler::kEDAssemblySyntaxX86ATT: if (arch == Triple::x86 || arch == Triple::x86_64) return 0; - else - return -1; + break; case EDDisassembler::kEDAssemblySyntaxX86Intel: if (arch == Triple::x86 || arch == Triple::x86_64) return 1; - else - return -1; + break; case EDDisassembler::kEDAssemblySyntaxARMUAL: if (arch == Triple::arm || arch == Triple::thumb) return 0; - else - return -1; + break; } + + return -1; } EDDisassembler *EDDisassembler::getDisassembler(Triple::ArchType arch, diff --git a/llvm/lib/Target/PTX/PTXSubtarget.cpp b/llvm/lib/Target/PTX/PTXSubtarget.cpp index b3b6ffb5405..aa8f0525932 100644 --- a/llvm/lib/Target/PTX/PTXSubtarget.cpp +++ b/llvm/lib/Target/PTX/PTXSubtarget.cpp @@ -64,4 +64,5 @@ std::string PTXSubtarget::getPTXVersionString() const { case PTX_VERSION_2_2: return "2.2"; case PTX_VERSION_2_3: return "2.3"; } + llvm_unreachable("Invalid PTX version"); } diff --git a/llvm/lib/Target/Sparc/Sparc.h b/llvm/lib/Target/Sparc/Sparc.h index 0217c749b83..ce6ae17b6ca 100644 --- a/llvm/lib/Target/Sparc/Sparc.h +++ b/llvm/lib/Target/Sparc/Sparc.h @@ -18,7 +18,6 @@ #include "MCTargetDesc/SparcMCTargetDesc.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Target/TargetMachine.h" -#include <cassert> namespace llvm { class FunctionPass; @@ -102,7 +101,8 @@ namespace llvm { case SPCC::FCC_LE: return "le"; case SPCC::FCC_ULE: return "ule"; case SPCC::FCC_O: return "o"; - } + } + llvm_unreachable("Invalid cond code"); } } // end namespace llvm #endif diff --git a/llvm/lib/Target/Sparc/SparcInstrInfo.cpp b/llvm/lib/Target/Sparc/SparcInstrInfo.cpp index ccb6443de73..52266ffe682 100644 --- a/llvm/lib/Target/Sparc/SparcInstrInfo.cpp +++ b/llvm/lib/Target/Sparc/SparcInstrInfo.cpp @@ -109,6 +109,7 @@ static SPCC::CondCodes GetOppositeBranchCondition(SPCC::CondCodes CC) case SPCC::FCC_NE: return SPCC::FCC_E; case SPCC::FCC_E: return SPCC::FCC_NE; } + llvm_unreachable("Invalid cond code"); } MachineInstr * |
