summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gohman <gohman@apple.com>2010-08-03 16:15:50 +0000
committerDan Gohman <gohman@apple.com>2010-08-03 16:15:50 +0000
commit35e8a6209dd1796cf1cafd3f8f3aea0fdfba0bbd (patch)
tree1fbdeb48e11960243b436a356ca8e4745de164d2
parent939c1211ccd92f263937a0f1fb4e4e9b8d07dcd2 (diff)
downloadbcm5719-llvm-35e8a6209dd1796cf1cafd3f8f3aea0fdfba0bbd.tar.gz
bcm5719-llvm-35e8a6209dd1796cf1cafd3f8f3aea0fdfba0bbd.zip
Use unary + instead of a separate local variable for working
around std::min vs static const friction. llvm-svn: 110112
-rw-r--r--llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
index 27ca345b067..52277a009d5 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ b/llvm/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);
OpenPOWER on IntegriCloud