Get rid of calls to void llvm::printSet(const ValueSet &).

Use LiveRange's iterator types and operations instead of ValueSet's.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15321 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Brian Gaeke 2004-07-29 06:43:08 +00:00
parent fb8f856f14
commit db7c40db10
2 changed files with 11 additions and 14 deletions

View File

@ -65,11 +65,9 @@ void LiveRangeInfo::unionAndUpdateLRs(LiveRange *L1, LiveRange *L2) {
assert(! (L1->hasColor() && L2->hasColor()) ||
L1->getColor() == L2->getColor());
set_union(*L1, *L2); // add elements of L2 to L1
for(ValueSet::iterator L2It = L2->begin(); L2It != L2->end(); ++L2It) {
//assert(( L1->getTypeID() == L2->getTypeID()) && "Merge:Different types");
L2->insert (L1->begin(), L1->end()); // add elements of L2 to L1
for(LiveRange::iterator L2It = L2->begin(); L2It != L2->end(); ++L2It) {
L1->insert(*L2It); // add the var in L2 to L1
LiveRangeMap[*L2It] = L1; // now the elements in L2 should map
//to L1
@ -408,7 +406,7 @@ void LiveRangeInfo::printLiveRanges() {
std::cerr << "LR# " << igNode->getIndex();
else
std::cerr << "LR# " << "<no-IGNode>";
std::cerr << "\t:Values = "; printSet(*HMI->second); std::cerr << "\n";
std::cerr << "\t:Values = " << *HMI->second << "\n";
}
}
}

View File

@ -41,10 +41,9 @@ void SparcV9IntRegClass::colorIGNode(IGNode * Node,
{
LiveRange *LR = Node->getParentLR();
if (DEBUG_RA) {
std::cerr << "\nColoring LR [CallInt=" << LR->isCallInterference() <<"]:";
printSet(*LR);
}
if (DEBUG_RA)
std::cerr << "\nColoring LR [CallInt=" << LR->isCallInterference() <<"]:"
<< *LR << "\n";
if (LR->hasSuggestedColor()) {
unsigned SugCol = LR->getSuggestedColor();
@ -61,8 +60,8 @@ void SparcV9IntRegClass::colorIGNode(IGNode * Node,
std::cerr << "\n Couldn't alloc Sug col - LR volatile & calls interf";
}
} else if (DEBUG_RA) { // can't allocate the suggested col
std::cerr << "\n Could NOT allocate the suggested color (already used) ";
printSet(*LR); std::cerr << "\n";
std::cerr << "\n Could NOT allocate the suggested color (already used) "
<< *LR << "\n";
}
}
@ -162,7 +161,7 @@ void SparcV9IntCCRegClass::colorIGNode(IGNode *Node,
#ifndef NDEBUG
// Let's just make sure values of two different types have not been
// coalesced into this LR.
for (ValueSet::const_iterator I=ccLR->begin(), E=ccLR->end(); I!=E; ++I) {
for (LiveRange::const_iterator I=ccLR->begin(), E=ccLR->end(); I!=E; ++I) {
const Type* ccType = (*I)->getType();
assert((ccReg == xcc && (isa<PointerType>(ccType)
|| ccType == Type::LongTy)) ||
@ -251,8 +250,8 @@ void SparcV9FloatRegClass::colorIGNode(IGNode * Node,
LR->setColor( LR->getSuggestedColor() );
return;
} else if (DEBUG_RA) { // can't allocate the suggested col
std::cerr << " Could NOT allocate the suggested color for LR ";
printSet(*LR); std::cerr << "\n";
std::cerr << " Could NOT allocate the suggested color for LR " << *LR
<< "\n";
}
}