[llvm-branch-commits] [llvm-gcc-branch] r85433 - /llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Wed Oct 28 16:04:53 2009
New Revision: 85433

URL: http://llvm.org/viewvc/llvm-project?rev=85433&view=rev
Log:
$ svn merge -c 85407 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r85407 into '.':
U    gcc/llvm-convert.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp?rev=85433&r1=85432&r2=85433&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-convert.cpp Wed Oct 28 16:04:53 2009
@@ -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) {