[NFC] Switch to auto marshalling infrastructure for -fsanitize-address-destructor-kind= flag.

This change simplifies `clang/lib/Frontend/CompilerInvocation.cpp`
because we no longer need to manually parse the flag and set codegen
options in the frontend. However, we still need to manually parse the
flag in the driver because:

* The marshalling infrastructure doesn't operate there.
* We need to do some platform specific checks in the driver
  that will likely never be supported by any kind of marshalling
  infrastructure.

rdar://71609176

Differential Revision: https://reviews.llvm.org/D97327
This commit is contained in:
Dan Liew 2021-02-12 16:10:33 -08:00
parent 4932101177
commit 7b1d2a2891
3 changed files with 11 additions and 19 deletions

View File

@ -1500,11 +1500,16 @@ defm sanitize_address_use_odr_indicator : BoolOption<"f", "sanitize-address-use-
" reports in partially sanitized programs at the cost of an increase in binary size">,
NegFlag<SetFalse, [], "Disable ODR indicator globals">>,
Group<f_clang_Group>;
def sanitize_address_destructor_kind_EQ : Joined<["-"], "fsanitize-address-destructor-kind=">,
MetaVarName<"<kind>">,
Flags<[CC1Option]>,
HelpText<"Set destructor type used in ASan instrumentation">,
Group<f_clang_Group>;
def sanitize_address_destructor_kind_EQ
: Joined<["-"], "fsanitize-address-destructor-kind=">,
MetaVarName<"<kind>">,
Flags<[CC1Option]>,
HelpText<"Set destructor type used in ASan instrumentation">,
Group<f_clang_Group>,
Values<"none,global">,
NormalizedValuesScope<"llvm::AsanDtorKind">,
NormalizedValues<["None", "Global"]>,
MarshallingInfoEnum<CodeGenOpts<"SanitizeAddressDtorKind">, "Global">;
// Note: This flag was introduced when it was necessary to distinguish between
// ABI for correct codegen. This is no longer needed, but the flag is
// not removed since targeting either ABI will behave the same.

View File

@ -1937,19 +1937,6 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
Opts.EmitVersionIdentMetadata = Args.hasFlag(OPT_Qy, OPT_Qn, true);
if (LangOptsRef.Sanitize.has(SanitizerKind::Address)) {
if (Arg *A =
Args.getLastArg(options::OPT_sanitize_address_destructor_kind_EQ)) {
auto destructorKind = AsanDtorKindFromString(A->getValue());
if (destructorKind == llvm::AsanDtorKind::Invalid) {
Diags.Report(clang::diag::err_drv_unsupported_option_argument)
<< A->getOption().getName() << A->getValue();
} else {
Opts.setSanitizeAddressDtorKind(destructorKind);
}
}
}
if (Args.hasArg(options::OPT_ffinite_loops))
Opts.FiniteLoops = CodeGenOptions::FiniteLoopsKind::Always;
else if (Args.hasArg(options::OPT_fno_finite_loops))

View File

@ -3,7 +3,7 @@
// RUN: -fsanitize-address-destructor-kind=bad_arg -emit-llvm -o - \
// RUN: -triple x86_64-apple-macosx10.15 %s 2>&1 | \
// RUN: FileCheck %s --check-prefixes=CHECK-BAD-ARG
// CHECK-BAD-ARG: unsupported argument 'bad_arg' to option 'fsanitize-address-destructor-kind='
// CHECK-BAD-ARG: invalid value 'bad_arg' in '-fsanitize-address-destructor-kind=bad_arg'
// Default is global dtor
// RUN: %clang_cc1 -fsanitize=address -emit-llvm -o - -triple x86_64-apple-macosx10.15 \