[llvm-branch-commits] [llvm-gcc-branch] r104636 - in /llvm-gcc-4.2/branches/Apple/Hermes: ./ gcc/llvm-convert.cpp

[Jim Grosbach]

Author: grosbach
Date: Tue May 25 16:31:42 2010
New Revision: 104636

URL: http://llvm.org/viewvc/llvm-project?rev=104636&view=rev
Log:
merge 104523

Modified:
    llvm-gcc-4.2/branches/Apple/Hermes/   (props changed)
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 16:31:42 2010
@@ -1 +1,2 @@
-/llvm-gcc-4.2/trunk:100565,100624-100626,101304,102589,104420,104423
+/llvm/trunk:104523
+/llvm-gcc-4.2/trunk:100565,100624-100626,101304,102589,104420,104423,104523

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp?rev=104636&r1=104635&r2=104636&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp Tue May 25 16:31:42 2010
@@ -7093,7 +7093,7 @@
     // adjust FieldPtr so that it is close enough to the bitfield that
     // *FieldPtr contains the first needed bit.  Be careful to make sure that
     // the pointer remains appropriately aligned.
-    if (BitStart > LLVMValueBitSize) {
+    if (BitStart >= LLVMValueBitSize) {
       // In this case, we know that the alignment of the field is less than
       // the size of the field.  To get the pointer close enough, add some
       // number of alignment units to the pointer.