[llvm-commits] [llvm] r48354 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/2008-03-13-IntToPtr.ll

[Bill Wendling]

Author: void
Date: Fri Mar 14 00:12:19 2008
New Revision: 48354

URL: http://llvm.org/viewvc/llvm-project?rev=48354&view=rev
Log:
The inst combining of inttoptr into GEP with one index was using the bit size of
the type instead of the byte size. This was causing troublesome mis-compilations.

True to form, this took 2 days to find and is a one-line fix. :-P

Added:
    llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=48354&r1=48353&r2=48354&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Fri Mar 14 00:12:19 2008
@@ -7416,7 +7416,7 @@
     // is a single-index GEP.
     if (X->getType() == CI.getType()) {
       // Get the size of the pointee type.
-      uint64_t Size = TD->getABITypeSizeInBits(DestPointee);
+      uint64_t Size = TD->getABITypeSize(DestPointee);
 
       // Convert the constant to intptr type.
       APInt Offset = Cst->getValue();

Added: llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll?rev=48354&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll (added)
+++ llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll Fri Mar 14 00:12:19 2008
@@ -0,0 +1,9 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {16} | count 1
+
+define i8* @bork(i8** %qux) {
+  %tmp275 = load i8** %qux, align 1
+  %tmp275276 = ptrtoint i8* %tmp275 to i32
+  %tmp277 = add i32 %tmp275276, 16
+  %tmp277278 = inttoptr i32 %tmp277 to i8*
+  ret i8* %tmp277278
+}