1 files changed, 2 insertions, 5 deletions
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index 2d5bd12f92..5b291d4616 100644
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -553,11 +553,8 @@ void RecordOrganizer::layoutUnionFields(const ASTRecordLayout &RL) {
 
     if (FD->isBitField()) {
       Expr *BitWidth = FD->getBitWidth();
-      llvm::APSInt FieldSize(32);
-      bool isBitField =
-        BitWidth->isIntegerConstantExpr(FieldSize, CGT.getContext());
-      assert (isBitField  && "Invalid BitField size expression");
-      uint64_t BitFieldSize =  FieldSize.getZExtValue();
+      uint64_t BitFieldSize =  
+        BitWidth->getIntegerConstantExprValue(CGT.getContext()).getZExtValue();
 
       CGT.addFieldInfo(FD, 0);
       CGT.addBitFieldInfo(FD, offset, BitFieldSize);