[llvm] r209946 - [ASan] Behave the same for functions w/o sanitize_address attribute and blacklisted functions

[Alexey Samsonov]

Author: samsonov
Date: Fri May 30 19:33:05 2014
New Revision: 209946

URL: http://llvm.org/viewvc/llvm-project?rev=209946&view=rev
Log:
[ASan] Behave the same for functions w/o sanitize_address attribute and blacklisted functions

Modified:
    llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Fri May 30 19:33:05 2014
@@ -1310,7 +1310,6 @@ bool AddressSanitizer::InjectCoverage(Fu
 }
 
 bool AddressSanitizer::runOnFunction(Function &F) {
-  if (BL->isIn(F)) return false;
   if (&F == AsanCtorFunction) return false;
   if (F.getLinkage() == GlobalValue::AvailableExternallyLinkage) return false;
   DEBUG(dbgs() << "ASAN instrumenting:\n" << F << "\n");
@@ -1319,7 +1318,7 @@ bool AddressSanitizer::runOnFunction(Fun
   // If needed, insert __asan_init before checking for SanitizeAddress attr.
   maybeInsertAsanInitAtFunctionEntry(F);
 
-  if (!F.hasFnAttribute(Attribute::SanitizeAddress))
+  if (!F.hasFnAttribute(Attribute::SanitizeAddress) || BL->isIn(F))
     return false;
 
   if (!ClDebugFunc.empty() && ClDebugFunc != F.getName())