Replace r168930 with a more reasonable patch.
authorBill Wendling <isanbard@gmail.com>
Fri, 30 Nov 2012 22:08:55 +0000 (22:08 +0000)
committerBill Wendling <isanbard@gmail.com>
Fri, 30 Nov 2012 22:08:55 +0000 (22:08 +0000)
commitc786b31233f58b8edb2909bf94a072041aae0119
tree6103c8d1363ee46143a50c80546906dab6bd8068
parent993acd0c542ab951d568534749fcc71ecb4f55e6
Replace r168930 with a more reasonable patch.

The original patch removed a bunch of code that the SjLjEHPrepare pass placed
into the entry block if all of the landing pads were removed during the
CodeGenPrepare class. The more natural way of doing things is to run the CGP
*before* we run the SjLjEHPrepare pass.

Make it so!

llvm-svn: 169044
llvm/include/llvm/CodeGen/Passes.h
llvm/lib/CodeGen/LLVMTargetMachine.cpp
llvm/lib/CodeGen/Passes.cpp
llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp