[llvm-branch-commits] [llvm-gcc-branch] r81043 - /llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp

[Tanya Lattner]

Author: tbrethou
Date: Fri Sep  4 16:13:29 2009
New Revision: 81043

URL: http://llvm.org/viewvc/llvm-project?rev=81043&view=rev
Log:
Merge 80424 from mainline.
Fix invalid conversion

Modified:
    llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp?rev=81043&r1=81042&r2=81043&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/release_26/gcc/llvm-convert.cpp Fri Sep  4 16:13:29 2009
@@ -7130,7 +7130,7 @@
   } else if (ElTy == Type::getInt32Ty(Context)) {
     assert((Len&3) == 0 &&
            "Length in bytes should be a multiple of element size");
-    const uint32_t *InStr = (const unsigned *)TREE_STRING_POINTER(exp);
+    const uint32_t *InStr = (const uint32_t *)TREE_STRING_POINTER(exp);
     for (unsigned i = 0; i != Len/4; ++i) {
       // gcc has constructed the initializer elements in the target endianness,
       // but we're going to treat them as ordinary ints from here, with