Merge commit '80f476973654' from apple/master into swift/master-next

Author: git apple-llvm automerger

llvm/include/llvm/ADT/BitVector.h

@@ -71,7 +71,7 @@ template <typename BitVectorT> class const_set_bits_iterator_impl {
 };
 
 class BitVector {
-  typedef unsigned long BitWord;
+  typedef uintptr_t BitWord;
 
   enum { BITWORD_SIZE = (unsigned)sizeof(BitWord) * CHAR_BIT };