PR16715: Fix assert in verifier: only mark call to 'operator new' as 'builtin' if

corresponding 'operator new' was actually emitted as a function marked 'nobuiltin'.

llvm-svn: 187374
This commit is contained in:
Richard Smith 2013-07-29 20:14:16 +00:00
parent e572e17a8e
commit 1235a8dac6
2 changed files with 15 additions and 2 deletions

View File

@ -1009,9 +1009,10 @@ static RValue EmitNewDeleteCall(CodeGenFunction &CGF,
const FunctionProtoType *CalleeType,
const CallArgList &Args) {
llvm::Instruction *CallOrInvoke;
llvm::Value *CalleeAddr = CGF.CGM.GetAddrOfFunction(Callee);
RValue RV =
CGF.EmitCall(CGF.CGM.getTypes().arrangeFreeFunctionCall(Args, CalleeType),
CGF.CGM.GetAddrOfFunction(Callee), ReturnValueSlot(), Args,
CalleeAddr, ReturnValueSlot(), Args,
Callee, &CallOrInvoke);
/// C++1y [expr.new]p10:
@ -1019,7 +1020,9 @@ static RValue EmitNewDeleteCall(CodeGenFunction &CGF,
/// to a replaceable global allocation function.
///
/// We model such elidable calls with the 'builtin' attribute.
if (Callee->isReplaceableGlobalAllocationFunction()) {
llvm::Function *Fn = dyn_cast<llvm::Function>(CalleeAddr);
if (Callee->isReplaceableGlobalAllocationFunction() &&
Fn && Fn->hasFnAttribute(llvm::Attribute::NoBuiltin)) {
// FIXME: Add addAttribute to CallSite.
if (llvm::CallInst *CI = dyn_cast<llvm::CallInst>(CallOrInvoke))
CI->addAttribute(llvm::AttributeSet::FunctionIndex,

View File

@ -0,0 +1,10 @@
// RUN: %clang_cc1 -emit-llvm -triple x86_64-linux-gnu -std=c++11 -o - %s | FileCheck %s
using size_t = decltype(sizeof(0));
// CHECK: @_Znwm = alias i8* (i64)* @something
void *operator new(size_t) __attribute__((alias("something")));
// PR16715: don't assert here.
// CHECK: call noalias i8* @_Znwm(i64 4){{$}}
int *pr16715 = new int;