From 94c3eb8823819bc6a0e59f8a2c808976edfb43f0 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 24 Oct 2016 19:41:47 +0000 Subject: [PATCH] Merge two if conditions into one. NFCI. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285008 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/GlobalStatus.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/Utils/GlobalStatus.cpp b/lib/Transforms/Utils/GlobalStatus.cpp index a5ddee3c70c..74ebcda8355 100644 --- a/lib/Transforms/Utils/GlobalStatus.cpp +++ b/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); } -- 2.49.0