diff options
| -rw-r--r-- | lib/CodeGen/RegAllocLocal.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-05-28-LocalRegAllocBug.ll | 30 |
2 files changed, 34 insertions, 4 deletions
diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp index 18e7656bd4..59831f0b70 100644 --- a/lib/CodeGen/RegAllocLocal.cpp +++ b/lib/CodeGen/RegAllocLocal.cpp @@ -549,10 +549,10 @@ void RALocal::AllocateBasicBlock(MachineBasicBlock &MBB) { // If this is the first basic block in the machine function, add live-in // registers as active. - if (&MBB == &*MF->begin()) { - for (MachineRegisterInfo::livein_iterator I=MF->getRegInfo().livein_begin(), - E = MF->getRegInfo().livein_end(); I != E; ++I) { - unsigned Reg = I->first; + if (&MBB == &*MF->begin() || MBB.isLandingPad()) { + for (MachineBasicBlock::livein_iterator I = MBB.livein_begin(), + E = MBB.livein_end(); I != E; ++I) { + unsigned Reg = *I; MF->getRegInfo().setPhysRegUsed(Reg); PhysRegsUsed[Reg] = 0; // It is free and reserved now AddToPhysRegsUseOrder(Reg); diff --git a/test/CodeGen/X86/2008-05-28-LocalRegAllocBug.ll b/test/CodeGen/X86/2008-05-28-LocalRegAllocBug.ll new file mode 100644 index 0000000000..02db2ed93c --- /dev/null +++ b/test/CodeGen/X86/2008-05-28-LocalRegAllocBug.ll @@ -0,0 +1,30 @@ +; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -regalloc=local + +@_ZTVN10Evaluation10GridOutputILi3EEE = external constant [5 x i32 (...)*] ; <[5 x i32 (...)*]*> [#uses=1] + +declare i8* @llvm.eh.exception() nounwind + +declare i8* @_Znwm(i32) + +declare i8* @__cxa_begin_catch(i8*) nounwind + +define i32 @main(i32 %argc, i8** %argv) { +entry: + br i1 false, label %bb37, label %bb34 + +bb34: ; preds = %entry + ret i32 1 + +bb37: ; preds = %entry + %tmp12.i.i.i.i.i66 = invoke i8* @_Znwm( i32 12 ) + to label %tmp12.i.i.i.i.i.noexc65 unwind label %lpad243 ; <i8*> [#uses=0] + +tmp12.i.i.i.i.i.noexc65: ; preds = %bb37 + unreachable + +lpad243: ; preds = %bb37 + %eh_ptr244 = call i8* @llvm.eh.exception( ) ; <i8*> [#uses=1] + store i32 (...)** getelementptr ([5 x i32 (...)*]* @_ZTVN10Evaluation10GridOutputILi3EEE, i32 0, i32 2), i32 (...)*** null, align 8 + %tmp133 = call i8* @__cxa_begin_catch( i8* %eh_ptr244 ) nounwind ; <i8*> [#uses=0] + unreachable +} |