[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 4d80408..8ebc5d2 100644
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -620,6 +620,7 @@
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 @@
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) {