[llvm-branch-commits] [llvm-branch] r168480 - in /llvm/branches/release_32: ./ lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp test/Transforms/InstCombine/alloca.ll

[Pawel Wodnicki]

Author: pawel
Date: Wed Nov 21 18:43:18 2012
New Revision: 168480

URL: http://llvm.org/viewvc/llvm-project?rev=168480&view=rev
Log:
Merging r168280: into 3.2 release branch.

Don't try to calculate the alignment of an unsigned type. Fixes PR14371!

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
    llvm/branches/release_32/test/Transforms/InstCombine/alloca.ll

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 21 18:43:18 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168189,168197-168198,168227,168316,168319,168346,168352,168361
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168189,168197-168198,168227,168280,168316,168319,168346,168352,168361

Modified: llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp?rev=168480&r1=168479&r2=168480&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (original)
+++ llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp Wed Nov 21 18:43:18 2012
@@ -164,7 +164,8 @@
       return TD.getPreferredAlignment(GV);
 
   if (PointerType *PT = dyn_cast<PointerType>(V->getType()))
-    return TD.getABITypeAlignment(PT->getElementType());
+    if (PT->getElementType()->isSized())
+      return TD.getABITypeAlignment(PT->getElementType());
 
   return 0;
 }

Modified: llvm/branches/release_32/test/Transforms/InstCombine/alloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/test/Transforms/InstCombine/alloca.ll?rev=168480&r1=168479&r2=168480&view=diff
==============================================================================
--- llvm/branches/release_32/test/Transforms/InstCombine/alloca.ll (original)
+++ llvm/branches/release_32/test/Transforms/InstCombine/alloca.ll Wed Nov 21 18:43:18 2012
@@ -94,3 +94,19 @@
   tail call void @f(i32* %b)
   ret void
 }
+
+; PR14371
+%opaque_type = type opaque
+%real_type = type { { i32, i32* } }
+
+ at opaque_global = external constant %opaque_type, align 4
+
+define void @test7() {
+entry:
+  %0 = alloca %real_type, align 4
+  %1 = bitcast %real_type* %0 to i8*
+  call void @llvm.memcpy.p0i8.p0i8.i32(i8* %1, i8* bitcast (%opaque_type* @opaque_global to i8*), i32 8, i32 1, i1 false)
+  ret void
+}
+
+declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind