diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-07-30 05:42:50 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-07-30 05:42:50 +0000 |
| commit | ad088e6724246d37fe4dfb3d2ac6f19d6d5095e9 (patch) | |
| tree | 850f1069e6d26124b275e1095155b0f7357daa91 /llvm/lib/Transforms/InstCombine | |
| parent | cc427fadec4aac05751e30ce42df87d3a4a63037 (diff) | |
| download | bcm5719-llvm-ad088e6724246d37fe4dfb3d2ac6f19d6d5095e9.tar.gz bcm5719-llvm-ad088e6724246d37fe4dfb3d2ac6f19d6d5095e9.zip | |
Revert r136253, r136263, r136269, r136313, r136325, r136326, r136329, r136338,
r136339, r136341, r136369, r136387, r136392, r136396, r136429, r136430, r136444,
r136445, r136446, r136253 pending review.
llvm-svn: 136556
Diffstat (limited to 'llvm/lib/Transforms/InstCombine')
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 09edc419978..c33dec1740f 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -732,11 +732,9 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { } } - // If the stack restore is in a return, resume, or unwind block and if there - // are no allocas or calls between the restore and the return, nuke the - // restore. - if (!CannotRemove && (isa<ReturnInst>(TI) || isa<ResumeInst>(TI) || - isa<UnwindInst>(TI))) + // If the stack restore is in a return/unwind block and if there are no + // allocas or calls between the restore and the return, nuke the restore. + if (!CannotRemove && (isa<ReturnInst>(TI) || isa<UnwindInst>(TI))) return EraseInstFromFunction(CI); break; } |
