From df68f032ae88bb41c9daee0217aacdbb4f91dd8f Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Fri, 24 Jun 2016 04:05:25 +0000
Subject: [PATCH] Use the same underlying type for bitfields

MSVC allocates fresh storage for consecutive bitfields with different
underlying types.

llvm-svn: 273645
---
 llvm/include/llvm/Analysis/AliasSetTracker.h     | 2 +-
 llvm/include/llvm/CodeGen/FunctionLoweringInfo.h | 2 +-
 llvm/include/llvm/MC/MCSymbol.h                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/llvm/include/llvm/Analysis/AliasSetTracker.h b/llvm/include/llvm/Analysis/AliasSetTracker.h
index 760a7640ae2f..cec56889c0ae 100644
--- a/llvm/include/llvm/Analysis/AliasSetTracker.h
+++ b/llvm/include/llvm/Analysis/AliasSetTracker.h
@@ -151,7 +151,7 @@ class AliasSet : public ilist_node<AliasSet> {
   unsigned Alias : 1;
 
   /// True if this alias set contains volatile loads or stores.
-  bool Volatile : 1;
+  unsigned Volatile : 1;
 
   void addRef() { ++RefCount; }
   void dropRef(AliasSetTracker &AST) {
diff --git a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h
index b948d0199c66..010e34179efc 100644
--- a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h
+++ b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h
@@ -171,7 +171,7 @@ public:
 
   struct LiveOutInfo {
     unsigned NumSignBits : 31;
-    bool IsValid : 1;
+    unsigned IsValid : 1;
     APInt KnownOne, KnownZero;
     LiveOutInfo() : NumSignBits(0), IsValid(true), KnownOne(1, 0),
                     KnownZero(1, 0) {}
diff --git a/llvm/include/llvm/MC/MCSymbol.h b/llvm/include/llvm/MC/MCSymbol.h
index 2c0fa083187f..23e34b7869a5 100644
--- a/llvm/include/llvm/MC/MCSymbol.h
+++ b/llvm/include/llvm/MC/MCSymbol.h
@@ -87,7 +87,7 @@ protected:
   /// IsUsed - True if this symbol has been used.
   mutable unsigned IsUsed : 1;
 
-  mutable bool IsRegistered : 1;
+  mutable unsigned IsRegistered : 1;
 
   /// This symbol is visible outside this translation unit.
   mutable unsigned IsExternal : 1;