diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-08-09 22:08:24 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-08-09 22:08:24 +0000 |
| commit | 4238a89db8c57487a5c27b7ca60cb0fc3459df6b (patch) | |
| tree | c157323c79de277bc24e8c532f40e7192c49273b | |
| parent | 4ac1d9e16006b8582840eb03899ebd9b2127e221 (diff) | |
| download | bcm5719-llvm-4238a89db8c57487a5c27b7ca60cb0fc3459df6b.tar.gz bcm5719-llvm-4238a89db8c57487a5c27b7ca60cb0fc3459df6b.zip | |
Don't modify MO while use_iterator is still pointing to it.
llvm-svn: 161626
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Mips/swzero.ll | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp b/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp index e1d62126787..5a97c17ec85 100644 --- a/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp +++ b/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp @@ -242,13 +242,14 @@ bool MipsDAGToDAGISel::ReplaceUsesWithZeroReg(MachineRegisterInfo *MRI, // Replace uses with ZeroReg. for (MachineRegisterInfo::use_iterator U = MRI->use_begin(DstReg), - E = MRI->use_end(); U != E; ++U) { + E = MRI->use_end(); U != E;) { MachineOperand &MO = U.getOperand(); + unsigned OpNo = U.getOperandNo(); MachineInstr *MI = MO.getParent(); + ++U; // Do not replace if it is a phi's operand or is tied to def operand. - if (MI->isPHI() || MI->isRegTiedToDefOperand(U.getOperandNo()) || - MI->isPseudo()) + if (MI->isPHI() || MI->isRegTiedToDefOperand(OpNo) || MI->isPseudo()) continue; MO.setReg(ZeroReg); diff --git a/llvm/test/CodeGen/Mips/swzero.ll b/llvm/test/CodeGen/Mips/swzero.ll index 2441ca29dda..9f91a3902d7 100644 --- a/llvm/test/CodeGen/Mips/swzero.ll +++ b/llvm/test/CodeGen/Mips/swzero.ll @@ -4,6 +4,7 @@ define void @zero_u(%struct.unaligned* nocapture %p) nounwind { entry: +; CHECK: swl $zero ; CHECK: swr $zero %x = getelementptr inbounds %struct.unaligned* %p, i32 0, i32 0 store i32 0, i32* %x, align 1 |
