From 70523c79260864b64c95bb2b31746eacbf2e06bd Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sun, 21 Jul 2013 23:11:42 +0000 Subject: [PATCH] Treat nothrow forms of ::operator delete and ::operator delete[] as deallocation functions. llvm-svn: 186798 --- llvm/include/llvm/Target/TargetLibraryInfo.h | 4 ++++ llvm/lib/Analysis/MemoryBuiltins.cpp | 14 +++++++++---- llvm/lib/Target/TargetLibraryInfo.cpp | 2 ++ .../Transforms/InstCombine/malloc-free-delete.ll | 24 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/llvm/include/llvm/Target/TargetLibraryInfo.h b/llvm/include/llvm/Target/TargetLibraryInfo.h index dc80e40..8c1f223 100644 --- a/llvm/include/llvm/Target/TargetLibraryInfo.h +++ b/llvm/include/llvm/Target/TargetLibraryInfo.h @@ -24,8 +24,12 @@ namespace llvm { under_IO_putc, /// void operator delete[](void*); ZdaPv, + /// void operator delete[](void*, nothrow); + ZdaPvRKSt9nothrow_t, /// void operator delete(void*); ZdlPv, + /// void operator delete(void*, nothrow); + ZdlPvRKSt9nothrow_t, /// void *new[](unsigned int); Znaj, /// void *new[](unsigned int, nothrow); diff --git a/llvm/lib/Analysis/MemoryBuiltins.cpp b/llvm/lib/Analysis/MemoryBuiltins.cpp index 39ec965..0f0a1c9 100644 --- a/llvm/lib/Analysis/MemoryBuiltins.cpp +++ b/llvm/lib/Analysis/MemoryBuiltins.cpp @@ -318,9 +318,15 @@ const CallInst *llvm::isFreeCall(const Value *I, const TargetLibraryInfo *TLI) { if (!TLI || !TLI->getLibFunc(FnName, TLIFn) || !TLI->has(TLIFn)) return 0; - if (TLIFn != LibFunc::free && - TLIFn != LibFunc::ZdlPv && // operator delete(void*) - TLIFn != LibFunc::ZdaPv) // operator delete[](void*) + unsigned ExpectedNumParams; + if (TLIFn == LibFunc::free || + TLIFn == LibFunc::ZdlPv || // operator delete(void*) + TLIFn == LibFunc::ZdaPv) // operator delete[](void*) + ExpectedNumParams = 1; + else if (TLIFn == LibFunc::ZdlPvRKSt9nothrow_t || // delete(void*, nothrow) + TLIFn == LibFunc::ZdaPvRKSt9nothrow_t) // delete[](void*, nothrow) + ExpectedNumParams = 2; + else return 0; // Check free prototype. @@ -329,7 +335,7 @@ const CallInst *llvm::isFreeCall(const Value *I, const TargetLibraryInfo *TLI) { FunctionType *FTy = Callee->getFunctionType(); if (!FTy->getReturnType()->isVoidTy()) return 0; - if (FTy->getNumParams() != 1) + if (FTy->getNumParams() != ExpectedNumParams) return 0; if (FTy->getParamType(0) != Type::getInt8PtrTy(Callee->getContext())) return 0; diff --git a/llvm/lib/Target/TargetLibraryInfo.cpp b/llvm/lib/Target/TargetLibraryInfo.cpp index 99fff59..8696b57 100644 --- a/llvm/lib/Target/TargetLibraryInfo.cpp +++ b/llvm/lib/Target/TargetLibraryInfo.cpp @@ -27,7 +27,9 @@ const char* TargetLibraryInfo::StandardNames[LibFunc::NumLibFuncs] = "_IO_getc", "_IO_putc", "_ZdaPv", + "_ZdaPvRKSt9nothrow_t", "_ZdlPv", + "_ZdlPvRKSt9nothrow_t", "_Znaj", "_ZnajRKSt9nothrow_t", "_Znam", diff --git a/llvm/test/Transforms/InstCombine/malloc-free-delete.ll b/llvm/test/Transforms/InstCombine/malloc-free-delete.ll index ba294b1..2085206 100644 --- a/llvm/test/Transforms/InstCombine/malloc-free-delete.ll +++ b/llvm/test/Transforms/InstCombine/malloc-free-delete.ll @@ -120,3 +120,27 @@ if.then: ; preds = %entry if.end: ; preds = %entry, %if.then ret void } + +declare i8* @_ZnwmRKSt9nothrow_t(i64, i8*) nobuiltin +declare void @_ZdlPvRKSt9nothrow_t(i8*, i8*) nobuiltin +declare i32 @__gxx_personality_v0(...) +declare void @_ZN1AC2Ev(i8* %this) + +; CHECK-LABEL: @test7( +define void @test7() { +entry: + %nt = alloca i8 + ; CHECK-NOT: call {{.*}}@_ZnwmRKSt9nothrow_t( + %call.i = tail call i8* @_ZnwmRKSt9nothrow_t(i64 1, i8* %nt) builtin nounwind + invoke void @_ZN1AC2Ev(i8* undef) + to label %.noexc.i unwind label %lpad.i + +.noexc.i: ; preds = %entry + unreachable + +lpad.i: ; preds = %entry + %0 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) cleanup + ; CHECK-NOT: call {{.*}}@_ZdlPvRKSt9nothrow_t( + call void @_ZdlPvRKSt9nothrow_t(i8* %call.i, i8* %nt) builtin nounwind + resume { i8*, i32 } %0 +} -- 2.7.4