[llvm-commits] [llvm-gcc-4.2] r76867 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Chris Lattner]

Author: lattner
Date: Thu Jul 23 01:07:31 2009
New Revision: 76867

URL: http://llvm.org/viewvc/llvm-project?rev=76867&view=rev
Log:
Fix PR4590, an infinite loop when building the linux kernel,
patch by Nathan Keynes!

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=76867&r1=76866&r2=76867&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Thu Jul 23 01:07:31 2009
@@ -7370,6 +7370,9 @@
       PadTy = Context.getArrayType(PadTy, AlignedEltOffs-EltOffs);
     ResultElts.insert(ResultElts.begin()+i, 
                       Context.getNullValue(PadTy));
+    
+    // The padding is now element "i" and just bumped us up to "AlignedEltOffs".
+    EltOffs = AlignedEltOffs;
     ++e;  // One extra element to scan.
   }