diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-29 12:21:32 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-29 12:21:32 +0000 |
| commit | 2c390c54f64c6303aa4f7151cda5c466ae3ccc23 (patch) | |
| tree | fa9fa288532951db4818a6c0d44a23334a8d624a /llvm/lib/Transforms/Scalar/EarlyCSE.cpp | |
| parent | c03b9b8854399aa5234fdee1eb3838ce4adccbaf (diff) | |
| download | bcm5719-llvm-2c390c54f64c6303aa4f7151cda5c466ae3ccc23.tar.gz bcm5719-llvm-2c390c54f64c6303aa4f7151cda5c466ae3ccc23.zip | |
Revert r340921 "[NFC] Unify guards detection"
This broke the build, see e.g.
http://lab.llvm.org:8011/builders/clang-cmake-armv8-lnt/builds/4626/
http://lab.llvm.org:8011/builders/clang-ppc64be-linux-lnt/builds/18647/
http://lab.llvm.org:8011/builders/clang-cmake-x86_64-avx2-linux/builds/5856/
http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/22800/
> We have multiple places in code where we try to identify whether or not
> some instruction is a guard. This patch factors out this logic into a separate
> utility function which works uniformly in all places.
>
> Differential Revision: https://reviews.llvm.org/D51152
> Reviewed By: fedor.sergeev
llvm-svn: 340923
Diffstat (limited to 'llvm/lib/Transforms/Scalar/EarlyCSE.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/EarlyCSE.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp index d24ad0327f1..533d16e088c 100644 --- a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp +++ b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp @@ -54,7 +54,6 @@ #include "llvm/Support/RecyclingAllocator.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Scalar.h" -#include "llvm/Transforms/Utils/GuardUtils.h" #include <cassert> #include <deque> #include <memory> @@ -864,7 +863,7 @@ bool EarlyCSE::processNode(DomTreeNode *Node) { continue; } - if (isGuard(Inst)) { + if (match(Inst, m_Intrinsic<Intrinsic::experimental_guard>())) { if (auto *CondI = dyn_cast<Instruction>(cast<CallInst>(Inst)->getArgOperand(0))) { if (SimpleValue::canHandle(CondI)) { |
