diff options
author | Bill Wendling <isanbard@gmail.com> | 2013-12-08 00:19:49 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2013-12-08 00:19:49 +0000 |
commit | b7e206eab9de36cefa28ca79b560772d69cfa607 (patch) | |
tree | e1f695eea0c15fa96a0c977e5781e8946f689dcb | |
parent | 2bdc0dd2db145591eb3fdc01fa0b2a3d831f334b (diff) | |
download | llvm-b7e206eab9de36cefa28ca79b560772d69cfa607.tar.gz llvm-b7e206eab9de36cefa28ca79b560772d69cfa607.tar.bz2 llvm-b7e206eab9de36cefa28ca79b560772d69cfa607.tar.xz |
--- Reverse-merging r196668 into '.':
U lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
U test/Transforms/InstCombine/addrspacecast.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196705 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp | 6 | ||||
-rw-r--r-- | test/Transforms/InstCombine/addrspacecast.ll | 38 |
2 files changed, 3 insertions, 41 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp index 4c861b3fd0..0a0727e0fa 100644 --- a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp +++ b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp @@ -263,9 +263,9 @@ Instruction *InstCombiner::visitAllocaInst(AllocaInst &AI) { for (unsigned i = 0, e = ToDelete.size(); i != e; ++i) EraseInstFromFunction(*ToDelete[i]); Constant *TheSrc = cast<Constant>(Copy->getSource()); - Constant *Cast - = ConstantExpr::getPointerBitCastOrAddrSpaceCast(TheSrc, AI.getType()); - Instruction *NewI = ReplaceInstUsesWith(AI, Cast); + Instruction *NewI + = ReplaceInstUsesWith(AI, ConstantExpr::getBitCast(TheSrc, + AI.getType())); EraseInstFromFunction(*Copy); ++NumGlobalCopies; return NewI; diff --git a/test/Transforms/InstCombine/addrspacecast.ll b/test/Transforms/InstCombine/addrspacecast.ll index d908b556e1..3ddeb25b7d 100644 --- a/test/Transforms/InstCombine/addrspacecast.ll +++ b/test/Transforms/InstCombine/addrspacecast.ll @@ -2,12 +2,6 @@ target datalayout = "e-p:64:64:64-p1:32:32:32-p2:16:16:16-n8:16:32:64" - -declare void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1) nounwind -declare void @llvm.memcpy.p0i8.p1i8.i32(i8*, i8 addrspace(1)*, i32, i32, i1) nounwind -declare void @llvm.memcpy.p0i8.p2i8.i32(i8*, i8 addrspace(2)*, i32, i32, i1) nounwind - - define i32* @combine_redundant_addrspacecast(i32 addrspace(1)* %x) nounwind { ; CHECK-LABEL: @combine_redundant_addrspacecast( ; CHECK: addrspacecast i32 addrspace(1)* %x to i32* @@ -35,35 +29,3 @@ define float* @combine_redundant_addrspacecast_types(i32 addrspace(1)* %x) nounw ret float* %z } -@const_array = addrspace(2) constant [60 x i8] [i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, - i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, - i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, - i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, - i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22, i8 2, i8 9, i8 4, i8 22 ] - -declare void @foo(i8*) nounwind - -; A copy from a constant addrspacecast'ed global -; CHECK-LABEL: @memcpy_addrspacecast( -; CHECK-NOT: call void @llvm.memcpy -define i32 @memcpy_addrspacecast() nounwind { -entry: - %alloca = alloca i8, i32 48 - call void @llvm.memcpy.p0i8.p1i8.i32(i8* %alloca, i8 addrspace(1)* addrspacecast (i8 addrspace(2)* getelementptr inbounds ([60 x i8] addrspace(2)* @const_array, i16 0, i16 4) to i8 addrspace(1)*), i32 48, i32 4, i1 false) nounwind - br label %loop.body - -loop.body: - %i = phi i32 [ 0, %entry ], [ %i.inc, %loop.body ] - %sum = phi i32 [ 0, %entry ], [ %sum.inc, %loop.body] - %ptr = getelementptr i8* %alloca, i32 %i - %load = load i8* %ptr - %ext = zext i8 %load to i32 - %sum.inc = add i32 %sum, %ext - %i.inc = add i32 %i, 1 - %cmp = icmp ne i32 %i, 48 - br i1 %cmp, label %loop.body, label %end - -end: - ret i32 %sum.inc -} - |