forked from OSchip/llvm-project
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:
parent
b98755472e
commit
13d7e0d012
|
@ -709,15 +709,14 @@ void LiveRange::print(raw_ostream &os) const {
|
||||||
/// multiple LiveIntervals.
|
/// multiple LiveIntervals.
|
||||||
|
|
||||||
void ConnectedVNInfoEqClasses::Connect(unsigned a, unsigned b) {
|
void ConnectedVNInfoEqClasses::Connect(unsigned a, unsigned b) {
|
||||||
unsigned eqa = eqClass_[a];
|
while (eqClass_[a] != eqClass_[b]) {
|
||||||
unsigned eqb = eqClass_[b];
|
if (eqClass_[a] > eqClass_[b])
|
||||||
if (eqa == eqb)
|
std::swap(a, b);
|
||||||
return;
|
unsigned t = eqClass_[b];
|
||||||
// Make sure a and b are in the same class while maintaining eqClass_[i] <= i.
|
assert(t <= b && "Invariant broken");
|
||||||
if (eqa > eqb)
|
eqClass_[b] = eqClass_[a];
|
||||||
eqClass_[a] = eqb;
|
b = t;
|
||||||
else
|
}
|
||||||
eqClass_[b] = eqa;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned ConnectedVNInfoEqClasses::Renumber() {
|
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();
|
for (LiveInterval::const_vni_iterator I = LI->vni_begin(), E = LI->vni_end();
|
||||||
I != E; ++I) {
|
I != E; ++I) {
|
||||||
const VNInfo *VNI = *I;
|
const VNInfo *VNI = *I;
|
||||||
if (VNI->id == eqClass_.size())
|
|
||||||
eqClass_.push_back(VNI->id);
|
|
||||||
assert(!VNI->isUnused() && "Cannot handle unused values");
|
assert(!VNI->isUnused() && "Cannot handle unused values");
|
||||||
if (VNI->isPHIDef()) {
|
if (VNI->isPHIDef()) {
|
||||||
const MachineBasicBlock *MBB = lis_.getMBBFromIndex(VNI->def);
|
const MachineBasicBlock *MBB = lis_.getMBBFromIndex(VNI->def);
|
||||||
|
|
Loading…
Reference in New Issue