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

Use {} instead of make_pair and an iterator for the insertion point, NFC 

llvm-svn: 314113
This commit is contained in:
Reid Kleckner 2017-09-25 16:14:39 +00:00
parent 1fa727d615
commit 09e75c9399
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
View File

@ -717,7 +717,7 @@ ProcessSDDbgValues(SDNode *N, SelectionDAG *DAG, InstrEmitter &Emitter,
if (!Order || DVOrder == Order) {
MachineInstr *DbgMI = Emitter.EmitDbgValue(DVs[i], VRBaseMap);
if (DbgMI) {
Orders.push_back(std::make_pair(DVOrder, DbgMI));
Orders.push_back({DVOrder, DbgMI});
BB->insert(InsertPos, DbgMI);
}
DVs[i]->setIsInvalidated();
@ -742,16 +742,17 @@ ProcessSourceNode(SDNode *N, SelectionDAG *DAG, InstrEmitter &Emitter,
}
MachineBasicBlock *BB = Emitter.getBlock();
if (Emitter.getInsertPos() == BB->begin() || BB->back().isPHI() ||
auto IP = Emitter.getInsertPos();
if (IP == BB->begin() || BB->back().isPHI() ||
// Fast-isel may have inserted some instructions, in which case the
// BB->back().isPHI() test will not fire when we want it to.
std::prev(Emitter.getInsertPos())->isPHI()) {
std::prev(IP)->isPHI()) {
// Did not insert any instruction.
Orders.push_back(std::make_pair(Order, (MachineInstr*)nullptr));
Orders.push_back({Order, (MachineInstr *)nullptr});
return;
}
Orders.push_back(std::make_pair(Order, &*std::prev(Emitter.getInsertPos())));
Orders.push_back({Order, &*std::prev(IP)});
ProcessSDDbgValues(N, DAG, Emitter, Orders, VRBaseMap, Order);
}