From: Kostya Serebryany Date: Fri, 30 Nov 2012 11:08:59 +0000 (+0000) Subject: [asan] simplify the code around doesNotReturn call. It now magically works. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a17babb021aa9dc3441ecce1ac8a62d2b27edecb;p=oota-llvm.git [asan] simplify the code around doesNotReturn call. It now magically works. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168995 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 8ebc5d25e9f..c0690f58c60 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -867,13 +867,6 @@ bool AddressSanitizer::maybeInsertAsanInitAtFunctionEntry(Function &F) { return false; } -// Check both the call and the callee for doesNotReturn(). -static bool isNoReturnCall(CallInst *CI) { - if (CI->doesNotReturn()) return true; - Function *F = CI->getCalledFunction(); - return (F && F->doesNotReturn()); -} - bool AddressSanitizer::runOnFunction(Function &F) { if (BL->isIn(F)) return false; if (&F == AsanCtorFunction) return false; @@ -915,7 +908,7 @@ bool AddressSanitizer::runOnFunction(Function &F) { if (CallInst *CI = dyn_cast(BI)) { // A call inside BB. TempsToInstrument.clear(); - if (isNoReturnCall(CI)) { + if (CI->doesNotReturn()) { NoReturnCalls.push_back(CI); } }