diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index d58d0046072c..095153229e64 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -132,7 +132,8 @@ public:
 
     // Calculate information about the relevant field
     const llvm::Type* Ty = CI->getType();
-    unsigned size = CGM.getTypes().getTargetData().getTypeStoreSizeInBits(Ty);
+    const llvm::TargetData &TD = CGM.getTypes().getTargetData();
+    unsigned size = TD.getTypeStoreSizeInBits(Ty);
     unsigned fieldOffset = CGM.getTypes().getLLVMFieldNo(Field) * size;
     CodeGenTypes::BitFieldInfo bitFieldInfo =
         CGM.getTypes().getBitFieldInfo(Field);
@@ -143,7 +144,12 @@ public:
     // FIXME: This won't work if the struct isn't completely packed!
     unsigned offset = 0, i = 0;
     while (offset < (fieldOffset & -8))
-      offset += CGM.getTypes().getTargetData().getTypeStoreSizeInBits(Elts[i++]->getType());
+      offset += TD.getTypeStoreSizeInBits(Elts[i++]->getType());
+
+    // Advance over 0 sized elements (must terminate in bounds since
+    // the bitfield must have a size).
+    while (TD.getTypeStoreSizeInBits(Elts[i]->getType()) == 0)
+      ++i;
 
     // Promote the size of V if necessary
     // FIXME: This should never occur, but currently it can because
diff --git a/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c b/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
new file mode 100644
index 000000000000..d8b7adcacf70
--- /dev/null
+++ b/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
@@ -0,0 +1,11 @@
+// RUN: clang --emit-llvm -o %t %s &&
+// RUN: grep "i8 52" %s | count 1
+
+struct et7 {
+  float lv7[0];
+  char mv7:6;
+} yv7 = {
+  {}, 
+  52, 
+};
+