replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MIR Parser: Extract the code that parses MBB references into a new method. NFC. 

This commit extracts the code that's used by the class 'MIRParserImpl' to parse
the machine basic block references into a new method named 'parseMBBReference'.

llvm-svn: 243572
This commit is contained in:
Alex Lorenz 2015-07-29 20:57:11 +00:00
parent 9b950d8148
commit 05fa73b2db
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/lib/CodeGen/MIRParser/MIRParser.cpp
View File

@ -127,6 +127,10 @@ public:
PerFunctionMIParsingState &PFS);
private:
bool parseMBBReference(MachineBasicBlock *&MBB,
const yaml::StringValue &Source, MachineFunction &MF,
const PerFunctionMIParsingState &PFS);
/// Return a MIR diagnostic converted from an MI string diagnostic.
SMDiagnostic diagFromMIStringDiag(const SMDiagnostic &Error,
SMRange SourceRange);
@ -352,9 +356,8 @@ bool MIRParserImpl::initializeMachineBasicBlock(
// Parse the successors.
for (const auto &MBBSource : YamlMBB.Successors) {
MachineBasicBlock *SuccMBB = nullptr;
if (parseMBBReference(SuccMBB, SM, MF, MBBSource.Value, PFS, IRSlots,
Error))
return error(Error, MBBSource.SourceRange);
if (parseMBBReference(SuccMBB, MBBSource, MF, PFS))
return true;
// TODO: Report an error when adding the same successor more than once.
MBB.addSuccessor(SuccMBB);
}
@ -544,8 +547,8 @@ bool MIRParserImpl::initializeJumpTableInfo(
std::vector<MachineBasicBlock *> Blocks;
for (const auto &MBBSource : Entry.Blocks) {
MachineBasicBlock *MBB = nullptr;
if (parseMBBReference(MBB, SM, MF, MBBSource.Value, PFS, IRSlots, Error))
return error(Error, MBBSource.SourceRange);
if (parseMBBReference(MBB, MBBSource.Value, MF, PFS))
return true;
Blocks.push_back(MBB);
}
unsigned Index = JTI->createJumpTableIndex(Blocks);
@ -555,6 +558,16 @@ bool MIRParserImpl::initializeJumpTableInfo(
return false;
}
bool MIRParserImpl::parseMBBReference(MachineBasicBlock *&MBB,
const yaml::StringValue &Source,
MachineFunction &MF,
const PerFunctionMIParsingState &PFS) {
SMDiagnostic Error;
if (llvm::parseMBBReference(MBB, SM, MF, Source.Value, PFS, IRSlots, Error))
return error(Error, Source.SourceRange);
return false;
}
SMDiagnostic MIRParserImpl::diagFromMIStringDiag(const SMDiagnostic &Error,
SMRange SourceRange) {
assert(SourceRange.isValid() && "Invalid source range");