From: Marshall Clow <mclow.lists@gmail.com>
Date: Mon, 28 Jul 2014 15:02:42 +0000 (+0000)
Subject: Fix PR#20471. Add a cast in __align_it to ensure that the bit twiddling is done at... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51510e7f4c38972b4eef7f5b943aac6d9044cb68;p=platform%2Fupstream%2Fllvm.git

Fix PR#20471. Add a cast in __align_it to ensure that the bit twiddling is done at the correct size. A better solution, IMHO, would be to declare vector<bool>::__bits_per_word as 'size_type', rather than 'unsigned', but that's a possible ABI change.

llvm-svn: 214088
---

diff --git a/libcxx/include/vector b/libcxx/include/vector
index 1e638b9..5d41bd1 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -2352,7 +2352,7 @@ private:
     void deallocate() _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
     static size_type __align_it(size_type __new_size) _NOEXCEPT
-        {return __new_size + (__bits_per_word-1) & ~(__bits_per_word-1);};
+        {return __new_size + (__bits_per_word-1) & ~((size_type)__bits_per_word-1);};
     _LIBCPP_INLINE_VISIBILITY  size_type __recommend(size_type __new_size) const;
     _LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x);
     template <class _ForwardIterator>