diff options
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/LangOptions.cpp | 15 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/clang/lib/Basic/LangOptions.cpp b/clang/lib/Basic/LangOptions.cpp index f7ea16a4515..8992bfaff2b 100644 --- a/clang/lib/Basic/LangOptions.cpp +++ b/clang/lib/Basic/LangOptions.cpp @@ -14,10 +14,17 @@ using namespace clang; -SanitizerOptions::SanitizerOptions() { -#define SANITIZER(NAME, ID) ID = 0; -#include "clang/Basic/Sanitizers.def" - SanitizeAddressFieldPadding = 0; +SanitizerOptions::SanitizerOptions() + : Kind(0), SanitizeAddressFieldPadding(0) {} + +bool SanitizerOptions::has(SanitizerKind K) const { + unsigned Bit = static_cast<unsigned>(K); + return Kind & (1 << Bit); +} + +void SanitizerOptions::set(SanitizerKind K, bool Value) { + unsigned Bit = static_cast<unsigned>(K); + Kind = Value ? (Kind | (1 << Bit)) : (Kind & ~(1 << Bit)); } void SanitizerOptions::clear() { diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 2f343040890..61f0a530864 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -94,7 +94,8 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts, Builder.defineMacro("OBJC_NEW_PROPERTIES"); // AddressSanitizer doesn't play well with source fortification, which is on // by default on Darwin. - if (Opts.Sanitize.Address) Builder.defineMacro("_FORTIFY_SOURCE", "0"); + if (Opts.Sanitize.has(SanitizerKind::Address)) + Builder.defineMacro("_FORTIFY_SOURCE", "0"); if (!Opts.ObjCAutoRefCount) { // __weak is always defined, for use in blocks and with objc pointers. |
