diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-09-12 23:36:42 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-09-12 23:36:42 +0000 |
| commit | 2d539691a1e4b9d61853aa99d1a5580dc88595db (patch) | |
| tree | 26b7afb71984651ebd2c05a2c8052e2b606d92c9 /lib | |
| parent | 857ad229beaaf4d5bfa1c8336516aab1df071b00 (diff) | |
| download | llvm-2d539691a1e4b9d61853aa99d1a5580dc88595db.tar.gz llvm-2d539691a1e4b9d61853aa99d1a5580dc88595db.tar.bz2 llvm-2d539691a1e4b9d61853aa99d1a5580dc88595db.tar.xz | |
Tidy up a bit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139559 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 6120a7085f..df5e0c9cde 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -1893,16 +1893,12 @@ parseRegisterList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) { const AsmToken &RegTok = Parser.getTok(); SMLoc RegLoc = RegTok.getLoc(); - if (RegTok.isNot(AsmToken::Identifier)) { - Error(RegLoc, "register expected"); - return true; - } + if (RegTok.isNot(AsmToken::Identifier)) + return Error(RegLoc, "register expected"); int RegNum = tryParseRegister(); - if (RegNum == -1) { - Error(RegLoc, "register expected"); - return true; - } + if (RegNum == -1) + return Error(RegLoc, "register expected"); if (IsRange) { int Reg = PrevRegNum; @@ -1910,9 +1906,8 @@ parseRegisterList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) { ++Reg; Registers.push_back(std::make_pair(Reg, RegLoc)); } while (Reg != RegNum); - } else { + } else Registers.push_back(std::make_pair(RegNum, RegLoc)); - } PrevRegNum = RegNum; } while (Parser.getTok().is(AsmToken::Comma) || @@ -1920,10 +1915,8 @@ parseRegisterList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) { // Process the right curly brace of the list. const AsmToken &RCurlyTok = Parser.getTok(); - if (RCurlyTok.isNot(AsmToken::RCurly)) { - Error(RCurlyTok.getLoc(), "'}' expected"); - return true; - } + if (RCurlyTok.isNot(AsmToken::RCurly)) + return Error(RCurlyTok.getLoc(), "'}' expected"); SMLoc E = RCurlyTok.getLoc(); Parser.Lex(); // Eat right curly brace token. @@ -1936,10 +1929,8 @@ parseRegisterList(SmallVectorImpl<MCParsedAsmOperand*> &Operands) { const std::pair<unsigned, SMLoc> &RegInfo = Registers[i]; unsigned Reg = getARMRegisterNumbering(RegInfo.first); - if (RegMap[Reg]) { - Error(RegInfo.second, "register duplicated in register list"); - return true; - } + if (RegMap[Reg]) + return Error(RegInfo.second, "register duplicated in register list"); if (!EmittedWarning && Reg < HighRegNum) Warning(RegInfo.second, |