diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-08-17 20:36:44 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-08-17 20:36:44 +0000 |
| commit | a9ee09f4be8b073e88f573eac520dcc8550034dc (patch) | |
| tree | ee458e75afa905a9041568b9a85272f40a02d0cc /llvm/lib/Transforms | |
| parent | e41124ade18ac99f2453586dfa1de4b6973b78d7 (diff) | |
| download | bcm5719-llvm-a9ee09f4be8b073e88f573eac520dcc8550034dc.tar.gz bcm5719-llvm-a9ee09f4be8b073e88f573eac520dcc8550034dc.zip | |
Revert r137655. There is some question about whether the 'landingpad'
instruction should be marked as potentially reading and/or writing memory.
llvm-svn: 137863
Diffstat (limited to 'llvm/lib/Transforms')
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstructionCombining.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp index 47e7dd4c220..838678b9fab 100644 --- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -1418,7 +1418,8 @@ static bool TryToSinkInstruction(Instruction *I, BasicBlock *DestBlock) { assert(I->hasOneUse() && "Invariants didn't hold!"); // Cannot move control-flow-involving, volatile loads, vaarg, etc. - if (isa<PHINode>(I) || I->mayHaveSideEffects() || isa<TerminatorInst>(I)) + if (isa<PHINode>(I) || isa<LandingPadInst>(I) || I->mayHaveSideEffects() || + isa<TerminatorInst>(I)) return false; // Do not sink alloca instructions out of the entry block. |
