diff --git a/clang/include/clang/Basic/DiagnosticOptions.h b/clang/include/clang/Basic/DiagnosticOptions.h --- a/clang/include/clang/Basic/DiagnosticOptions.h +++ b/clang/include/clang/Basic/DiagnosticOptions.h @@ -15,7 +15,14 @@ #include #include +namespace llvm { +namespace opt { +class ArgList; +} // namespace opt +} // namespace llvm + namespace clang { +class DiagnosticsEngine; /// Specifies which overload candidates to display when overload /// resolution fails. @@ -61,6 +68,11 @@ /// Options for controlling the compiler diagnostics engine. class DiagnosticOptions : public RefCountedBase{ + friend bool ParseDiagnosticArgs(DiagnosticOptions &, llvm::opt::ArgList &, + clang::DiagnosticsEngine *, bool); + + friend class CompilerInvocation; + public: enum TextDiagnosticFormat { Clang, MSVC, Vi }; diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -755,7 +755,7 @@ def Wundef_prefix_EQ : CommaJoined<["-"], "Wundef-prefix=">, Group, Flags<[CC1Option, CoreOption, HelpHidden]>, MetaVarName<"">, HelpText<"Enable warnings for undefined macros with a prefix in the comma separated list ">, - MarshallingInfoStringVector<"DiagnosticOpts->UndefPrefixes">; + MarshallingInfoStringVector<"DiagnosticOpts.UndefPrefixes">; def Wwrite_strings : Flag<["-"], "Wwrite-strings">, Group, Flags<[CC1Option, HelpHidden]>; def Wno_write_strings : Flag<["-"], "Wno-write-strings">, Group, Flags<[CC1Option, HelpHidden]>; def W_Joined : Joined<["-"], "W">, Group, Flags<[CC1Option, CoreOption]>, @@ -1188,7 +1188,9 @@ def fbuiltin : Flag<["-"], "fbuiltin">, Group, Flags<[CoreOption]>; def fbuiltin_module_map : Flag <["-"], "fbuiltin-module-map">, Group, Flags<[NoXarchOption]>, HelpText<"Load the clang builtins module map file.">; -defm caret_diagnostics : OptOutFFlag<"caret-diagnostics", "", "">; +defm caret_diagnostics : BoolFOption<"caret-diagnostics", + "DiagnosticOpts.ShowCarets", DefaultsToTrue, + ChangedBy, ResetBy>; def fclang_abi_compat_EQ : Joined<["-"], "fclang-abi-compat=">, Group, Flags<[CC1Option]>, MetaVarName<"">, Values<".,latest">, HelpText<"Attempt to match the ABI of Clang ">; @@ -1200,7 +1202,7 @@ def fdiagnostics_color_EQ : Joined<["-"], "fdiagnostics-color=">, Group; def fansi_escape_codes : Flag<["-"], "fansi-escape-codes">, Group, Flags<[CoreOption, CC1Option]>, HelpText<"Use ANSI escape codes for diagnostics">, - MarshallingInfoFlag<"DiagnosticOpts->UseANSIEscapeCodes">; + MarshallingInfoFlag<"DiagnosticOpts.UseANSIEscapeCodes">; def fcomment_block_commands : CommaJoined<["-"], "fcomment-block-commands=">, Group, Flags<[CC1Option]>, HelpText<"Treat each comma separated argument in as a documentation comment block command">, MetaVarName<"">, MarshallingInfoStringVector<"LangOpts->CommentOpts.BlockCommandNames">; @@ -1252,12 +1254,17 @@ def fdebug_pass_structure : Flag<["-"], "fdebug-pass-structure">, Group; def fdepfile_entry : Joined<["-"], "fdepfile-entry=">, Group, Flags<[CC1Option]>; -def fdiagnostics_fixit_info : Flag<["-"], "fdiagnostics-fixit-info">, Group; +defm diagnostics_fixit_info : BoolFOption<"diagnostics-fixit-info", + "DiagnosticOpts.ShowFixits", DefaultsToTrue, + ChangedBy, + ResetBy>; def fdiagnostics_parseable_fixits : Flag<["-"], "fdiagnostics-parseable-fixits">, Group, - Flags<[CoreOption, CC1Option]>, HelpText<"Print fix-its in machine parseable form">; + Flags<[CoreOption, CC1Option]>, HelpText<"Print fix-its in machine parseable form">, + MarshallingInfoFlag<"DiagnosticOpts.ShowParseableFixits">; def fdiagnostics_print_source_range_info : Flag<["-"], "fdiagnostics-print-source-range-info">, Group, Flags<[CC1Option]>, - HelpText<"Print source range spans in numeric form">; + HelpText<"Print source range spans in numeric form">, + MarshallingInfoFlag<"DiagnosticOpts.ShowSourceRanges">; defm diagnostics_show_hotness : BoolFOption<"diagnostics-show-hotness", "CodeGenOpts.DiagnosticsWithHotness", DefaultsToFalse, ChangedBy, @@ -1266,15 +1273,19 @@ Group, Flags<[CC1Option]>, MetaVarName<"">, HelpText<"Prevent optimization remarks from being output if they do not have at least this profile count. " "Use 'auto' to apply the threshold from profile summary">; -def fdiagnostics_show_option : Flag<["-"], "fdiagnostics-show-option">, Group, - HelpText<"Print option name with mappable diagnostics">; -def fdiagnostics_show_note_include_stack : Flag<["-"], "fdiagnostics-show-note-include-stack">, - Group, Flags<[CC1Option]>, HelpText<"Display include stacks for diagnostic notes">; +defm diagnostics_show_option : BoolFOption<"diagnostics-show-option", + "DiagnosticOpts.ShowOptionNames", DefaultsToTrue, + ChangedBy, ResetBy>; +defm diagnostics_show_note_include_stack : BoolFOption<"diagnostics-show-note-include-stack", + "DiagnosticOpts.ShowNoteIncludeStack", DefaultsToFalse, + ChangedBy, + ResetBy, BothFlags<[CC1Option]>>; def fdiagnostics_format_EQ : Joined<["-"], "fdiagnostics-format=">, Group; def fdiagnostics_show_category_EQ : Joined<["-"], "fdiagnostics-show-category=">, Group; def fdiagnostics_show_template_tree : Flag<["-"], "fdiagnostics-show-template-tree">, Group, Flags<[CC1Option]>, - HelpText<"Print a template comparison tree for differing templates">; + HelpText<"Print a template comparison tree for differing templates">, + MarshallingInfoFlag<"DiagnosticOpts.ShowTemplateTree">; def fdeclspec : Flag<["-"], "fdeclspec">, Group, HelpText<"Allow __declspec as a keyword">, Flags<[CC1Option]>; def fdiscard_value_names : Flag<["-"], "fdiscard-value-names">, Group, @@ -1294,7 +1305,8 @@ ResetBy>; def fno_elide_type : Flag<["-"], "fno-elide-type">, Group, Flags<[CC1Option]>, - HelpText<"Do not elide types when printing diagnostics">; + HelpText<"Do not elide types when printing diagnostics">, + MarshallingInfoNegativeFlag<"DiagnosticOpts.ElideType">; def feliminate_unused_debug_symbols : Flag<["-"], "feliminate-unused-debug-symbols">, Group; defm eliminate_unused_debug_types : OptOutFFlag<"eliminate-unused-debug-types", "Do not emit ", "Emit ", " debug info for defined but unused types">; @@ -1798,7 +1810,8 @@ ChangedBy, ResetBy, BothFlags<[], " merging of constants">>; def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, Group, Flags<[CC1Option]>, - HelpText<"Format message diagnostics so that they fit within N columns">; + HelpText<"Format message diagnostics so that they fit within N columns">, + MarshallingInfoStringInt<"DiagnosticOpts.MessageLength">; def fms_extensions : Flag<["-"], "fms-extensions">, Group, Flags<[CC1Option, CoreOption]>, HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; def fms_compatibility : Flag<["-"], "fms-compatibility">, Group, Flags<[CC1Option, CoreOption]>, @@ -1965,11 +1978,6 @@ HelpText<"Compile common globals like normal definitions">; def fno_cxx_modules : Flag <["-"], "fno-cxx-modules">, Group, Flags<[NoXarchOption]>; -def fno_diagnostics_fixit_info : Flag<["-"], "fno-diagnostics-fixit-info">, Group, - Flags<[CC1Option]>, HelpText<"Do not include fixit information in diagnostics">; -def fno_diagnostics_show_option : Flag<["-"], "fno-diagnostics-show-option">, Group, Flags<[CC1Option]>; -def fno_diagnostics_show_note_include_stack : Flag<["-"], "fno-diagnostics-show-note-include-stack">, - Flags<[CC1Option]>, Group; def fdigraphs : Flag<["-"], "fdigraphs">, Group, Flags<[CC1Option]>, HelpText<"Enable alternative token representations '<:', ':>', '<%', '%>', '%:', '%:%:' (default)">; def fno_digraphs : Flag<["-"], "fno-digraphs">, Group, Flags<[CC1Option]>, @@ -2017,10 +2025,9 @@ def fno_operator_names : Flag<["-"], "fno-operator-names">, Group, HelpText<"Do not treat C++ operator name keywords as synonyms for operators">, Flags<[CC1Option]>; -def fno_show_source_location : Flag<["-"], "fno-show-source-location">, Group, - Flags<[CC1Option]>, HelpText<"Do not include source location information with diagnostics">; def fdiagnostics_absolute_paths : Flag<["-"], "fdiagnostics-absolute-paths">, Group, - Flags<[CC1Option, CoreOption]>, HelpText<"Print absolute paths in diagnostics">; + Flags<[CC1Option, CoreOption]>, HelpText<"Print absolute paths in diagnostics">, + MarshallingInfoFlag<"DiagnosticOpts.AbsolutePath">; def fno_stack_protector : Flag<["-"], "fno-stack-protector">, Group, HelpText<"Disable the use of stack protectors">; def fno_strict_aliasing : Flag<["-"], "fno-strict-aliasing">, Group, @@ -2231,9 +2238,17 @@ HelpText<"Force wchar_t to be an unsigned int">; def fshow_overloads_EQ : Joined<["-"], "fshow-overloads=">, Group, Flags<[CC1Option]>, HelpText<"Which overload candidates to show when overload resolution fails: " - "best|all; defaults to all">, Values<"best,all">; -defm show_column : OptOutFFlag<"show-column", "", "Do not include column number on diagnostics">; -def fshow_source_location : Flag<["-"], "fshow-source-location">, Group; + "best|all; defaults to all">, Values<"best,all">, + NormalizedValues<["Ovl_Best", "Ovl_All"]>, + MarshallingInfoString<"DiagnosticOpts.ShowOverloads", "Ovl_All">, AutoNormalizeEnum; +defm show_column : BoolFOption<"show-column", + "DiagnosticOpts.ShowColumn", DefaultsToTrue, + ChangedBy, + ResetBy>; +defm show_source_location : BoolFOption<"show-source-location", + "DiagnosticOpts.ShowLocation", DefaultsToTrue, + ChangedBy, + ResetBy>; defm spell_checking : BoolFOption<"spell-checking", "LangOpts->SpellChecking", DefaultsToTrue, ChangedBy, ResetBy>; @@ -3358,8 +3373,10 @@ MarshallingInfoString<"FrontendOpts.OutputFile">; def pagezero__size : JoinedOrSeparate<["-"], "pagezero_size">; def pass_exit_codes : Flag<["-", "--"], "pass-exit-codes">, Flags<[Unsupported]>; -def pedantic_errors : Flag<["-", "--"], "pedantic-errors">, Group, Flags<[CC1Option]>; -def pedantic : Flag<["-", "--"], "pedantic">, Group, Flags<[CC1Option]>; +def pedantic_errors : Flag<["-", "--"], "pedantic-errors">, Group, Flags<[CC1Option]>, + MarshallingInfoFlag<"DiagnosticOpts.PedanticErrors">; +def pedantic : Flag<["-", "--"], "pedantic">, Group, Flags<[CC1Option]>, + MarshallingInfoFlag<"DiagnosticOpts.Pedantic">; def pg : Flag<["-"], "pg">, HelpText<"Enable mcount instrumentation">, Flags<[CC1Option]>, MarshallingInfoFlag<"CodeGenOpts.InstrumentForProfiling">; def pipe : Flag<["-", "--"], "pipe">, @@ -3527,7 +3544,8 @@ def weak__reference__mismatches : Separate<["-"], "weak_reference_mismatches">; def whatsloaded : Flag<["-"], "whatsloaded">; def whyload : Flag<["-"], "whyload">; -def w : Flag<["-"], "w">, HelpText<"Suppress all warnings">, Flags<[CC1Option]>; +def w : Flag<["-"], "w">, HelpText<"Suppress all warnings">, Flags<[CC1Option]>, + MarshallingInfoFlag<"DiagnosticOpts.IgnoreWarnings">; def x : JoinedOrSeparate<["-"], "x">, Flags<[NoXarchOption,CC1Option]>, HelpText<"Treat subsequent input files as having type ">, MetaVarName<"">; @@ -4645,37 +4663,50 @@ //===----------------------------------------------------------------------===// def diagnostic_log_file : Separate<["-"], "diagnostic-log-file">, - HelpText<"Filename (or -) to log diagnostics to">; + HelpText<"Filename (or -) to log diagnostics to">, + MarshallingInfoString<"DiagnosticOpts.DiagnosticLogFile">; def diagnostic_serialized_file : Separate<["-"], "serialize-diagnostic-file">, MetaVarName<"">, HelpText<"File for serializing diagnostics in a binary format">; def fdiagnostics_format : Separate<["-"], "fdiagnostics-format">, - HelpText<"Change diagnostic formatting to match IDE and command line tools">, Values<"clang,msvc,msvc-fallback,vi">; + HelpText<"Change diagnostic formatting to match IDE and command line tools">, Values<"clang,msvc,msvc-fallback,vi">, + NormalizedValuesScope<"DiagnosticOptions">, NormalizedValues<["Clang", "MSVC", "MSVC", "Vi"]>, + MarshallingInfoString<"DiagnosticOpts.Format", "Clang">, AutoNormalizeEnum; def fdiagnostics_show_category : Separate<["-"], "fdiagnostics-show-category">, - HelpText<"Print diagnostic category">, Values<"none,id,name">; + HelpText<"Print diagnostic category">, Values<"none,id,name">, + NormalizedValues<["0", "1", "2"]>, + MarshallingInfoString<"DiagnosticOpts.ShowCategories", "0">, AutoNormalizeEnum; def fno_diagnostics_use_presumed_location : Flag<["-"], "fno-diagnostics-use-presumed-location">, - HelpText<"Ignore #line directives when displaying diagnostic locations">; + HelpText<"Ignore #line directives when displaying diagnostic locations">, + MarshallingInfoNegativeFlag<"DiagnosticOpts.ShowPresumedLoc">; def ftabstop : Separate<["-"], "ftabstop">, MetaVarName<"">, - HelpText<"Set the tab stop distance.">; + HelpText<"Set the tab stop distance.">, + MarshallingInfoStringInt<"DiagnosticOpts.TabStop", "DiagnosticOptions::DefaultTabStop">; def ferror_limit : Separate<["-"], "ferror-limit">, MetaVarName<"">, - HelpText<"Set the maximum number of errors to emit before stopping (0 = no limit).">; + HelpText<"Set the maximum number of errors to emit before stopping (0 = no limit).">, + MarshallingInfoStringInt<"DiagnosticOpts.ErrorLimit">; def fmacro_backtrace_limit : Separate<["-"], "fmacro-backtrace-limit">, MetaVarName<"">, - HelpText<"Set the maximum number of entries to print in a macro expansion backtrace (0 = no limit).">; + HelpText<"Set the maximum number of entries to print in a macro expansion backtrace (0 = no limit).">, + MarshallingInfoStringInt<"DiagnosticOpts.MacroBacktraceLimit", "DiagnosticOptions::DefaultMacroBacktraceLimit">; def ftemplate_backtrace_limit : Separate<["-"], "ftemplate-backtrace-limit">, MetaVarName<"">, - HelpText<"Set the maximum number of entries to print in a template instantiation backtrace (0 = no limit).">; + HelpText<"Set the maximum number of entries to print in a template instantiation backtrace (0 = no limit).">, + MarshallingInfoStringInt<"DiagnosticOpts.TemplateBacktraceLimit", "DiagnosticOptions::DefaultTemplateBacktraceLimit">; def fconstexpr_backtrace_limit : Separate<["-"], "fconstexpr-backtrace-limit">, MetaVarName<"">, - HelpText<"Set the maximum number of entries to print in a constexpr evaluation backtrace (0 = no limit).">; + HelpText<"Set the maximum number of entries to print in a constexpr evaluation backtrace (0 = no limit).">, + MarshallingInfoStringInt<"DiagnosticOpts.ConstexprBacktraceLimit", "DiagnosticOptions::DefaultConstexprBacktraceLimit">; def fspell_checking_limit : Separate<["-"], "fspell-checking-limit">, MetaVarName<"">, - HelpText<"Set the maximum number of times to perform spell checking on unrecognized identifiers (0 = no limit).">; + HelpText<"Set the maximum number of times to perform spell checking on unrecognized identifiers (0 = no limit).">, + MarshallingInfoStringInt<"DiagnosticOpts.SpellCheckingLimit", "DiagnosticOptions::DefaultSpellCheckingLimit">; def fcaret_diagnostics_max_lines : Separate<["-"], "fcaret-diagnostics-max-lines">, MetaVarName<"">, - HelpText<"Set the maximum number of source lines to show in a caret diagnostic">; + HelpText<"Set the maximum number of source lines to show in a caret diagnostic">, + MarshallingInfoStringInt<"DiagnosticOpts.SnippetLineLimit", "DiagnosticOptions::DefaultSnippetLineLimit">; def verify_EQ : CommaJoined<["-"], "verify=">, MetaVarName<"">, HelpText<"Verify diagnostic output using comment directives that start with" " prefixes in the comma-separated sequence ">, - MarshallingInfoStringVector<"DiagnosticOpts->VerifyPrefixes">; + MarshallingInfoStringVector<"DiagnosticOpts.VerifyPrefixes">; def verify : Flag<["-"], "verify">, HelpText<"Equivalent to -verify=expected">; def verify_ignore_unexpected : Flag<["-"], "verify-ignore-unexpected">, @@ -4683,7 +4714,8 @@ def verify_ignore_unexpected_EQ : CommaJoined<["-"], "verify-ignore-unexpected=">, HelpText<"Ignore unexpected diagnostic messages">; def Wno_rewrite_macros : Flag<["-"], "Wno-rewrite-macros">, - HelpText<"Silence ObjC rewriting warnings">; + HelpText<"Silence ObjC rewriting warnings">, + MarshallingInfoFlag<"DiagnosticOpts.NoRewriteMacros">; //===----------------------------------------------------------------------===// // Frontend Options diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -394,13 +394,12 @@ IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, MERGER, EXTRACTOR, \ TABLE_INDEX) \ if ((FLAGS)&options::CC1Option) { \ - this->KEYPATH = MERGER(this->KEYPATH, DEFAULT_VALUE); \ + KEYPATH = MERGER(KEYPATH, DEFAULT_VALUE); \ if (IMPLIED_CHECK) \ - this->KEYPATH = MERGER(this->KEYPATH, IMPLIED_VALUE); \ + KEYPATH = MERGER(KEYPATH, IMPLIED_VALUE); \ if (auto MaybeValue = \ NORMALIZER(OPT_##ID, TABLE_INDEX, Args, Diags, Success)) \ - this->KEYPATH = MERGER( \ - this->KEYPATH, static_castKEYPATH)>(*MaybeValue)); \ + KEYPATH = MERGER(KEYPATH, static_cast(*MaybeValue)); \ } /// Expects the following variables to be visible: @@ -417,18 +416,17 @@ [&](const auto &Extracted) { \ if (ALWAYS_EMIT || \ (Extracted != \ - static_castKEYPATH)>( \ - (IMPLIED_CHECK) ? (IMPLIED_VALUE) : (DEFAULT_VALUE)))) \ + static_cast((IMPLIED_CHECK) ? (IMPLIED_VALUE) \ + : (DEFAULT_VALUE)))) \ DENORMALIZER(Args, SPELLING, SA, Option::KIND##Class, TABLE_INDEX, \ Extracted); \ - }(EXTRACTOR(this->KEYPATH)); \ + }(EXTRACTOR(KEYPATH)); \ } static void FixupInvocation(CompilerInvocation &Invocation, DiagnosticsEngine &Diags, const InputArgList &Args) { LangOptions &LangOpts = *Invocation.getLangOpts(); - DiagnosticOptions &DiagOpts = Invocation.getDiagnosticOpts(); CodeGenOptions &CodeGenOpts = Invocation.getCodeGenOpts(); TargetOptions &TargetOpts = Invocation.getTargetOpts(); FrontendOptions &FrontendOpts = Invocation.getFrontendOpts(); @@ -442,8 +440,6 @@ LangOpts.SpeculativeLoadHardening = CodeGenOpts.SpeculativeLoadHardening; LangOpts.CurrentModule = LangOpts.ModuleName; - llvm::sys::Process::UseANSIEscapeCodes(DiagOpts.UseANSIEscapeCodes); - llvm::Triple T(TargetOpts.Triple); llvm::Triple::ArchType Arch = T.getArch(); @@ -1447,82 +1443,22 @@ bool DefaultDiagColor) { bool Success = true; - Opts.DiagnosticLogFile = - std::string(Args.getLastArgValue(OPT_diagnostic_log_file)); + DiagnosticOptions &DiagnosticOpts = Opts; + +#define DIAG_OPTION_WITH_MARSHALLING PARSE_OPTION_WITH_MARSHALLING +#include "clang/Driver/Options.inc" +#undef DIAG_OPTION_WITH_MARSHALLING + + llvm::sys::Process::UseANSIEscapeCodes(Opts.UseANSIEscapeCodes); + if (Arg *A = Args.getLastArg(OPT_diagnostic_serialized_file, OPT__serialize_diags)) Opts.DiagnosticSerializationFile = A->getValue(); - Opts.IgnoreWarnings = Args.hasArg(OPT_w); - Opts.NoRewriteMacros = Args.hasArg(OPT_Wno_rewrite_macros); - Opts.Pedantic = Args.hasArg(OPT_pedantic); - Opts.PedanticErrors = Args.hasArg(OPT_pedantic_errors); - Opts.ShowCarets = !Args.hasArg(OPT_fno_caret_diagnostics); Opts.ShowColors = parseShowColorsArgs(Args, DefaultDiagColor); - Opts.ShowColumn = !Args.hasArg(OPT_fno_show_column); - Opts.ShowFixits = !Args.hasArg(OPT_fno_diagnostics_fixit_info); - Opts.ShowLocation = !Args.hasArg(OPT_fno_show_source_location); - Opts.AbsolutePath = Args.hasArg(OPT_fdiagnostics_absolute_paths); - Opts.ShowOptionNames = !Args.hasArg(OPT_fno_diagnostics_show_option); - - // Default behavior is to not to show note include stacks. - Opts.ShowNoteIncludeStack = false; - if (Arg *A = Args.getLastArg(OPT_fdiagnostics_show_note_include_stack, - OPT_fno_diagnostics_show_note_include_stack)) - if (A->getOption().matches(OPT_fdiagnostics_show_note_include_stack)) - Opts.ShowNoteIncludeStack = true; - - StringRef ShowOverloads = - Args.getLastArgValue(OPT_fshow_overloads_EQ, "all"); - if (ShowOverloads == "best") - Opts.setShowOverloads(Ovl_Best); - else if (ShowOverloads == "all") - Opts.setShowOverloads(Ovl_All); - else { - Success = false; - if (Diags) - Diags->Report(diag::err_drv_invalid_value) - << Args.getLastArg(OPT_fshow_overloads_EQ)->getAsString(Args) - << ShowOverloads; - } - - StringRef ShowCategory = - Args.getLastArgValue(OPT_fdiagnostics_show_category, "none"); - if (ShowCategory == "none") - Opts.ShowCategories = 0; - else if (ShowCategory == "id") - Opts.ShowCategories = 1; - else if (ShowCategory == "name") - Opts.ShowCategories = 2; - else { - Success = false; - if (Diags) - Diags->Report(diag::err_drv_invalid_value) - << Args.getLastArg(OPT_fdiagnostics_show_category)->getAsString(Args) - << ShowCategory; - } - - StringRef Format = - Args.getLastArgValue(OPT_fdiagnostics_format, "clang"); - if (Format == "clang") - Opts.setFormat(DiagnosticOptions::Clang); - else if (Format == "msvc") - Opts.setFormat(DiagnosticOptions::MSVC); - else if (Format == "msvc-fallback") { - Opts.setFormat(DiagnosticOptions::MSVC); + + if (Args.getLastArgValue(OPT_fdiagnostics_format) == "msvc-fallback") Opts.CLFallbackMode = true; - } else if (Format == "vi") - Opts.setFormat(DiagnosticOptions::Vi); - else { - Success = false; - if (Diags) - Diags->Report(diag::err_drv_invalid_value) - << Args.getLastArg(OPT_fdiagnostics_format)->getAsString(Args) - << Format; - } - Opts.ShowSourceRanges = Args.hasArg(OPT_fdiagnostics_print_source_range_info); - Opts.ShowParseableFixits = Args.hasArg(OPT_fdiagnostics_parseable_fixits); - Opts.ShowPresumedLoc = !Args.hasArg(OPT_fno_diagnostics_use_presumed_location); Opts.VerifyDiagnostics = Args.hasArg(OPT_verify) || Args.hasArg(OPT_verify_EQ); if (Args.hasArg(OPT_verify)) Opts.VerifyPrefixes.push_back("expected"); @@ -1541,34 +1477,12 @@ if (Args.hasArg(OPT_verify_ignore_unexpected)) DiagMask = DiagnosticLevelMask::All; Opts.setVerifyIgnoreUnexpected(DiagMask); - Opts.ElideType = !Args.hasArg(OPT_fno_elide_type); - Opts.ShowTemplateTree = Args.hasArg(OPT_fdiagnostics_show_template_tree); - Opts.ErrorLimit = getLastArgIntValue(Args, OPT_ferror_limit, 0, Diags); - Opts.MacroBacktraceLimit = - getLastArgIntValue(Args, OPT_fmacro_backtrace_limit, - DiagnosticOptions::DefaultMacroBacktraceLimit, Diags); - Opts.TemplateBacktraceLimit = getLastArgIntValue( - Args, OPT_ftemplate_backtrace_limit, - DiagnosticOptions::DefaultTemplateBacktraceLimit, Diags); - Opts.ConstexprBacktraceLimit = getLastArgIntValue( - Args, OPT_fconstexpr_backtrace_limit, - DiagnosticOptions::DefaultConstexprBacktraceLimit, Diags); - Opts.SpellCheckingLimit = getLastArgIntValue( - Args, OPT_fspell_checking_limit, - DiagnosticOptions::DefaultSpellCheckingLimit, Diags); - Opts.SnippetLineLimit = getLastArgIntValue( - Args, OPT_fcaret_diagnostics_max_lines, - DiagnosticOptions::DefaultSnippetLineLimit, Diags); - Opts.TabStop = getLastArgIntValue(Args, OPT_ftabstop, - DiagnosticOptions::DefaultTabStop, Diags); if (Opts.TabStop == 0 || Opts.TabStop > DiagnosticOptions::MaxTabStop) { Opts.TabStop = DiagnosticOptions::DefaultTabStop; if (Diags) Diags->Report(diag::warn_ignoring_ftabstop_value) << Opts.TabStop << DiagnosticOptions::DefaultTabStop; } - Opts.MessageLength = - getLastArgIntValue(Args, OPT_fmessage_length_EQ, 0, Diags); addDiagnosticArgs(Args, OPT_W_Group, OPT_W_value_Group, Opts.Warnings); addDiagnosticArgs(Args, OPT_R_Group, OPT_R_value_Group, Opts.Remarks); @@ -3285,9 +3199,16 @@ void CompilerInvocation::generateCC1CommandLine( SmallVectorImpl &Args, StringAllocator SA) const { + // We need DiagnosticOpts to be a reference, because the TableGen records + // use `DiagnosticOpts.Xxx` as keypath. Using the raw member pointer is not + // possible, as diagnostic options are being parsed by a free-standing + // function `ParseDiagnosticArgs` that takes a reference. + DiagnosticOptions& DiagnosticOpts = getDiagnosticOpts(); #define OPTION_WITH_MARSHALLING GENERATE_OPTION_WITH_MARSHALLING +#define DIAG_OPTION_WITH_MARSHALLING GENERATE_OPTION_WITH_MARSHALLING #include "clang/Driver/Options.inc" +#undef DIAG_OPTION_WITH_MARSHALLING #undef OPTION_WITH_MARSHALLING } diff --git a/llvm/utils/TableGen/OptParserEmitter.cpp b/llvm/utils/TableGen/OptParserEmitter.cpp --- a/llvm/utils/TableGen/OptParserEmitter.cpp +++ b/llvm/utils/TableGen/OptParserEmitter.cpp @@ -99,6 +99,13 @@ MarshallingInfo(const Record &R) : R(R) {} + std::string getMacroName() const { + if (KeyPath.startswith("DiagnosticOpts.")) + return (Twine("DIAG_") + MarshallingInfo::MacroName).str(); + + return MarshallingInfo::MacroName; + } + void emit(raw_ostream &OS) const { write_cstring(OS, StringRef(getOptionSpelling(R))); OS << ", "; @@ -420,13 +427,13 @@ MarshallingInfos.push_back(createMarshallingInfo(*R)); for (const auto &MI : MarshallingInfos) { - OS << "#ifdef " << MarshallingInfo::MacroName << "\n"; - OS << MarshallingInfo::MacroName << "("; + OS << "#ifdef " << MI.getMacroName() << "\n"; + OS << MI.getMacroName() << "("; WriteOptRecordFields(OS, MI.R); OS << ", "; MI.emit(OS); OS << ")\n"; - OS << "#endif // " << MarshallingInfo::MacroName << "\n"; + OS << "#endif // " << MI.getMacroName() << "\n"; } OS << "\n";