forked from OSchip/llvm-project
Make sure we correctly set LiveRegGens when a call is unscheduled. <rdar://problem/10460321>. No testcase because this is very sensitive to scheduling.
llvm-svn: 146087
This commit is contained in:
parent
b2e05cb6b1
commit
d5c173fad0
|
|
@ -146,6 +146,10 @@ private:
|
|||
/// and similar queries.
|
||||
ScheduleDAGTopologicalSort Topo;
|
||||
|
||||
// Hack to keep track of the inverse of FindCallSeqStart without more crazy
|
||||
// DAG crawling.
|
||||
DenseMap<SUnit*, SUnit*> CallSeqEndForStart;
|
||||
|
||||
public:
|
||||
ScheduleDAGRRList(MachineFunction &mf, bool needlatency,
|
||||
SchedulingPriorityQueue *availqueue,
|
||||
|
|
@ -306,6 +310,7 @@ void ScheduleDAGRRList::Schedule() {
|
|||
// to track the virtual resource of a calling sequence.
|
||||
LiveRegDefs.resize(TRI->getNumRegs() + 1, NULL);
|
||||
LiveRegGens.resize(TRI->getNumRegs() + 1, NULL);
|
||||
CallSeqEndForStart.clear();
|
||||
|
||||
// Build the scheduling graph.
|
||||
BuildSchedGraph(NULL);
|
||||
|
|
@ -524,6 +529,8 @@ void ScheduleDAGRRList::ReleasePredecessors(SUnit *SU) {
|
|||
SDNode *N = FindCallSeqStart(Node, NestLevel, MaxNest, TII);
|
||||
|
||||
SUnit *Def = &SUnits[N->getNodeId()];
|
||||
CallSeqEndForStart[Def] = SU;
|
||||
|
||||
++NumLiveRegs;
|
||||
LiveRegDefs[CallResource] = Def;
|
||||
LiveRegGens[CallResource] = SU;
|
||||
|
|
@ -790,7 +797,7 @@ void ScheduleDAGRRList::UnscheduleNodeBottomUp(SUnit *SU) {
|
|||
SUNode->getMachineOpcode() == (unsigned)TII->getCallFrameSetupOpcode()) {
|
||||
++NumLiveRegs;
|
||||
LiveRegDefs[CallResource] = SU;
|
||||
LiveRegGens[CallResource] = NULL;
|
||||
LiveRegGens[CallResource] = CallSeqEndForStart[SU];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue