Revert "CodeGen: If Convert blocks that would form a diamond when tail-merged."
authorDiana Picus <diana.picus@linaro.org>
Sun, 14 Aug 2016 02:10:18 +0000 (02:10 +0000)
committerDiana Picus <diana.picus@linaro.org>
Sun, 14 Aug 2016 02:10:18 +0000 (02:10 +0000)
commit68be1eb885dd7cc47f534d5608cb9ddff5d722c3
tree5c72a35880db33e152224a63165e7b4bd312b052
parent35ccf53e753fab6b1b0221502cd4fcee1de6a2e9
Revert "CodeGen: If Convert blocks that would form a diamond when tail-merged."

This reverts commit r278287.

This commit broke the clang-cmake-thumbv7-a15-full-sh bot.
See https://llvm.org/bugs/show_bug.cgi?id=28949

llvm-svn: 278621
llvm/lib/CodeGen/IfConversion.cpp
llvm/test/CodeGen/PowerPC/ifcvt-forked-bug-2016-08-08.ll [deleted file]
llvm/test/CodeGen/Thumb2/thumb2-ifcvt1.ll