1 files changed, 7 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index fe11a5fb0a..813bcfb855 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -145,6 +145,13 @@ public:
     while (offset < (fieldOffset & -8))
       offset += CGM.getTypes().getTargetData().getTypeStoreSizeInBits(Elts[i++]->getType());
 
+    // Promote the size of V if necessary
+    // FIXME: This should never occur, but currently it can because
+    // initializer constants are cast to bool, and because clang is
+    // not enforcing bitfield width limits.
+    if (bitFieldInfo.Size > V.getBitWidth())
+      V.zext(bitFieldInfo.Size);
+
     // Insert the bits into the struct
     // FIXME: This algorthm is only correct on X86!
     // FIXME: THis algorthm assumes bit-fields only have byte-size elements!