diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-10-19 05:31:10 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-10-19 05:31:10 +0000 |
| commit | 8d58f2f8ead22419f0c0896cd17fb2cfdaa10641 (patch) | |
| tree | fe2822d3148a90a2961aa24b9e61a29c6f39e59b | |
| parent | 7e8cf910e4a66f2c217dc4ba7c34f1057d7a7d73 (diff) | |
| download | bcm5719-llvm-8d58f2f8ead22419f0c0896cd17fb2cfdaa10641.tar.gz bcm5719-llvm-8d58f2f8ead22419f0c0896cd17fb2cfdaa10641.zip | |
clean up after metadata changes.
llvm-svn: 84463
| -rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 14 | ||||
| -rw-r--r-- | llvm/lib/AsmParser/LLToken.h | 1 |
2 files changed, 4 insertions, 11 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index d6cda3ccf04..0c1fce9f414 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -1051,14 +1051,12 @@ bool LLParser::ParseOptionalCallingConv(CallingConv::ID &CC) { /// ::= /* empty */ /// ::= !dbg !42 bool LLParser::ParseOptionalCustomMetadata() { - - std::string Name; - if (Lex.getKind() == lltok::NamedOrCustomMD) { - Name = Lex.getStrVal(); - Lex.Lex(); - } else + if (Lex.getKind() != lltok::NamedOrCustomMD) return false; + std::string Name = Lex.getStrVal(); + Lex.Lex(); + if (Lex.getKind() != lltok::Metadata) return TokError("Expected '!' here"); Lex.Lex(); @@ -2880,8 +2878,6 @@ bool LLParser::ParseRet(Instruction *&Inst, BasicBlock *BB, if (ParseType(Ty, true /*void allowed*/)) return true; if (Ty->isVoidTy()) { - if (EatIfPresent(lltok::comma)) - if (ParseOptionalCustomMetadata()) return true; Inst = ReturnInst::Create(Context); return false; } @@ -2917,8 +2913,6 @@ bool LLParser::ParseRet(Instruction *&Inst, BasicBlock *BB, } } } - if (EatIfPresent(lltok::comma)) - if (ParseOptionalCustomMetadata()) return true; Inst = ReturnInst::Create(Context, RV); return false; diff --git a/llvm/lib/AsmParser/LLToken.h b/llvm/lib/AsmParser/LLToken.h index b3c59ee9d36..7b12a53f527 100644 --- a/llvm/lib/AsmParser/LLToken.h +++ b/llvm/lib/AsmParser/LLToken.h @@ -64,7 +64,6 @@ namespace lltok { kw_sideeffect, kw_msasm, kw_gc, - kw_dbg, kw_c, kw_cc, kw_ccc, kw_fastcc, kw_coldcc, |
