From: Dan Gohman <gohman@apple.com>
Date: Tue, 3 Aug 2010 16:15:50 +0000 (+0000)
Subject: Use unary + instead of a separate local variable for working
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=795e70e4319bb38eb92701c2a463eeb7584a9b25;p=oota-llvm.git

Use unary + instead of a separate local variable for working
around std::min vs static const friction.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110112 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp
index 27ca345b067..52277a009d5 100644
--- a/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -109,10 +109,9 @@ unsigned InstCombiner::GetOrEnforceKnownAlignment(Value *V,
   TrailZ = std::min(TrailZ, unsigned(sizeof(unsigned) * CHAR_BIT - 1));
 
   unsigned Align = 1u << std::min(BitWidth - 1, TrailZ);
-  unsigned MaxAlign = Value::MaximumAlignment;
 
   // LLVM doesn't support alignments larger than this currently.
-  Align = std::min(Align, MaxAlign);
+  Align = std::min(Align, +Value::MaximumAlignment);
 
   if (PrefAlign > Align)
     Align = EnforceKnownAlignment(V, Align, PrefAlign);