Reapply r188119 now that the bug it exposed is fixed.
authorPeter Collingbourne <peter@pcc.me.uk>
Mon, 12 Aug 2013 22:38:43 +0000 (22:38 +0000)
committerPeter Collingbourne <peter@pcc.me.uk>
Mon, 12 Aug 2013 22:38:43 +0000 (22:38 +0000)
commit4f96b7e1478be0b33cda589db40635a1e3a40c11
tree60caf8fc42a83aa6e752b70be30783f557383b9f
parenta90d91fd1add17b3c6af09a845ede940595098e9
Reapply r188119 now that the bug it exposed is fixed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188217 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Transforms/Scalar/SimplifyCFGPass.cpp
lib/Transforms/Utils/Local.cpp
test/Instrumentation/DataFlowSanitizer/args-unreachable-bb.ll