aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2010-09-15 00:32:40 +0000
committerBill Wendling <isanbard@gmail.com>2010-09-15 00:32:40 +0000
commit42e23e97ba034899df01aec29080028450149743 (patch)
tree1b5c4b6a60bed5fe60946bc519844d93195cd7e7
parent68cf62a515043c1795e0ebf4c45f906a297ad2e2 (diff)
downloadllvm-42e23e97ba034899df01aec29080028450149743.zip
llvm-42e23e97ba034899df01aec29080028450149743.tar.gz
llvm-42e23e97ba034899df01aec29080028450149743.tar.bz2
$ svn merge -c 113848 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113848 into '.': U lib/CodeGen/PeepholeOptimizer.cpp must not peephole away side effects llvm-svn: 113913
-rw-r--r--llvm/lib/CodeGen/PeepholeOptimizer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/PeepholeOptimizer.cpp b/llvm/lib/CodeGen/PeepholeOptimizer.cpp
index ea14d27..17cee46 100644
--- a/llvm/lib/CodeGen/PeepholeOptimizer.cpp
+++ b/llvm/lib/CodeGen/PeepholeOptimizer.cpp
@@ -272,7 +272,8 @@ bool PeepholeOptimizer::runOnMachineFunction(MachineFunction &MF) {
MII = I->begin(), ME = I->end(); MII != ME; ) {
MachineInstr *MI = &*MII;
- if (MI->getDesc().isCompare()) {
+ if (MI->getDesc().isCompare() &&
+ !MI->getDesc().hasUnmodeledSideEffects()) {
++MII; // The iterator may become invalid if the compare is deleted.
Changed |= OptimizeCmpInstr(MI, MBB);
} else {