From b5b86d263a651566cb25c0f406f75ceffb771029 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Fri, 24 Aug 2012 16:44:47 +0000 Subject: [PATCH] [asan/tsan] rename FunctionBlackList* to BlackList* as this class is not limited to functions any more git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162566 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Instrumentation/AddressSanitizer.cpp | 6 +++--- .../{FunctionBlackList.cpp => BlackList.cpp} | 14 +++++++------- .../{FunctionBlackList.h => BlackList.h} | 6 +++--- lib/Transforms/Instrumentation/CMakeLists.txt | 2 +- lib/Transforms/Instrumentation/ThreadSanitizer.cpp | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) rename lib/Transforms/Instrumentation/{FunctionBlackList.cpp => BlackList.cpp} (88%) rename lib/Transforms/Instrumentation/{FunctionBlackList.h => BlackList.h} (92%) diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 06f4d2fedd6..2f0b015dc9a 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -15,7 +15,7 @@ #define DEBUG_TYPE "asan" -#include "FunctionBlackList.h" +#include "BlackList.h" #include "llvm/Function.h" #include "llvm/IRBuilder.h" #include "llvm/InlineAsm.h" @@ -217,7 +217,7 @@ struct AddressSanitizer : public ModulePass { Function *AsanCtorFunction; Function *AsanInitFunction; Instruction *CtorInsertBefore; - OwningPtr BL; + OwningPtr BL; // This array is indexed by AccessIsWrite and log2(AccessSize). Function *AsanErrorCallback[2][kNumberOfAccessSizes]; InlineAsm *EmptyAsm; @@ -736,7 +736,7 @@ bool AddressSanitizer::runOnModule(Module &M) { TD = getAnalysisIfAvailable(); if (!TD) return false; - BL.reset(new FunctionBlackList(ClBlackListFile)); + BL.reset(new BlackList(ClBlackListFile)); C = &(M.getContext()); LongSize = TD->getPointerSizeInBits(); diff --git a/lib/Transforms/Instrumentation/FunctionBlackList.cpp b/lib/Transforms/Instrumentation/BlackList.cpp similarity index 88% rename from lib/Transforms/Instrumentation/FunctionBlackList.cpp rename to lib/Transforms/Instrumentation/BlackList.cpp index b6f6060f399..ecfe954dec1 100644 --- a/lib/Transforms/Instrumentation/FunctionBlackList.cpp +++ b/lib/Transforms/Instrumentation/BlackList.cpp @@ -1,4 +1,4 @@ -//===-- FunctionBlackList.cpp - blacklist for sanitizers -----------------===// +//===-- BlackList.cpp - blacklist for sanitizers --------------------------===// // // The LLVM Compiler Infrastructure // @@ -16,7 +16,7 @@ #include #include -#include "FunctionBlackList.h" +#include "BlackList.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" @@ -30,7 +30,7 @@ namespace llvm { -FunctionBlackList::FunctionBlackList(const StringRef Path) { +BlackList::BlackList(const StringRef Path) { // Validate and open blacklist file. if (!Path.size()) return; OwningPtr File; @@ -77,19 +77,19 @@ FunctionBlackList::FunctionBlackList(const StringRef Path) { } } -bool FunctionBlackList::isIn(const Function &F) { +bool BlackList::isIn(const Function &F) { return isIn(*F.getParent()) || inSection("fun", F.getName()); } -bool FunctionBlackList::isIn(const GlobalVariable &G) { +bool BlackList::isIn(const GlobalVariable &G) { return isIn(*G.getParent()) || inSection("global", G.getName()); } -bool FunctionBlackList::isIn(const Module &M) { +bool BlackList::isIn(const Module &M) { return inSection("src", M.getModuleIdentifier()); } -bool FunctionBlackList::inSection(const StringRef Section, +bool BlackList::inSection(const StringRef Section, const StringRef Query) { Regex *FunctionRegex = Entries[Section]; return FunctionRegex ? FunctionRegex->match(Query) : false; diff --git a/lib/Transforms/Instrumentation/FunctionBlackList.h b/lib/Transforms/Instrumentation/BlackList.h similarity index 92% rename from lib/Transforms/Instrumentation/FunctionBlackList.h rename to lib/Transforms/Instrumentation/BlackList.h index 52f2dbd4f61..e303dbcd961 100644 --- a/lib/Transforms/Instrumentation/FunctionBlackList.h +++ b/lib/Transforms/Instrumentation/BlackList.h @@ -1,4 +1,4 @@ -//===-- FunctionBlackList.h - blacklist for sanitizers ----------*- C++ -*-===// +//===-- BlackList.h - blacklist for sanitizers ------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -34,9 +34,9 @@ class Module; class Regex; class StringRef; -class FunctionBlackList { +class BlackList { public: - FunctionBlackList(const StringRef Path); + BlackList(const StringRef Path); // Returns whether either this function or it's source file are blacklisted. bool isIn(const Function &F); // Returns whether either this global or it's source file are blacklisted. diff --git a/lib/Transforms/Instrumentation/CMakeLists.txt b/lib/Transforms/Instrumentation/CMakeLists.txt index 00de882f171..058f68c7cec 100644 --- a/lib/Transforms/Instrumentation/CMakeLists.txt +++ b/lib/Transforms/Instrumentation/CMakeLists.txt @@ -1,8 +1,8 @@ add_llvm_library(LLVMInstrumentation AddressSanitizer.cpp + BlackList.cpp BoundsChecking.cpp EdgeProfiling.cpp - FunctionBlackList.cpp GCOVProfiling.cpp Instrumentation.cpp OptimalEdgeProfiling.cpp diff --git a/lib/Transforms/Instrumentation/ThreadSanitizer.cpp b/lib/Transforms/Instrumentation/ThreadSanitizer.cpp index dc0fa7175d9..796813f200a 100644 --- a/lib/Transforms/Instrumentation/ThreadSanitizer.cpp +++ b/lib/Transforms/Instrumentation/ThreadSanitizer.cpp @@ -21,7 +21,7 @@ #define DEBUG_TYPE "tsan" -#include "FunctionBlackList.h" +#include "BlackList.h" #include "llvm/Function.h" #include "llvm/IRBuilder.h" #include "llvm/Intrinsics.h" @@ -77,7 +77,7 @@ struct ThreadSanitizer : public FunctionPass { int getMemoryAccessFuncIndex(Value *Addr); TargetData *TD; - OwningPtr BL; + OwningPtr BL; IntegerType *OrdTy; // Callbacks to run-time library are computed in doInitialization. Function *TsanFuncEntry; @@ -121,7 +121,7 @@ bool ThreadSanitizer::doInitialization(Module &M) { TD = getAnalysisIfAvailable(); if (!TD) return false; - BL.reset(new FunctionBlackList(ClBlackListFile)); + BL.reset(new BlackList(ClBlackListFile)); // Always insert a call to __tsan_init into the module's CTORs. IRBuilder<> IRB(M.getContext());