6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-17 21:35:07 +00:00
Code Issues Projects Releases Wiki Activity

fix PR6832: we were using the alignment of a pointer when we

Browse Source 
wanted the alignment of the pointee.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101432 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-04-16 01:05:38 +00:00
parent aa08c55e18
commit d55c1c1659
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Transforms/Scalar/ScalarReplAggregates.cpp
View File

@ -1259,7 +1259,6 @@ void SROA::RewriteMemIntrinUserOfAlloca(MemIntrinsic *MI, Instruction *Inst,
// that doesn't have anything to do with the alloca that we are promoting. For // that doesn't have anything to do with the alloca that we are promoting. For
// memset, this Value* stays null. // memset, this Value* stays null.
Value *OtherPtr = 0; Value *OtherPtr = 0;
LLVMContext &Context = MI->getContext();
unsigned MemAlignment = MI->getAlignment(); unsigned MemAlignment = MI->getAlignment();
if (MemTransferInst *MTI = dyn_cast<MemTransferInst>(MI)) { // memmove/memcopy if (MemTransferInst *MTI = dyn_cast<MemTransferInst>(MI)) { // memmove/memcopy
if (Inst == MTI->getRawDest()) if (Inst == MTI->getRawDest())
@ -1336,12 +1335,11 @@ void SROA::RewriteMemIntrinUserOfAlloca(MemIntrinsic *MI, Instruction *Inst,
MI); MI);
uint64_t EltOffset; uint64_t EltOffset;
const PointerType *OtherPtrTy = cast<PointerType>(OtherPtr->getType()); const PointerType *OtherPtrTy = cast<PointerType>(OtherPtr->getType());
if (const StructType *ST = const Type *OtherTy = OtherPtrTy->getElementType();
dyn_cast<StructType>(OtherPtrTy->getElementType())) { if (const StructType *ST = dyn_cast<StructType>(OtherTy)) {
EltOffset = TD->getStructLayout(ST)->getElementOffset(i); EltOffset = TD->getStructLayout(ST)->getElementOffset(i);
} else { } else {
const Type *EltTy = const Type *EltTy = cast<SequentialType>(OtherTy)->getElementType();
cast<SequentialType>(OtherPtr->getType())->getElementType();
EltOffset = TD->getTypeAllocSize(EltTy)*i; EltOffset = TD->getTypeAllocSize(EltTy)*i;
} }
@ -1393,7 +1391,7 @@ void SROA::RewriteMemIntrinUserOfAlloca(MemIntrinsic *MI, Instruction *Inst,
} }
// Convert the integer value to the appropriate type. // Convert the integer value to the appropriate type.
StoreVal = ConstantInt::get(Context, TotalVal); StoreVal = ConstantInt::get(CI->getContext(), TotalVal);
if (ValTy->isPointerTy()) if (ValTy->isPointerTy())
StoreVal = ConstantExpr::getIntToPtr(StoreVal, ValTy); StoreVal = ConstantExpr::getIntToPtr(StoreVal, ValTy);
else if (ValTy->isFloatingPointTy()) else if (ValTy->isFloatingPointTy())

32
test/Transforms/ScalarRepl/memcpy-align.ll Normal file
View File

@ -0,0 +1,32 @@
; PR6832
; RUN: opt %s -scalarrepl -S | FileCheck %s
target datalayout =
"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-n32"
target triple = "arm-u-u"
%0 = type { %struct.anon, %struct.anon }
%struct.anon = type { [4 x i8] }
@c = external global %0 ; <%0*> [#uses=1]
define arm_aapcscc void @good() nounwind {
entry:
%x0 = alloca %struct.anon, align 4 ; <%struct.anon*> [#uses=2]
%tmp = bitcast %struct.anon* %x0 to i8* ; <i8*> [#uses=1]
call void @llvm.memset.p0i8.i32(i8* %tmp, i8 0, i32 4, i32 4, i1 false)
%tmp1 = bitcast %struct.anon* %x0 to i8* ; <i8*> [#uses=1]
call void @llvm.memcpy.p0i8.p0i8.i32(i8* getelementptr inbounds (%0* @c, i32
0, i32 0, i32 0, i32 0), i8* %tmp1, i32 4, i32 4, i1 false)
ret void
; CHECK: store i8 0, i8*{{.*}}, align 4
; CHECK: store i8 0, i8*{{.*}}, align 1
; CHECK: store i8 0, i8*{{.*}}, align 2
; CHECK: store i8 0, i8*{{.*}}, align 1
}
declare void @llvm.memset.p0i8.i32(i8* nocapture, i8, i32, i32, i1) nounwind
declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32,
i1) nounwind