Author: jkorous Date: Mon Oct 7 17:36:19 2019 New Revision: 373999 URL: http://llvm.org/viewvc/llvm-project?rev=373999&view=rev Log: Revert "Add VFS support for sanitizers' blacklist"
Fix tests on Windows for now. This reverts commit 96ac97a4213287003f08636d0c372b3f71e9cfca. Removed: cfe/trunk/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml Modified: cfe/trunk/lib/AST/ASTContext.cpp cfe/trunk/test/CodeGen/ubsan-blacklist.c Modified: cfe/trunk/lib/AST/ASTContext.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=373999&r1=373998&r2=373999&view=diff ============================================================================== --- cfe/trunk/lib/AST/ASTContext.cpp (original) +++ cfe/trunk/lib/AST/ASTContext.cpp Mon Oct 7 17:36:19 2019 @@ -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 isAddrSpaceMapManglingEnable 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 &LOpt 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)), Removed: cfe/trunk/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml?rev=373998&view=auto ============================================================================== --- cfe/trunk/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml (original) +++ cfe/trunk/test/CodeGen/Inputs/sanitizer-blacklist-vfsoverlay.yaml (removed) @@ -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@' - } - ] - } - ] -} Modified: cfe/trunk/test/CodeGen/ubsan-blacklist.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ubsan-blacklist.c?rev=373999&r1=373998&r2=373999&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/ubsan-blacklist.c (original) +++ cfe/trunk/test/CodeGen/ubsan-blacklist.c Mon Oct 7 17:36:19 2019 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits