diff options
| -rw-r--r-- | clang/lib/Basic/SanitizerBlacklist.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/address-safety-attr.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Basic/SanitizerBlacklist.cpp b/clang/lib/Basic/SanitizerBlacklist.cpp index c894129e2a4..ea5b8d0da84 100644 --- a/clang/lib/Basic/SanitizerBlacklist.cpp +++ b/clang/lib/Basic/SanitizerBlacklist.cpp @@ -41,6 +41,6 @@ bool SanitizerBlacklist::isBlacklistedFile(StringRef FileName, bool SanitizerBlacklist::isBlacklistedLocation(SourceLocation Loc, StringRef Category) const { return !Loc.isInvalid() && - isBlacklistedFile(SM.getFilename(SM.getSpellingLoc(Loc)), Category); + isBlacklistedFile(SM.getFilename(SM.getFileLoc(Loc)), Category); } diff --git a/clang/test/CodeGen/address-safety-attr.cpp b/clang/test/CodeGen/address-safety-attr.cpp index 0d585c74495..031d013a9b5 100644 --- a/clang/test/CodeGen/address-safety-attr.cpp +++ b/clang/test/CodeGen/address-safety-attr.cpp @@ -66,13 +66,19 @@ int BlacklistedFunction(int *a) { return *a; } #define GENERATE_FUNC(name) \ int name(int *a) { return *a; } - // WITHOUT: GeneratedFunction{{.*}}) [[NOATTR]] // BLFILE: GeneratedFunction{{.*}}) [[NOATTR]] // BLFUNC: GeneratedFunction{{.*}}) [[WITH]] // ASAN: GeneratedFunction{{.*}}) [[WITH]] GENERATE_FUNC(GeneratedFunction) +#define GENERATE_NAME(name) name##_generated +// WITHOUT: Function_generated{{.*}}) [[NOATTR]] +// BLFILE: Function_generated{{.*}}) [[NOATTR]] +// BLFUNC: Function_generated{{.*}}) [[WITH]] +// ASAN: Function_generated{{.*}}) [[WITH]] +int GENERATE_NAME(Function)(int *a) { return *a; } + // WITHOUT: TemplateAddressSafetyOk{{.*}}) [[NOATTR]] // BLFILE: TemplateAddressSafetyOk{{.*}}) [[NOATTR]] // BLFUNC: TemplateAddressSafetyOk{{.*}}) [[WITH]] |
