diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-04-09 07:27:44 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-04-09 07:27:44 +0000 |
| commit | 4a1ea52e1d1a565aa2c5d70b082cad210203224a (patch) | |
| tree | 625fbd0d6679f167133a65b4114c11ab8698abee /lib/Driver/Tools.cpp | |
| parent | 52ca70dc304c694923ac804630d88b1d95bfa941 (diff) | |
Follow-up for r179082: more careful handling of -f(no-)sanitize-address-zero-base-shadow on Android
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179089 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 8c181c5825..bf05285750 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1605,12 +1605,20 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, const ArgList &Args) /* Default */false); // Parse -f(no-)sanitize-address-zero-base-shadow options. - if (NeedsAsan) + if (NeedsAsan) { + bool IsAndroid = (TC.getTriple().getEnvironment() == llvm::Triple::Android); + bool ZeroBaseShadowDefault = IsAndroid; AsanZeroBaseShadow = - TC.getTriple().getEnvironment() == llvm::Triple::Android || - Args.hasFlag(options::OPT_fsanitize_address_zero_base_shadow, - options::OPT_fno_sanitize_address_zero_base_shadow, - /* Default */false); + Args.hasFlag(options::OPT_fsanitize_address_zero_base_shadow, + options::OPT_fno_sanitize_address_zero_base_shadow, + ZeroBaseShadowDefault); + // Zero-base shadow is a requirement on Android. + if (IsAndroid && !AsanZeroBaseShadow) { + D.Diag(diag::err_drv_argument_not_allowed_with) + << "-fno-sanitize-address-zero-base-shadow" + << lastArgumentForKind(D, Args, Address); + } + } } static void addSanitizerRTLinkFlagsLinux( |