maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Add VFS support for sanitizers' blacklist" 

Fix tests on Windows for now.

This reverts commit 96ac97a421.

llvm-svn: 373999
This commit is contained in:
Jan Korous 2019-10-08 00:36:19 +00:00
parent 0016b450be
commit 40943b5193
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang/lib/AST/ASTContext.cpp
View File

@ -72,7 +72,6 @@
#include "llvm/ADT/PointerUnion.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringRef.h"
@ -82,7 +81,6 @@
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
#include <cassert>
@ -828,18 +826,6 @@ static bool isAddrSpaceMapManglingEnabled(const TargetInfo &TI,
llvm_unreachable("getAddressSpaceMapMangling() doesn't cover anything.");
}
static std::vector<std::string>
getRealPaths(llvm::vfs::FileSystem &VFS, llvm::ArrayRef<std::string> Paths) {
std::vector<std::string> Result;
llvm::SmallString<128> Buffer;
for (const auto &File : Paths) {
if (std::error_code EC = VFS.getRealPath(File, Buffer))
llvm::report_fatal_error("can't open file '" + File + "': " + EC.message());
Result.push_back(Buffer.str());
}
return Result;
}
ASTContext::ASTContext(LangOptions &LOpts, SourceManager &SM,
IdentifierTable &idents, SelectorTable &sels,
Builtin::Context &builtins)
@ -847,10 +833,7 @@ ASTContext::ASTContext(LangOptions &LOpts, SourceManager &SM,
TemplateSpecializationTypes(this_()),
DependentTemplateSpecializationTypes(this_()),
SubstTemplateTemplateParmPacks(this_()), SourceMgr(SM), LangOpts(LOpts),
SanitizerBL(new SanitizerBlacklist(
getRealPaths(SM.getFileManager().getVirtualFileSystem(),
LangOpts.SanitizerBlacklistFiles),
SM)),
SanitizerBL(new SanitizerBlacklist(LangOpts.SanitizerBlacklistFiles, SM)),
XRayFilter(new XRayFunctionFilter(LangOpts.XRayAlwaysInstrumentFiles,
LangOpts.XRayNeverInstrumentFiles,
LangOpts.XRayAttrListFiles, SM)),

15
clang/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml
View File

@ -1,15 +0,0 @@
{
'version': 0,
'roots': [
{ 'name': '@DIR@', 'type': 'directory',
'contents': [
{ 'name': 'only-virtual-file.blacklist', 'type': 'file',
'external-contents': '@REAL_FILE@'
},
{ 'name': 'invalid-virtual-file.blacklist', 'type': 'file',
'external-contents': '@NONEXISTENT_FILE@'
}
]
}
]
}

11
clang/test/CodeGen/ubsan-blacklist.c
View File

@ -5,17 +5,6 @@
// RUN: %clang_cc1 -fsanitize=unsigned-integer-overflow -fsanitize-blacklist=%t-func.blacklist -emit-llvm %s -o - | FileCheck %s --check-prefix=FUNC
// RUN: %clang_cc1 -fsanitize=unsigned-integer-overflow -fsanitize-blacklist=%t-file.blacklist -emit-llvm %s -o - | FileCheck %s --check-prefix=FILE
// RUN: rm -f %t-vfsoverlay.yaml
// RUN: rm -f %t-nonexistent.blacklist
// RUN: sed -e "s|@DIR@|%T|g" %S/Inputs/sanitizer-blacklist-vfsoverlay.yaml | sed -e "s|@REAL_FILE@|%t-func.blacklist|g" | sed -e "s|@NONEXISTENT_FILE@|%t-nonexistent.blacklist|g" > %t-vfsoverlay.yaml
// RUN: %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%T/only-virtual-file.blacklist -emit-llvm %s -o - | FileCheck %s --check-prefix=FUNC
// RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%T/invalid-virtual-file.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID-MAPPED-FILE
// INVALID-MAPPED-FILE: invalid-virtual-file.blacklist': No such file or directory
// RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%t-nonexistent.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID
// INVALID: nonexistent.blacklist': No such file or directory
unsigned i;
// DEFAULT: @hash