diff options
| author | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-22 00:43:18 +0000 |
|---|---|---|
| committer | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-22 00:43:18 +0000 |
| commit | ddf07067bc7ec9897a17352c2db23fb4d1a55db4 (patch) | |
| tree | a00e958e9c798c2539641bc3e5fe61624f194086 | |
| parent | 3e2cbf9d08ffd6f26302c19fdc7997e441c741e9 (diff) | |
| download | llvm-ddf07067bc7ec9897a17352c2db23fb4d1a55db4.tar.gz llvm-ddf07067bc7ec9897a17352c2db23fb4d1a55db4.tar.bz2 llvm-ddf07067bc7ec9897a17352c2db23fb4d1a55db4.tar.xz | |
Merging r168280: into 3.2 release branch.
Don't try to calculate the alignment of an unsigned type. Fixes PR14371!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168480 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp | 3 | ||||
| -rw-r--r-- | test/Transforms/InstCombine/alloca.ll | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp index 4ab5b6e4a0..4d106fc188 100644 --- a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp +++ b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp @@ -164,7 +164,8 @@ static unsigned getPointeeAlignment(Value *V, const DataLayout &TD) { 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; } diff --git a/test/Transforms/InstCombine/alloca.ll b/test/Transforms/InstCombine/alloca.ll index 50e03479f6..68a671cec8 100644 --- a/test/Transforms/InstCombine/alloca.ll +++ b/test/Transforms/InstCombine/alloca.ll @@ -94,3 +94,19 @@ entry: tail call void @f(i32* %b) ret void } + +; PR14371 +%opaque_type = type opaque +%real_type = type { { i32, i32* } } + +@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 |