From 61976af3ba9347935e9715067fcc0f5a568e6e7d Mon Sep 17 00:00:00 2001 From: Paul Kirth Date: Tue, 25 Apr 2023 21:13:51 +0000 Subject: [PATCH] [clang][driver] Enable MisExpect diagnostics flag outside of CC1 Previously we only accepted the `-fdiagnostics-misexpect-tolerance=` at CC1, when it should have been handled identically to `-fdiagnostics-hotness-threshold=`. It should not have been required to pass this flag w/ `-Xclang` as reported here: https://reviews.llvm.org/D115907#inline-1440745 Reviewed By: hans, phosek Differential Revision: https://reviews.llvm.org/D149206 --- clang/lib/Driver/ToolChains/Clang.cpp | 7 +++++++ clang/test/Driver/clang_f_opts.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 9daf1475576a8..33ad50ad13483 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4033,6 +4033,13 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args, CmdArgs.push_back(Args.MakeArgString(Opt)); } + if (const Arg *A = + Args.getLastArg(options::OPT_fdiagnostics_misexpect_tolerance_EQ)) { + std::string Opt = + std::string("-fdiagnostics-misexpect-tolerance=") + A->getValue(); + CmdArgs.push_back(Args.MakeArgString(Opt)); + } + if (const Arg *A = Args.getLastArg(options::OPT_fdiagnostics_format_EQ)) { CmdArgs.push_back("-fdiagnostics-format"); CmdArgs.push_back(A->getValue()); diff --git a/clang/test/Driver/clang_f_opts.c b/clang/test/Driver/clang_f_opts.c index 446bb07ee6cb7..67ec82a09f852 100644 --- a/clang/test/Driver/clang_f_opts.c +++ b/clang/test/Driver/clang_f_opts.c @@ -140,6 +140,10 @@ // CHECK-PROFILE-USE-DIR: "-fprofile-instrument-use-path={{.*}}.d/some/dir{{/|\\\\}}default.profdata" // CHECK-PROFILE-USE-FILE: "-fprofile-instrument-use-path=/tmp/somefile.prof" +// RUN: %clang -### -S -fprofile-instr-use=%t.profdata -fdiagnostics-misexpect-tolerance=10 -Wmisexpect %s 2>&1 | FileCheck %s --check-prefix=CHECK-MISEXPECT-TOLLERANCE +// CHECK-MISEXPECT-TOLLERANCE: "-fdiagnostics-misexpect-tolerance=10" +// CHECK-MISEXPECT-TOLLERANCE-NOT: argument unused + // RUN: %clang -### -S -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s // RUN: %clang -### -S -fno-vectorize -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s // RUN: %clang -### -S -fno-vectorize %s 2>&1 | FileCheck -check-prefix=CHECK-NO-VECTORIZE %s