[llvm-commits] [llvm] r162566 - in /llvm/trunk/lib/Transforms/Instrumentation: AddressSanitizer.cpp BlackList.cpp BlackList.h CMakeLists.txt FunctionBlackList.cpp FunctionBlackList.h ThreadSanitizer.cpp
Kostya Serebryany
kcc at google.com
Fri Aug 24 09:44:47 PDT 2012
Author: kcc
Date: Fri Aug 24 11:44:47 2012
New Revision: 162566
URL: http://llvm.org/viewvc/llvm-project?rev=162566&view=rev
Log:
[asan/tsan] rename FunctionBlackList* to BlackList* as this class is not limited to functions any more
Added:
llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp
- copied, changed from r162565, llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp
llvm/trunk/lib/Transforms/Instrumentation/BlackList.h
- copied, changed from r162565, llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h
Removed:
llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp
llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h
Modified:
llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
llvm/trunk/lib/Transforms/Instrumentation/CMakeLists.txt
llvm/trunk/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=162566&r1=162565&r2=162566&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Fri Aug 24 11:44:47 2012
@@ -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 @@
Function *AsanCtorFunction;
Function *AsanInitFunction;
Instruction *CtorInsertBefore;
- OwningPtr<FunctionBlackList> BL;
+ OwningPtr<BlackList> BL;
// This array is indexed by AccessIsWrite and log2(AccessSize).
Function *AsanErrorCallback[2][kNumberOfAccessSizes];
InlineAsm *EmptyAsm;
@@ -736,7 +736,7 @@
TD = getAnalysisIfAvailable<TargetData>();
if (!TD)
return false;
- BL.reset(new FunctionBlackList(ClBlackListFile));
+ BL.reset(new BlackList(ClBlackListFile));
C = &(M.getContext());
LongSize = TD->getPointerSizeInBits();
Copied: llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp (from r162565, llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp?p2=llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp&p1=llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp&r1=162565&r2=162566&rev=162566&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp Fri Aug 24 11:44:47 2012
@@ -1,4 +1,4 @@
-//===-- FunctionBlackList.cpp - blacklist for sanitizers -----------------===//
+//===-- BlackList.cpp - blacklist for sanitizers --------------------------===//
//
// The LLVM Compiler Infrastructure
//
@@ -16,7 +16,7 @@
#include <utility>
#include <string>
-#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<MemoryBuffer> File;
@@ -77,19 +77,19 @@
}
}
-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;
Copied: llvm/trunk/lib/Transforms/Instrumentation/BlackList.h (from r162565, llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/BlackList.h?p2=llvm/trunk/lib/Transforms/Instrumentation/BlackList.h&p1=llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h&r1=162565&r2=162566&rev=162566&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/BlackList.h Fri Aug 24 11:44:47 2012
@@ -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 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.
Modified: llvm/trunk/lib/Transforms/Instrumentation/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/CMakeLists.txt?rev=162566&r1=162565&r2=162566&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/CMakeLists.txt (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/CMakeLists.txt Fri Aug 24 11:44:47 2012
@@ -1,8 +1,8 @@
add_llvm_library(LLVMInstrumentation
AddressSanitizer.cpp
+ BlackList.cpp
BoundsChecking.cpp
EdgeProfiling.cpp
- FunctionBlackList.cpp
GCOVProfiling.cpp
Instrumentation.cpp
OptimalEdgeProfiling.cpp
Removed: llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp?rev=162565&view=auto
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.cpp (removed)
@@ -1,98 +0,0 @@
-//===-- FunctionBlackList.cpp - blacklist for sanitizers -----------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This is a utility class for instrumentation passes (like AddressSanitizer
-// or ThreadSanitizer) to avoid instrumenting some functions or global
-// variables based on a user-supplied blacklist.
-//
-//===----------------------------------------------------------------------===//
-
-#include <utility>
-#include <string>
-
-#include "FunctionBlackList.h"
-#include "llvm/ADT/OwningPtr.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Function.h"
-#include "llvm/GlobalVariable.h"
-#include "llvm/Module.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Regex.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/system_error.h"
-
-namespace llvm {
-
-FunctionBlackList::FunctionBlackList(const StringRef Path) {
- // Validate and open blacklist file.
- if (!Path.size()) return;
- OwningPtr<MemoryBuffer> File;
- if (error_code EC = MemoryBuffer::getFile(Path, File)) {
- report_fatal_error("Can't open blacklist file: " + Path + ": " +
- EC.message());
- }
-
- // Iterate through each line in the blacklist file.
- SmallVector<StringRef, 16> Lines;
- SplitString(File.take()->getBuffer(), Lines, "\n\r");
- StringMap<std::string> Regexps;
- for (SmallVector<StringRef, 16>::iterator I = Lines.begin(), E = Lines.end();
- I != E; ++I) {
- // Get our prefix and unparsed regexp.
- std::pair<StringRef, StringRef> SplitLine = I->split(":");
- StringRef Prefix = SplitLine.first;
- std::string Regexp = SplitLine.second;
-
- // Replace * with .*
- for (size_t pos = 0; (pos = Regexp.find("*", pos)) != std::string::npos;
- pos += strlen(".*")) {
- Regexp.replace(pos, strlen("*"), ".*");
- }
-
- // Check that the regexp is valid.
- Regex CheckRE(Regexp);
- std::string Error;
- if (!CheckRE.isValid(Error)) {
- report_fatal_error("malformed blacklist regex: " + SplitLine.second +
- ": " + Error);
- }
-
- // Add this regexp into the proper group by its prefix.
- if (Regexps[Prefix].size())
- Regexps[Prefix] += "|";
- Regexps[Prefix] += Regexp;
- }
-
- // Iterate through each of the prefixes, and create Regexs for them.
- for (StringMap<std::string>::iterator I = Regexps.begin(), E = Regexps.end();
- I != E; ++I) {
- Entries[I->getKey()] = new Regex(I->getValue());
- }
-}
-
-bool FunctionBlackList::isIn(const Function &F) {
- return isIn(*F.getParent()) || inSection("fun", F.getName());
-}
-
-bool FunctionBlackList::isIn(const GlobalVariable &G) {
- return isIn(*G.getParent()) || inSection("global", G.getName());
-}
-
-bool FunctionBlackList::isIn(const Module &M) {
- return inSection("src", M.getModuleIdentifier());
-}
-
-bool FunctionBlackList::inSection(const StringRef Section,
- const StringRef Query) {
- Regex *FunctionRegex = Entries[Section];
- return FunctionRegex ? FunctionRegex->match(Query) : false;
-}
-
-} // namespace llvm
Removed: llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h?rev=162565&view=auto
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/FunctionBlackList.h (removed)
@@ -1,52 +0,0 @@
-//===-- FunctionBlackList.h - blacklist for sanitizers ----------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//===----------------------------------------------------------------------===//
-//
-// This is a utility class for instrumentation passes (like AddressSanitizer
-// or ThreadSanitizer) to avoid instrumenting some functions or global
-// variables based on a user-supplied blacklist.
-//
-// The blacklist disables instrumentation of various functions and global
-// variables. Each line contains a prefix, followed by a wild card expression.
-// ---
-// fun:*_ZN4base6subtle*
-// global:*global_with_initialization_problems*
-// src:file_with_tricky_code.cc
-// ---
-// Note that the wild card is in fact an llvm::Regex, but * is automatically
-// replaced with .*
-// This is similar to the "ignore" feature of ThreadSanitizer.
-// http://code.google.com/p/data-race-test/wiki/ThreadSanitizerIgnores
-//
-//===----------------------------------------------------------------------===//
-//
-
-#include "llvm/ADT/StringMap.h"
-
-namespace llvm {
-class Function;
-class GlobalVariable;
-class Module;
-class Regex;
-class StringRef;
-
-class FunctionBlackList {
- public:
- FunctionBlackList(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.
- bool isIn(const GlobalVariable &G);
- // Returns whether this module is blacklisted by filename.
- bool isIn(const Module &M);
- private:
- StringMap<Regex*> Entries;
-
- bool inSection(const StringRef Section, const StringRef Query);
-};
-
-} // namespace llvm
Modified: llvm/trunk/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/ThreadSanitizer.cpp?rev=162566&r1=162565&r2=162566&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/ThreadSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/ThreadSanitizer.cpp Fri Aug 24 11:44:47 2012
@@ -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 @@
int getMemoryAccessFuncIndex(Value *Addr);
TargetData *TD;
- OwningPtr<FunctionBlackList> BL;
+ OwningPtr<BlackList> BL;
IntegerType *OrdTy;
// Callbacks to run-time library are computed in doInitialization.
Function *TsanFuncEntry;
@@ -121,7 +121,7 @@
TD = getAnalysisIfAvailable<TargetData>();
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());
More information about the llvm-commits
mailing list