diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-07-21 23:11:42 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-07-21 23:11:42 +0000 |
| commit | 72c8331ec1437f8c33fff1dac1ea0ebb11009411 (patch) | |
| tree | 158b20d33bd16f2e4beb08930321c8c47e053239 /lib/Analysis | |
| parent | 02a1364bf8ede511ad603e5aa99ea7dbf11f0609 (diff) | |
| download | external_llvm-72c8331ec1437f8c33fff1dac1ea0ebb11009411.zip external_llvm-72c8331ec1437f8c33fff1dac1ea0ebb11009411.tar.gz external_llvm-72c8331ec1437f8c33fff1dac1ea0ebb11009411.tar.bz2 | |
Treat nothrow forms of ::operator delete and ::operator delete[] as
deallocation functions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186798 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis')
| -rw-r--r-- | lib/Analysis/MemoryBuiltins.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/Analysis/MemoryBuiltins.cpp b/lib/Analysis/MemoryBuiltins.cpp index 39ec965..0f0a1c9 100644 --- a/lib/Analysis/MemoryBuiltins.cpp +++ b/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; |