$ svn merge -c 85407 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r85407 into '.':
U gcc/llvm-convert.cpp
llvm-svn: 85433
diff --git a/llvm-gcc-4.2/gcc/llvm-convert.cpp b/llvm-gcc-4.2/gcc/llvm-convert.cpp
index f6cc2a6..9935dd3 100644
--- a/llvm-gcc-4.2/gcc/llvm-convert.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-convert.cpp
@@ -7789,7 +7789,7 @@
uint64_t GCCFieldOffsetInBits = getFieldOffsetInBits(Field);
NextField = TREE_CHAIN(Field);
- uint64_t FieldSizeInBits;
+ uint64_t FieldSizeInBits = 0;
if (DECL_SIZE(Field))
FieldSizeInBits = getInt64(DECL_SIZE(Field), true);
uint64_t ValueSizeInBits = Val->getType()->getPrimitiveSizeInBits();
@@ -7818,6 +7818,7 @@
// Bitfields can only be initialized with constants (integer constant
// expressions).
assert(ValC);
+ assert(DECL_SIZE(Field));
assert(ValueSizeInBits >= FieldSizeInBits &&
"disagreement between LLVM and GCC on bitfield size");
if (ValueSizeInBits != FieldSizeInBits) {
