]> granicus.if.org Git - llvm/commitdiff
Merge two if conditions into one. NFCI.
authorDavide Italiano <davide@freebsd.org>
Mon, 24 Oct 2016 19:41:47 +0000 (19:41 +0000)
committerDavide Italiano <davide@freebsd.org>
Mon, 24 Oct 2016 19:41:47 +0000 (19:41 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285008 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Utils/GlobalStatus.cpp

index a5ddee3c70cbec4a29242c14371559d8f71db57e..74ebcda8355c15dcb79828a75d96638888816da1 100644 (file)
@@ -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);
 }