From a8c678cb9a90c4f82505f573e9b9fa23fec93a64 Mon Sep 17 00:00:00 2001 From: Francis Visoiu Mistrih Date: Wed, 18 Dec 2019 13:16:09 -0800 Subject: [Remarks][Driver][NFC] Make shouldEmitRemarks more available in the Driver Move the function to Driver.h so that it can be re-used in other places. --- clang/lib/Driver/Driver.cpp | 23 +++++++++++++++++++++++ clang/lib/Driver/ToolChains/Clang.cpp | 27 ++------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index f2b23431551..35e7998bf22 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -5060,3 +5060,26 @@ Driver::getIncludeExcludeOptionFlagMasks(bool IsClCompatMode) const { bool clang::driver::isOptimizationLevelFast(const ArgList &Args) { return Args.hasFlag(options::OPT_Ofast, options::OPT_O_Group, false); } + +bool clang::driver::willEmitRemarks(const ArgList &Args) { + // -fsave-optimization-record enables it. + if (Args.hasFlag(options::OPT_fsave_optimization_record, + options::OPT_fno_save_optimization_record, false)) + return true; + + // -fsave-optimization-record= enables it as well. + if (Args.hasFlag(options::OPT_fsave_optimization_record_EQ, + options::OPT_fno_save_optimization_record, false)) + return true; + + // -foptimization-record-file alone enables it too. + if (Args.hasFlag(options::OPT_foptimization_record_file_EQ, + options::OPT_fno_save_optimization_record, false)) + return true; + + // -foptimization-record-passes alone enables it too. + if (Args.hasFlag(options::OPT_foptimization_record_passes_EQ, + options::OPT_fno_save_optimization_record, false)) + return true; + return false; +} diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 5bf0efcf050..9840acafd6e 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -1415,29 +1415,6 @@ static bool isNoCommonDefault(const llvm::Triple &Triple) { } } -static bool shouldEmitRemarks(const ArgList &Args) { - // -fsave-optimization-record enables it. - if (Args.hasFlag(options::OPT_fsave_optimization_record, - options::OPT_fno_save_optimization_record, false)) - return true; - - // -fsave-optimization-record= enables it as well. - if (Args.hasFlag(options::OPT_fsave_optimization_record_EQ, - options::OPT_fno_save_optimization_record, false)) - return true; - - // -foptimization-record-file alone enables it too. - if (Args.hasFlag(options::OPT_foptimization_record_file_EQ, - options::OPT_fno_save_optimization_record, false)) - return true; - - // -foptimization-record-passes alone enables it too. - if (Args.hasFlag(options::OPT_foptimization_record_passes_EQ, - options::OPT_fno_save_optimization_record, false)) - return true; - return false; -} - static bool hasMultipleInvocations(const llvm::Triple &Triple, const ArgList &Args) { // Supported only on Darwin where we invoke the compiler multiple times @@ -3718,7 +3695,7 @@ static void RenderDebugOptions(const ToolChain &TC, const Driver &D, TC.adjustDebugInfoKind(DebugInfoKind, Args); // When emitting remarks, we need at least debug lines in the output. - if (shouldEmitRemarks(Args) && + if (willEmitRemarks(Args) && DebugInfoKind <= codegenoptions::DebugDirectivesOnly) DebugInfoKind = codegenoptions::DebugLineTablesOnly; @@ -5546,7 +5523,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-fapple-pragma-pack"); // Remarks can be enabled with any of the `-f.*optimization-record.*` flags. - if (shouldEmitRemarks(Args) && checkRemarksOptions(D, Args, Triple)) + if (willEmitRemarks(Args) && checkRemarksOptions(D, Args, Triple)) renderRemarksOptions(Args, CmdArgs, Triple, Input, JA); bool RewriteImports = Args.hasFlag(options::OPT_frewrite_imports, -- cgit v1.2.3