From: Alexey Samsonov <samsonov@google.com>
Date: Thu, 29 Nov 2012 18:27:01 +0000 (+0000)
Subject: [ASan] Simplify check added in r168861. Bail out from module pass early if the module... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6f62c8da5aa4f3388cec1542309ffa623cac601;p=oota-llvm.git

[ASan] Simplify check added in r168861. Bail out from module pass early if the module is blacklisted.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168913 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index 4d8040834ed..8ebc5d25e9f 100644
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -620,6 +620,7 @@ bool AddressSanitizerModule::runOnModule(Module &M) {
   if (!TD)
     return false;
   BL.reset(new BlackList(ClBlackListFile));
+  if (BL->isIn(M)) return false;
   DynamicallyInitializedGlobals.Init(M);
   C = &(M.getContext());
   IntptrTy = Type::getIntNTy(*C, TD->getPointerSizeInBits());
@@ -870,8 +871,7 @@ bool AddressSanitizer::maybeInsertAsanInitAtFunctionEntry(Function &F) {
 static bool isNoReturnCall(CallInst *CI) {
   if (CI->doesNotReturn()) return true;
   Function *F = CI->getCalledFunction();
-  if (F && F->doesNotReturn()) return true;
-  return false;
+  return (F && F->doesNotReturn());
 }
 
 bool AddressSanitizer::runOnFunction(Function &F) {