Author: Hans Wennborg Date: 2021-04-19T15:22:15+02:00 New Revision: bb36dc8dcf1c4a16cafdafc6b225ec6036144f41
URL: https://github.com/llvm/llvm-project/commit/bb36dc8dcf1c4a16cafdafc6b225ec6036144f41 DIFF: https://github.com/llvm/llvm-project/commit/bb36dc8dcf1c4a16cafdafc6b225ec6036144f41.diff LOG: Rename -show-skipped-includes to -fshow-skipped-includes and make it a driver option This is a user-facing option, so it doesn't make sense for it to be cc1 only. Follow-up to D100420 Differential revision: https://reviews.llvm.org/D100759 Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/Clang.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 9e15712eb2d51..f93b8a2496e07 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -629,6 +629,12 @@ def G_EQ : Joined<["-"], "G=">, Flags<[NoXarchOption]>, Group<m_Group>, Alias<G> def H : Flag<["-"], "H">, Flags<[CC1Option]>, Group<Preprocessor_Group>, HelpText<"Show header includes and nesting depth">, MarshallingInfoFlag<DependencyOutputOpts<"ShowHeaderIncludes">>; +def fshow_skipped_includes : Flag<["-"], "fshow-skipped-includes">, + Flags<[CC1Option]>, HelpText<"Show skipped includes in -H output.">, + DocBrief<[{#include files may be "skipped" due to include guard optimization + or #pragma once. This flag makes -H show also such includes.}]>, + MarshallingInfoFlag<DependencyOutputOpts<"ShowSkippedHeaderIncludes">>; + def I_ : Flag<["-"], "I-">, Group<I_Group>, HelpText<"Restrict all prior -I flags to double-quoted inclusion and " "remove current directory from include path">; @@ -4945,11 +4951,6 @@ def fdenormal_fp_math_f32_EQ : Joined<["-"], "fdenormal-fp-math-f32=">, def sys_header_deps : Flag<["-"], "sys-header-deps">, HelpText<"Include system headers in dependency output">, MarshallingInfoFlag<DependencyOutputOpts<"IncludeSystemHeaders">>; -def show_skipped_includes : Flag<["-"], "show-skipped-includes">, - HelpText<"Show skipped includes in -H output.">, - DocBrief<[{#include files may be "skipped" due to include guard optimization - or #pragma once. This flag makes -H show also such includes.}]>, - MarshallingInfoFlag<DependencyOutputOpts<"ShowSkippedHeaderIncludes">>; def module_file_deps : Flag<["-"], "module-file-deps">, HelpText<"Include module files in dependency output">, MarshallingInfoFlag<DependencyOutputOpts<"IncludeModuleFiles">>; diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 074556089a243..95ca99565351c 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5134,6 +5134,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-H"); CmdArgs.push_back("-sys-header-deps"); } + Args.AddAllArgs(CmdArgs, options::OPT_fshow_skipped_includes); if (D.CCPrintHeaders && !D.CCGenDiagnostics) { CmdArgs.push_back("-header-include-file"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
