maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Re-commit 97860 with fix. getMallocAllocatedType may return null. 

llvm-svn: 98000
This commit is contained in:
Evan Cheng 2010-03-08 22:54:36 +00:00
parent ee20b5f236
commit 4f2fd2d2be
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -337,6 +337,16 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
} }
return ReplaceInstUsesWith(CI, ConstantInt::get(ReturnTy, AllocaSize)); return ReplaceInstUsesWith(CI, ConstantInt::get(ReturnTy, AllocaSize));
} }
} else if (CallInst *MI = extractMallocCall(Op1)) {
const Type* MallocType = getMallocAllocatedType(MI);
// Get alloca size.
if (MallocType && MallocType->isSized()) {
if (Value *NElems = getMallocArraySize(MI, TD, true)) {
if (ConstantInt *NElements = dyn_cast<ConstantInt>(NElems))
return ReplaceInstUsesWith(CI, ConstantInt::get(ReturnTy,
(NElements->getZExtValue() * TD->getTypeAllocSize(MallocType))));
}
}
} else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Op1)) { } else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Op1)) {
// Only handle constant GEPs here. // Only handle constant GEPs here.
if (CE->getOpcode() != Instruction::GetElementPtr) break; if (CE->getOpcode() != Instruction::GetElementPtr) break;

16
llvm/test/Transforms/InstCombine/objsize.ll
View File

@ -118,8 +118,24 @@ entry:
ret i32 0 ret i32 0
} }
@s = external global i8*
define void @test5(i32 %n) nounwind ssp {
; CHECK: @test5
entry:
%0 = tail call noalias i8* @malloc(i32 20) nounwind
%1 = tail call i32 @llvm.objectsize.i32(i8* %0, i1 false)
%2 = load i8** @s, align 8
; CHECK-NOT: @llvm.objectsize
; CHECK: @__memcpy_chk(i8* %0, i8* %1, i32 10, i32 20)
%3 = tail call i8* @__memcpy_chk(i8* %0, i8* %2, i32 10, i32 %1) nounwind
ret void
}
declare i8* @__memset_chk(i8*, i32, i64, i64) nounwind declare i8* @__memset_chk(i8*, i32, i64, i64) nounwind
declare noalias i8* @malloc(i32) nounwind
declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly
declare i64 @llvm.objectsize.i64(i8*, i1) nounwind readonly declare i64 @llvm.objectsize.i64(i8*, i1) nounwind readonly