maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

LLParser: Simplify ParseInstructionMetadata(), NFC 

Remove unused `PFS` variable and take the `Instruction` by reference.
(Not really related to PR23340, but might as well clean this up while
I'm here.)

llvm-svn: 235782
This commit is contained in:
Duncan P. N. Exon Smith 2015-04-24 21:29:36 +00:00
parent 8229145961
commit 27d702cb8b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/AsmParser/LLParser.cpp
View File

@ -1504,8 +1504,7 @@ bool LLParser::ParseMetadataAttachment(unsigned &Kind, MDNode *&MD) {
/// ParseInstructionMetadata
/// ::= !dbg !42 (',' !dbg !57)*
bool LLParser::ParseInstructionMetadata(Instruction *Inst,
PerFunctionState *PFS) {
bool LLParser::ParseInstructionMetadata(Instruction &Inst) {
do {
if (Lex.getKind() != lltok::MetadataVar)
return TokError("expected metadata after comma");
@ -1515,9 +1514,9 @@ bool LLParser::ParseInstructionMetadata(Instruction *Inst,
if (ParseMetadataAttachment(MDK, N))
return true;
Inst->setMetadata(MDK, N);
Inst.setMetadata(MDK, N);
if (MDK == LLVMContext::MD_tbaa)
InstsWithTBAATag.push_back(Inst);
InstsWithTBAATag.push_back(&Inst);
// If this is the end of the list, we're done.
} while (EatIfPresent(lltok::comma));
@ -4396,7 +4395,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
// With a normal result, we check to see if the instruction is followed by
// a comma and metadata.
if (EatIfPresent(lltok::comma))
if (ParseInstructionMetadata(Inst, &PFS))
if (ParseInstructionMetadata(*Inst))
return true;
break;
case InstExtraComma:
@ -4404,7 +4403,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
// If the instruction parser ate an extra comma at the end of it, it
// *must* be followed by metadata.
if (ParseInstructionMetadata(Inst, &PFS))
if (ParseInstructionMetadata(*Inst))
return true;
break;
}

2
llvm/lib/AsmParser/LLParser.h
View File

@ -393,7 +393,7 @@ namespace llvm {
bool ParseMDNodeTail(MDNode *&MD);
bool ParseMDNodeVector(SmallVectorImpl<Metadata *> &MDs);
bool ParseMetadataAttachment(unsigned &Kind, MDNode *&MD);
bool ParseInstructionMetadata(Instruction *Inst, PerFunctionState *PFS);
bool ParseInstructionMetadata(Instruction &Inst);
template <class FieldTy>
bool ParseMDField(LocTy Loc, StringRef Name, FieldTy &Result);