From 2b7cab0c2e1ed6692fd4689679c1027b1e56c14d Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 20 Mar 2014 10:48:29 +0000 Subject: Kill -faddress-sanitizer, -fthread-sanitizer and -fcatch-undefined-behavior flags. These flags are deprecated since at least Clang 3.3. Users should instead use -fsanitize= with appropriate values. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@204330 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/Sanitizers.def | 2 +- include/clang/Driver/Options.td | 5 ----- include/clang/Driver/SanitizerArgs.h | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'include/clang') diff --git a/include/clang/Basic/Sanitizers.def b/include/clang/Basic/Sanitizers.def index c9b31a39aa..706c722306 100644 --- a/include/clang/Basic/Sanitizers.def +++ b/include/clang/Basic/Sanitizers.def @@ -89,7 +89,7 @@ SANITIZER_GROUP("undefined", Undefined, ObjectSize | Return | Shift | SignedIntegerOverflow | Unreachable | VLABound | Vptr) -// -fsanitize=undefined-trap (and its alias -fcatch-undefined-behavior) includes +// -fsanitize=undefined-trap includes // all sanitizers included by -fsanitize=undefined, except those that require // runtime support. This group is generally used in conjunction with the // -fsanitize-undefined-trap-on-error flag. diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index fd8b823d0b..84a863ca55 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -357,10 +357,6 @@ def fapple_kext : Flag<["-"], "fapple-kext">, Group, Flags<[CC1Option]> HelpText<"Use Apple's kernel extensions ABI">; def fapple_pragma_pack : Flag<["-"], "fapple-pragma-pack">, Group, Flags<[CC1Option]>, HelpText<"Enable Apple gcc-compatible #pragma pack handling">; -def faddress_sanitizer : Flag<["-"], "faddress-sanitizer">, Group; -def fno_address_sanitizer : Flag<["-"], "fno-address-sanitizer">, Group; -def fthread_sanitizer : Flag<["-"], "fthread-sanitizer">, Group; -def fno_thread_sanitizer : Flag<["-"], "fno-thread-sanitizer">, Group; def fasm : Flag<["-"], "fasm">, Group; def fasm_blocks : Flag<["-"], "fasm-blocks">, Group, Flags<[CC1Option]>; @@ -401,7 +397,6 @@ def fbounds_checking_EQ : Joined<["-"], "fbounds-checking=">, Flags<[CC1Option]> Group; def fbuiltin : Flag<["-"], "fbuiltin">, Group; def fcaret_diagnostics : Flag<["-"], "fcaret-diagnostics">, Group; -def fcatch_undefined_behavior : Flag<["-"], "fcatch-undefined-behavior">, Group; def fclasspath_EQ : Joined<["-"], "fclasspath=">, Group; def fcolor_diagnostics : Flag<["-"], "fcolor-diagnostics">, Group, Flags<[CC1Option]>, HelpText<"Use colors in diagnostics">; diff --git a/include/clang/Driver/SanitizerArgs.h b/include/clang/Driver/SanitizerArgs.h index 78f6756b9b..d12e5faf4e 100644 --- a/include/clang/Driver/SanitizerArgs.h +++ b/include/clang/Driver/SanitizerArgs.h @@ -100,7 +100,7 @@ class SanitizerArgs { /// Produce an argument string from ArgList \p Args, which shows how it /// provides a sanitizer kind in \p Mask. For example, the argument list - /// "-fsanitize=thread,vptr -faddress-sanitizer" with mask \c NeedsUbsanRt + /// "-fsanitize=thread,vptr -fsanitize=address" with mask \c NeedsUbsanRt /// would produce "-fsanitize=vptr". static std::string lastArgumentForKind(const Driver &D, const llvm::opt::ArgList &Args, -- cgit v1.2.3