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

Revert r168630, r168631, and r168633 as these are causing nightly test failures. 

llvm-svn: 168751
This commit is contained in:
Chad Rosier 2012-11-28 00:21:29 +00:00
parent 93a39dfdf3
commit ed119d542b
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/CodeGen/MachineRegisterInfo.cpp
View File

@ -305,8 +305,6 @@ void MachineRegisterInfo::dumpUses(unsigned Reg) const {
#endif #endif
void MachineRegisterInfo::freezeReservedRegs(const MachineFunction &MF) { void MachineRegisterInfo::freezeReservedRegs(const MachineFunction &MF) {
assert (!reservedRegsFrozen() &&
"freezeReservedRegs should only be called once!");
ReservedRegs = TRI->getReservedRegs(MF); ReservedRegs = TRI->getReservedRegs(MF);
assert(ReservedRegs.size() == TRI->getNumRegs() && assert(ReservedRegs.size() == TRI->getNumRegs() &&
"Invalid ReservedRegs vector from target"); "Invalid ReservedRegs vector from target");

1
llvm/lib/CodeGen/RegAllocBase.cpp
View File

@ -58,6 +58,7 @@ void RegAllocBase::init(VirtRegMap &vrm,
VRM = &vrm; VRM = &vrm;
LIS = &lis; LIS = &lis;
Matrix = &mat; Matrix = &mat;
MRI->freezeReservedRegs(vrm.getMachineFunction());
RegClassInfo.runOnMachineFunction(vrm.getMachineFunction()); RegClassInfo.runOnMachineFunction(vrm.getMachineFunction());
} }

1
llvm/lib/CodeGen/RegAllocFast.cpp
View File

@ -1127,6 +1127,7 @@ bool RAFast::runOnMachineFunction(MachineFunction &Fn) {
TM = &Fn.getTarget(); TM = &Fn.getTarget();
TRI = TM->getRegisterInfo(); TRI = TM->getRegisterInfo();
TII = TM->getInstrInfo(); TII = TM->getInstrInfo();
MRI->freezeReservedRegs(Fn);
RegClassInfo.runOnMachineFunction(Fn); RegClassInfo.runOnMachineFunction(Fn);
UsedInInstr.clear(); UsedInInstr.clear();
UsedInInstr.setUniverse(TRI->getNumRegs()); UsedInInstr.setUniverse(TRI->getNumRegs());

2
llvm/lib/CodeGen/RegAllocPBQP.cpp
View File

@ -552,6 +552,8 @@ bool RegAllocPBQP::runOnMachineFunction(MachineFunction &MF) {
vrm = &getAnalysis<VirtRegMap>(); vrm = &getAnalysis<VirtRegMap>();
spiller.reset(createInlineSpiller(*this, MF, *vrm)); spiller.reset(createInlineSpiller(*this, MF, *vrm));
mri->freezeReservedRegs(MF);
DEBUG(dbgs() << "PBQP Register Allocating for " << mf->getName() << "\n"); DEBUG(dbgs() << "PBQP Register Allocating for " << mf->getName() << "\n");
// Allocator main loop: // Allocator main loop: