[cfe-commits] r71194 - in /cfe/trunk: lib/CodeGen/CGExprConstant.cpp test/CodeGen/bitfield-init.c

[Eli Friedman]

Author: efriedma
Date: Thu May  7 18:42:42 2009
New Revision: 71194

URL: http://llvm.org/viewvc/llvm-project?rev=71194&view=rev
Log:
Fix crash with constant initialization of bit-fields in unions.


Modified:
    cfe/trunk/lib/CodeGen/CGExprConstant.cpp
    cfe/trunk/test/CodeGen/bitfield-init.c

Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=71194&r1=71193&r2=71194&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Thu May  7 18:42:42 2009
@@ -275,7 +275,7 @@
 
     if (curField->isBitField()) {
       // Create a dummy struct for bit-field insertion
-      unsigned NumElts = CGM.getTargetData().getTypePaddedSize(Ty) / 8;
+      unsigned NumElts = CGM.getTargetData().getTypePaddedSize(Ty);
       llvm::Constant* NV = llvm::Constant::getNullValue(llvm::Type::Int8Ty);
       std::vector<llvm::Constant*> Elts(NumElts, NV);
 

Modified: cfe/trunk/test/CodeGen/bitfield-init.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/bitfield-init.c?rev=71194&r1=71193&r2=71194&view=diff

==============================================================================
--- cfe/trunk/test/CodeGen/bitfield-init.c (original)
+++ cfe/trunk/test/CodeGen/bitfield-init.c Thu May  7 18:42:42 2009
@@ -10,3 +10,5 @@
   struct Token one = { 1 };
 }
 
+typedef union T0 { char field0 : 2; } T0;
+T0 T0_values = { 0 };