diff options
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.h | 4 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.h b/clang/lib/Driver/SanitizerArgs.h index 52a6c2ec4b1..af92fa070c3 100644 --- a/clang/lib/Driver/SanitizerArgs.h +++ b/clang/lib/Driver/SanitizerArgs.h @@ -28,7 +28,7 @@ class SanitizerArgs { #define SANITIZER(NAME, ID) ID = 1 << SO_##ID, #define SANITIZER_GROUP(NAME, ID, ALIAS) ID = ALIAS, #include "clang/Basic/Sanitizers.def" - NeedsAsanRt = Address, + NeedsAsanRt = AddressFull, NeedsTsanRt = Thread, NeedsUbsanRt = (Undefined & ~Bounds) | Integer }; @@ -44,7 +44,7 @@ class SanitizerArgs { bool needsUbsanRt() const { return Kind & NeedsUbsanRt; } bool sanitizesVptr() const { return Kind & Vptr; } - + void addArgs(const ArgList &Args, ArgStringList &CmdArgs) const { if (!Kind) return; diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index f9cb5eff533..f2c1a03caf3 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -1474,6 +1474,13 @@ SanitizerArgs::SanitizerArgs(const Driver &D, const ArgList &Args) { D.Diag(diag::err_drv_argument_not_allowed_with) << lastArgumentForKind(D, Args, NeedsAsan ? NeedsAsanRt : NeedsTsanRt) << lastArgumentForKind(D, Args, NeedsUbsan ? NeedsUbsanRt : NeedsTsanRt); + + // If -fsanitize contains extra features of ASan, it should also + // explicitly contain -fsanitize=address. + if (NeedsAsan && ((Kind & Address) == 0)) + D.Diag(diag::err_drv_argument_only_allowed_with) + << lastArgumentForKind(D, Args, NeedsAsanRt) + << "-fsanitize=address"; } /// If AddressSanitizer is enabled, add appropriate linker flags (Linux). |
