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

Fix broken equivalence class calculation. We could probably also use 

EquvivalenceClasses.h except it looks like overkill when elements are continuous
integers.

llvm-svn: 117631
This commit is contained in:
Jakob Stoklund Olesen 2010-10-29 00:40:59 +00:00
parent b98755472e
commit 13d7e0d012
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/lib/CodeGen/LiveInterval.cpp
View File

@ -709,15 +709,14 @@ void LiveRange::print(raw_ostream &os) const {
/// multiple LiveIntervals.
void ConnectedVNInfoEqClasses::Connect(unsigned a, unsigned b) {
unsigned eqa = eqClass_[a];
unsigned eqb = eqClass_[b];
if (eqa == eqb)
return;
// Make sure a and b are in the same class while maintaining eqClass_[i] <= i.
if (eqa > eqb)
eqClass_[a] = eqb;
else
eqClass_[b] = eqa;
while (eqClass_[a] != eqClass_[b]) {
if (eqClass_[a] > eqClass_[b])
std::swap(a, b);
unsigned t = eqClass_[b];
assert(t <= b && "Invariant broken");
eqClass_[b] = eqClass_[a];
b = t;
}
}
unsigned ConnectedVNInfoEqClasses::Renumber() {
@ -745,8 +744,6 @@ unsigned ConnectedVNInfoEqClasses::Classify(const LiveInterval *LI) {
for (LiveInterval::const_vni_iterator I = LI->vni_begin(), E = LI->vni_end();
I != E; ++I) {
const VNInfo *VNI = *I;
if (VNI->id == eqClass_.size())
eqClass_.push_back(VNI->id);
assert(!VNI->isUnused() && "Cannot handle unused values");
if (VNI->isPHIDef()) {
const MachineBasicBlock *MBB = lis_.getMBBFromIndex(VNI->def);