From 817b60af38a48f9f838edcecca5f8a2172dfb287 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Fri, 30 Nov 2012 11:08:59 +0000 Subject: [PATCH] [asan] simplify the code around doesNotReturn call. It now magically works. llvm-svn: 168995 --- llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 8ebc5d2..c0690f5 100644 --- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/llvm/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); } } -- 2.7.4