diff options
| author | Davide Italiano <davide@freebsd.org> | 2016-10-24 19:41:47 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@freebsd.org> | 2016-10-24 19:41:47 +0000 |
| commit | c3e0ce8f8527d340c168d7361c1c59d8df544ecb (patch) | |
| tree | 6708a865b27cecd7c7ae13d5dc33f714b50cfaa1 /llvm/lib | |
| parent | 9c39fdcedae36a5ea7079459da953c929a3edb57 (diff) | |
| download | bcm5719-llvm-c3e0ce8f8527d340c168d7361c1c59d8df544ecb.tar.gz bcm5719-llvm-c3e0ce8f8527d340c168d7361c1c59d8df544ecb.zip | |
Merge two if conditions into one. NFCI.
llvm-svn: 285008
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Transforms/Utils/GlobalStatus.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/Utils/GlobalStatus.cpp b/llvm/lib/Transforms/Utils/GlobalStatus.cpp index a5ddee3c70c..74ebcda8355 100644 --- a/llvm/lib/Transforms/Utils/GlobalStatus.cpp +++ b/llvm/lib/Transforms/Utils/GlobalStatus.cpp @@ -20,9 +20,8 @@ using namespace llvm; /// and release, then return AcquireRelease. /// static AtomicOrdering strongerOrdering(AtomicOrdering X, AtomicOrdering Y) { - if (X == AtomicOrdering::Acquire && Y == AtomicOrdering::Release) - return AtomicOrdering::AcquireRelease; - if (Y == AtomicOrdering::Acquire && X == AtomicOrdering::Release) + if ((X == AtomicOrdering::Acquire && Y == AtomicOrdering::Release) || + (Y == AtomicOrdering::Acquire && X == AtomicOrdering::Release)) return AtomicOrdering::AcquireRelease; return (AtomicOrdering)std::max((unsigned)X, (unsigned)Y); } |
