From 636a3d618ca8217e3fc77b0e47596a9114864aed Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Sun, 19 Feb 2012 11:37:01 +0000 Subject: Remove dead code. Improve llvm_unreachable text. Simplify some control flow. llvm-svn: 150918 --- llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'llvm/lib/MC/MCDisassembler/EDDisassembler.cpp') diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp index 9edf505..ea77902 100644 --- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp @@ -104,27 +104,22 @@ EDDisassembler *EDDisassembler::getDisassembler(StringRef str, CPUKey key; key.Triple = str.str(); key.Syntax = syntax; - + EDDisassembler::DisassemblerMap_t::iterator i = sDisassemblers.find(key); - + if (i != sDisassemblers.end()) { return i->second; } - else { - EDDisassembler *sdd = new EDDisassembler(key); - if (!sdd->valid()) { - delete sdd; - return NULL; - } - - sDisassemblers[key] = sdd; - - return sdd; + + EDDisassembler *sdd = new EDDisassembler(key); + if (!sdd->valid()) { + delete sdd; + return NULL; } - - return NULL; - - return getDisassembler(Triple(str).getArch(), syntax); + + sDisassemblers[key] = sdd; + + return sdd; } EDDisassembler::EDDisassembler(CPUKey &key) : -- cgit v1.1