This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG7b1d2a2891d8: [NFC] Switch to auto marshalling
infrastructure for `-fsanitize-address… (authored by delcypher).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D97327/new/
https://reviews.llvm.org/D97327
Files:
clang/include/clang/Driver/Options.td
clang/lib/Frontend/CompilerInvocation.cpp
clang/test/CodeGen/asan-destructor-kind.cpp
Index: clang/test/CodeGen/asan-destructor-kind.cpp
===================================================================
--- clang/test/CodeGen/asan-destructor-kind.cpp
+++ clang/test/CodeGen/asan-destructor-kind.cpp
@@ -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 \
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -1937,19 +1937,6 @@
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))
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -1500,11 +1500,16 @@
" 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.
Index: clang/test/CodeGen/asan-destructor-kind.cpp
===================================================================
--- clang/test/CodeGen/asan-destructor-kind.cpp
+++ clang/test/CodeGen/asan-destructor-kind.cpp
@@ -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 \
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -1937,19 +1937,6 @@
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))
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -1500,11 +1500,16 @@
" 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.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
