RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-12 07:21:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix an infinite recursion bug in InsertCopies.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45774 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2008-01-09 10:32:30 +00:00
parent cb7d949a19
commit 719fef648d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CodeGen/StrongPHIElimination.cpp
View File

@ -101,7 +101,7 @@ namespace {
std::vector<StrongPHIElimination::DomForestNode*>& DF, std::vector<StrongPHIElimination::DomForestNode*>& DF,
std::vector<std::pair<unsigned, unsigned> >& locals); std::vector<std::pair<unsigned, unsigned> >& locals);
void ScheduleCopies(MachineBasicBlock* MBB, std::set<unsigned>& pushed); void ScheduleCopies(MachineBasicBlock* MBB, std::set<unsigned>& pushed);
void InsertCopies(MachineBasicBlock* MBB); void InsertCopies(MachineBasicBlock* MBB, std::set<MachineBasicBlock*>& v);
}; };
char StrongPHIElimination::ID = 0; char StrongPHIElimination::ID = 0;
@ -610,7 +610,10 @@ void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB,
} }
/// InsertCopies - insert copies into MBB and all of its successors /// InsertCopies - insert copies into MBB and all of its successors
void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB) { void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB,
std::set<MachineBasicBlock*>& visited) {
visited.insert(MBB);
std::set<unsigned> pushed; std::set<unsigned> pushed;
// Rewrite register uses from Stacks // Rewrite register uses from Stacks
@ -629,7 +632,8 @@ void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB) {
for (GraphTraits<MachineBasicBlock*>::ChildIteratorType I = for (GraphTraits<MachineBasicBlock*>::ChildIteratorType I =
GraphTraits<MachineBasicBlock*>::child_begin(MBB), E = GraphTraits<MachineBasicBlock*>::child_begin(MBB), E =
GraphTraits<MachineBasicBlock*>::child_end(MBB); I != E; ++I) GraphTraits<MachineBasicBlock*>::child_end(MBB); I != E; ++I)
InsertCopies(*I); if (!visited.count(*I))
InsertCopies(*I, visited);
// As we exit this block, pop the names we pushed while processing it // As we exit this block, pop the names we pushed while processing it
for (std::set<unsigned>::iterator I = pushed.begin(), for (std::set<unsigned>::iterator I = pushed.begin(),
@ -649,7 +653,8 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) {
// Insert copies // Insert copies
// FIXME: This process should probably preserve LiveVariables // FIXME: This process should probably preserve LiveVariables
InsertCopies(Fn.begin()); std::set<MachineBasicBlock*> visited;
InsertCopies(Fn.begin(), visited);
// Perform renaming // Perform renaming
typedef std::map<unsigned, std::set<unsigned> > RenameSetType; typedef std::map<unsigned, std::set<unsigned> > RenameSetType;