diff options
| author | Nuno Lopes <nunoplopes@sapo.pt> | 2012-05-09 15:53:34 +0000 |
|---|---|---|
| committer | Nuno Lopes <nunoplopes@sapo.pt> | 2012-05-09 15:53:34 +0000 |
| commit | 08a9ae95ba7e0a87e667f97ccc5bac646df9a705 (patch) | |
| tree | 35c153a72ba127c12aca2a8b641c0af683207375 /lib | |
| parent | 83a22ecbf52c06b4ee364f3fadcdb0abaf2dabf6 (diff) | |
update calls to objectsize intrinsic to match LLVM r156473
add a test for -fbounds-checking code generation
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156474 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 5 | ||||
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index bf180f64b3..f995614fd5 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -346,11 +346,12 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, assert(CI); uint64_t val = CI->getZExtValue(); CI = ConstantInt::get(Builder.getInt1Ty(), (val & 0x2) >> 1); + Value *Runtime = Builder.getInt32(0); // FIXME: use BoundsChecking here? Value *F = CGM.getIntrinsic(Intrinsic::objectsize, ResType); - return RValue::get(Builder.CreateCall2(F, + return RValue::get(Builder.CreateCall3(F, EmitScalarExpr(E->getArg(0)), - CI)); + CI, Runtime)); } case Builtin::BI__builtin_prefetch: { Value *Locality, *RW, *Address = EmitScalarExpr(E->getArg(0)); diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 19ee42824f..979454bdc8 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -525,8 +525,9 @@ void CodeGenFunction::EmitCheck(llvm::Value *Address, unsigned Size) { llvm::Value *F = CGM.getIntrinsic(llvm::Intrinsic::objectsize, IntPtrTy); - llvm::Value *Arg = Builder.getFalse(); - llvm::Value *C = Builder.CreateCall2(F, Address, Arg); + llvm::Value *Min = Builder.getFalse(); + llvm::Value *Runtime = Builder.getInt32(BoundsChecking); + llvm::Value *C = Builder.CreateCall3(F, Address, Min, Runtime); llvm::BasicBlock *Cont = createBasicBlock(); Builder.CreateCondBr(Builder.CreateICmpUGE(C, llvm::ConstantInt::get(IntPtrTy, Size)), |