From 2691b964150c77a9e6967423383ad14a7693095e Mon Sep 17 00:00:00 2001 From: Thurston Dang Date: Wed, 18 Dec 2024 23:50:01 +0000 Subject: Revert "[ubsan] Add -fsanitize-merge (and -fno-sanitize-merge) (#120464)" This reverts commit 7eaf4708098c216bf432fc7e0bc79c3771e793a4. Reason: buildbot breakage (e.g., https://lab.llvm.org/buildbot/#/builders/144/builds/14299/steps/6/logs/FAIL__Clang__ubsan-trap-debugloc_c) --- clang/lib/Frontend/CompilerInvocation.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'clang/lib/Frontend/CompilerInvocation.cpp') diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 348c56c..298fafc 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1792,10 +1792,6 @@ void CompilerInvocationBase::GenerateCodeGenArgs(const CodeGenOptions &Opts, for (StringRef Sanitizer : serializeSanitizerKinds(Opts.SanitizeTrap)) GenerateArg(Consumer, OPT_fsanitize_trap_EQ, Sanitizer); - for (StringRef Sanitizer : - serializeSanitizerKinds(Opts.SanitizeMergeHandlers)) - GenerateArg(Consumer, OPT_fsanitize_merge_handlers_EQ, Sanitizer); - if (!Opts.EmitVersionIdentMetadata) GenerateArg(Consumer, OPT_Qn); @@ -2273,9 +2269,6 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, parseSanitizerKinds("-fsanitize-trap=", Args.getAllArgValues(OPT_fsanitize_trap_EQ), Diags, Opts.SanitizeTrap); - parseSanitizerKinds("-fsanitize-merge=", - Args.getAllArgValues(OPT_fsanitize_merge_handlers_EQ), - Diags, Opts.SanitizeMergeHandlers); Opts.EmitVersionIdentMetadata = Args.hasFlag(OPT_Qy, OPT_Qn, true); -- cgit v1.1