Author: Jan Svoboda Date: 2021-03-02T11:53:40+01:00 New Revision: 4545813b17e3079af424764a7aa44b629e04b7c1
URL: https://github.com/llvm/llvm-project/commit/4545813b17e3079af424764a7aa44b629e04b7c1 DIFF: https://github.com/llvm/llvm-project/commit/4545813b17e3079af424764a7aa44b629e04b7c1.diff LOG: [clang][cli] NFC: Rename marshalling multiclass The new name drops `String` from `MarshallingInfoStringInt`, which follows the naming convention of other marshalling multiclasses. Added: Modified: clang/docs/InternalsManual.rst clang/include/clang/Driver/Options.td llvm/include/llvm/Option/OptParser.td Removed: ################################################################################ diff --git a/clang/docs/InternalsManual.rst b/clang/docs/InternalsManual.rst index bc574f4ae2d9..4bae84295ec8 100644 --- a/clang/docs/InternalsManual.rst +++ b/clang/docs/InternalsManual.rst @@ -936,7 +936,7 @@ and the result is assigned to the key path on success. .. code-block:: text def mstack_probe_size : Joined<["-"], "mstack-probe-size=">, Flags<[CC1Option]>, - MarshallingInfoStringInt<CodeGenOpts<"StackProbeSize">, "4096">; + MarshallingInfoInt<CodeGenOpts<"StackProbeSize">, "4096">; **Enumeration** diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 20dcac5d08ad..72213ed51ce2 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -934,7 +934,7 @@ defm gpu_exclude_wrong_side_overloads : BoolFOption<"gpu-exclude-wrong-side-over def gpu_max_threads_per_block_EQ : Joined<["--"], "gpu-max-threads-per-block=">, Flags<[CC1Option]>, HelpText<"Default max threads per block for kernel launch bounds for HIP">, - MarshallingInfoStringInt<LangOpts<"GPUMaxThreadsPerBlock">, "1024">, + MarshallingInfoInt<LangOpts<"GPUMaxThreadsPerBlock">, "1024">, ShouldParseIf<hip.KeyPath>; def gpu_instrument_lib_EQ : Joined<["--"], "gpu-instrument-lib=">, HelpText<"Instrument device library for HIP, which is a LLVM bitcode containing " @@ -1008,7 +1008,7 @@ def exported__symbols__list : Separate<["-"], "exported_symbols_list">; def e : JoinedOrSeparate<["-"], "e">, Flags<[LinkerInput]>, Group<Link_Group>; def fmax_tokens_EQ : Joined<["-"], "fmax-tokens=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Max total number of preprocessed tokens for -Wmax-tokens.">, - MarshallingInfoStringInt<LangOpts<"MaxTokens">>; + MarshallingInfoInt<LangOpts<"MaxTokens">>; def fPIC : Flag<["-"], "fPIC">, Group<f_Group>; def fno_PIC : Flag<["-"], "fno-PIC">, Group<f_Group>; def fPIE : Flag<["-"], "fPIE">, Group<f_Group>; @@ -1480,7 +1480,7 @@ def : Joined<["-"], "fsanitize-coverage-blacklist=">, def fsanitize_memory_track_origins_EQ : Joined<["-"], "fsanitize-memory-track-origins=">, Group<f_clang_Group>, HelpText<"Enable origins tracking in MemorySanitizer">, - MarshallingInfoStringInt<CodeGenOpts<"SanitizeMemoryTrackOrigins">>; + MarshallingInfoInt<CodeGenOpts<"SanitizeMemoryTrackOrigins">>; def fsanitize_memory_track_origins : Flag<["-"], "fsanitize-memory-track-origins">, Group<f_clang_Group>, HelpText<"Enable origins tracking in MemorySanitizer">; @@ -1496,7 +1496,7 @@ defm sanitize_memory_use_after_dtor : BoolOption<"f", "sanitize-memory-use-after def fsanitize_address_field_padding : Joined<["-"], "fsanitize-address-field-padding=">, Group<f_clang_Group>, HelpText<"Level of field padding for AddressSanitizer">, - MarshallingInfoStringInt<LangOpts<"SanitizeAddressFieldPadding">>; + MarshallingInfoInt<LangOpts<"SanitizeAddressFieldPadding">>; defm sanitize_address_use_after_scope : BoolOption<"f", "sanitize-address-use-after-scope", CodeGenOpts<"SanitizeAddressUseAfterScope">, DefaultFalse, PosFlag<SetTrue, [], "Enable">, NegFlag<SetFalse, [CoreOption, NoXarchOption], "Disable">, @@ -1621,7 +1621,7 @@ def fsanitize_undefined_strip_path_components_EQ : Joined<["-"], "fsanitize-unde Group<f_clang_Group>, MetaVarName<"<number>">, HelpText<"Strip (or keep only, if negative) a given number of path components " "when emitting check metadata.">, - MarshallingInfoStringInt<CodeGenOpts<"EmitCheckPathComponentsToStrip">, "0", "int">; + MarshallingInfoInt<CodeGenOpts<"EmitCheckPathComponentsToStrip">, "0", "int">; } // end -f[no-]sanitize* flags @@ -1775,7 +1775,7 @@ def fxray_instruction_threshold_EQ : JoinedOrSeparate<["-"], "fxray-instruction-threshold=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Sets the minimum function size to instrument with XRay">, - MarshallingInfoStringInt<CodeGenOpts<"XRayInstructionThreshold">, "200">; + MarshallingInfoInt<CodeGenOpts<"XRayInstructionThreshold">, "200">; def fxray_instruction_threshold_ : JoinedOrSeparate<["-"], "fxray-instruction-threshold">, Group<f_Group>, Flags<[CC1Option]>; @@ -1839,13 +1839,13 @@ def fxray_function_groups : Joined<["-"], "fxray-function-groups=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Only instrument 1 of N groups">, - MarshallingInfoStringInt<CodeGenOpts<"XRayTotalFunctionGroups">, "1">; + MarshallingInfoInt<CodeGenOpts<"XRayTotalFunctionGroups">, "1">; def fxray_selected_function_group : Joined<["-"], "fxray-selected-function-group=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"When using -fxray-function-groups, select which group of functions to instrument. Valid range is 0 to fxray-function-groups - 1">, - MarshallingInfoStringInt<CodeGenOpts<"XRaySelectedFunctionGroup">, "0">; + MarshallingInfoInt<CodeGenOpts<"XRaySelectedFunctionGroup">, "0">; defm fine_grained_bitfield_accesses : BoolOption<"f", "fine-grained-bitfield-accesses", @@ -1900,7 +1900,7 @@ defm merge_all_constants : BoolFOption<"merge-all-constants", BothFlags<[], " merging of constants">>; def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Format message diagnostics so that they fit within N columns">, - MarshallingInfoStringInt<DiagnosticOpts<"MessageLength">>; + MarshallingInfoInt<DiagnosticOpts<"MessageLength">>; def fms_compatibility : Flag<["-"], "fms-compatibility">, Group<f_Group>, Flags<[CC1Option, CoreOption]>, HelpText<"Enable full Microsoft Visual C++ compatibility">, MarshallingInfoFlag<LangOpts<"MSVCCompat">>; @@ -1962,15 +1962,15 @@ defm prebuilt_implicit_modules : BoolFOption<"prebuilt-implicit-modules", def fmodules_prune_interval : Joined<["-"], "fmodules-prune-interval=">, Group<i_Group>, Flags<[CC1Option]>, MetaVarName<"<seconds>">, HelpText<"Specify the interval (in seconds) between attempts to prune the module cache">, - MarshallingInfoStringInt<HeaderSearchOpts<"ModuleCachePruneInterval">, "7 * 24 * 60 * 60">; + MarshallingInfoInt<HeaderSearchOpts<"ModuleCachePruneInterval">, "7 * 24 * 60 * 60">; def fmodules_prune_after : Joined<["-"], "fmodules-prune-after=">, Group<i_Group>, Flags<[CC1Option]>, MetaVarName<"<seconds>">, HelpText<"Specify the interval (in seconds) after which a module file will be considered unused">, - MarshallingInfoStringInt<HeaderSearchOpts<"ModuleCachePruneAfter">, "31 * 24 * 60 * 60">; + MarshallingInfoInt<HeaderSearchOpts<"ModuleCachePruneAfter">, "31 * 24 * 60 * 60">; def fbuild_session_timestamp : Joined<["-"], "fbuild-session-timestamp=">, Group<i_Group>, Flags<[CC1Option]>, MetaVarName<"<time since Epoch in seconds>">, HelpText<"Time when the current build session started">, - MarshallingInfoStringInt<HeaderSearchOpts<"BuildSessionTimestamp">, "0", "uint64_t">; + MarshallingInfoInt<HeaderSearchOpts<"BuildSessionTimestamp">, "0", "uint64_t">; def fbuild_session_file : Joined<["-"], "fbuild-session-file=">, Group<i_Group>, MetaVarName<"<file>">, HelpText<"Use the last modification time of <file> as the build session timestamp">; @@ -2188,7 +2188,7 @@ defm aligned_allocation : BoolFOption<"aligned-allocation", def fnew_alignment_EQ : Joined<["-"], "fnew-alignment=">, HelpText<"Specifies the largest alignment guaranteed by '::operator new(size_t)'">, MetaVarName<"<align>">, Group<f_Group>, Flags<[CC1Option]>, - MarshallingInfoStringInt<LangOpts<"NewAlignOverride">>; + MarshallingInfoInt<LangOpts<"NewAlignOverride">>; def : Separate<["-"], "fnew-alignment">, Alias<fnew_alignment_EQ>; def : Flag<["-"], "faligned-new">, Alias<faligned_allocation>; def : Flag<["-"], "fno-aligned-new">, Alias<fno_aligned_allocation>; @@ -2273,10 +2273,10 @@ def fpack_struct : Flag<["-"], "fpack-struct">, Group<f_Group>; def fno_pack_struct : Flag<["-"], "fno-pack-struct">, Group<f_Group>; def fpack_struct_EQ : Joined<["-"], "fpack-struct=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Specify the default maximum struct packing alignment">, - MarshallingInfoStringInt<LangOpts<"PackStruct">>; + MarshallingInfoInt<LangOpts<"PackStruct">>; def fmax_type_align_EQ : Joined<["-"], "fmax-type-align=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Specify the maximum alignment to enforce on pointers lacking an explicit alignment">, - MarshallingInfoStringInt<LangOpts<"MaxTypeAlign">>; + MarshallingInfoInt<LangOpts<"MaxTypeAlign">>; def fno_max_type_align : Flag<["-"], "fno-max-type-align">, Group<f_Group>; defm pascal_strings : BoolFOption<"pascal-strings", LangOpts<"PascalStrings">, DefaultFalse, @@ -2287,7 +2287,7 @@ defm pascal_strings : BoolFOption<"pascal-strings", // are treated as a single integer. def fpatchable_function_entry_EQ : Joined<["-"], "fpatchable-function-entry=">, Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<N,M>">, HelpText<"Generate M NOPs before function entry and N-M NOPs after function entry">, - MarshallingInfoStringInt<CodeGenOpts<"PatchableFunctionEntryCount">>; + MarshallingInfoInt<CodeGenOpts<"PatchableFunctionEntryCount">>; def fpcc_struct_return : Flag<["-"], "fpcc-struct-return">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Override the default ABI to return all structs on the stack">; def fpch_preprocess : Flag<["-"], "fpch-preprocess">, Group<f_Group>; @@ -2403,7 +2403,7 @@ def enable_trivial_var_init_zero : Flag<["-"], "enable-trivial-auto-var-init-zer HelpText<"Trivial automatic variable initialization to zero is only here for benchmarks, it'll eventually be removed, and I'm OK with that because I'm only using it to benchmark">; def ftrivial_auto_var_init_stop_after : Joined<["-"], "ftrivial-auto-var-init-stop-after=">, Group<f_Group>, Flags<[CC1Option, CoreOption]>, HelpText<"Stop initializing trivial automatic stack variables after the specified number of instances">, - MarshallingInfoStringInt<LangOpts<"TrivialAutoVarInitStopAfter">>; + MarshallingInfoInt<LangOpts<"TrivialAutoVarInitStopAfter">>; def fstandalone_debug : Flag<["-"], "fstandalone-debug">, Group<f_Group>, Flags<[CoreOption]>, HelpText<"Emit full debug info for all types used by the program">; def fno_standalone_debug : Flag<["-"], "fno-standalone-debug">, Group<f_Group>, Flags<[CoreOption]>, @@ -2466,7 +2466,7 @@ def Wlarge_by_value_copy_def : Flag<["-"], "Wlarge-by-value-copy">, HelpText<"Warn if a function definition returns or accepts an object larger " "in bytes than a given value">, Flags<[HelpHidden]>; def Wlarge_by_value_copy_EQ : Joined<["-"], "Wlarge-by-value-copy=">, Flags<[CC1Option]>, - MarshallingInfoStringInt<LangOpts<"NumLargeByValueCopy">>; + MarshallingInfoInt<LangOpts<"NumLargeByValueCopy">>; // These "special" warning flags are effectively processed as f_Group flags by the driver: // Just silence warnings about -Wlarger-than for now. @@ -2497,7 +2497,7 @@ can be analyzed with chrome://tracing or `Speedscope App def ftime_trace_granularity_EQ : Joined<["-"], "ftime-trace-granularity=">, Group<f_Group>, HelpText<"Minimum time granularity (in microseconds) traced by time profiler">, Flags<[CC1Option, CoreOption]>, - MarshallingInfoStringInt<FrontendOpts<"TimeTraceGranularity">, "500u">; + MarshallingInfoInt<FrontendOpts<"TimeTraceGranularity">, "500u">; def fproc_stat_report : Joined<["-"], "fproc-stat-report">, Group<f_Group>, HelpText<"Print subprocess statistics">; def fproc_stat_report_EQ : Joined<["-"], "fproc-stat-report=">, Group<f_Group>, @@ -2881,7 +2881,7 @@ def mlong_calls : Flag<["-"], "mlong-calls">, Group<m_Group>, HelpText<"Generate branches with extended addressability, usually via indirect jumps.">; def mdouble_EQ : Joined<["-"], "mdouble=">, Group<m_Group>, Values<"32,64">, Flags<[CC1Option]>, HelpText<"Force double to be 32 bits or 64 bits">, - MarshallingInfoStringInt<LangOpts<"DoubleSize">, "0">; + MarshallingInfoInt<LangOpts<"DoubleSize">, "0">; def LongDouble_Group : OptionGroup<"<LongDouble group>">, Group<m_Group>, DocName<"Long double flags">, DocBrief<[{Selects the long double implementation}]>; @@ -2915,7 +2915,7 @@ def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>, Flags<[CC1Option]>, def mtls_size_EQ : Joined<["-"], "mtls-size=">, Group<m_Group>, Flags<[NoXarchOption, CC1Option]>, HelpText<"Specify bit size of immediate TLS offsets (AArch64 ELF only): " "12 (for 4KB) | 24 (for 16MB, default) | 32 (for 4GB) | 48 (for 256TB, needs -mcmodel=large)">, - MarshallingInfoStringInt<CodeGenOpts<"TLSSize">>; + MarshallingInfoInt<CodeGenOpts<"TLSSize">>; def mimplicit_it_EQ : Joined<["-"], "mimplicit-it=">, Group<m_Group>; def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Group<m_Group>; def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group<m_Group>; @@ -2973,10 +2973,10 @@ def mstackrealign : Flag<["-"], "mstackrealign">, Group<m_Group>, Flags<[CC1Opti MarshallingInfoFlag<CodeGenOpts<"StackRealignment">>; def mstack_alignment : Joined<["-"], "mstack-alignment=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Set the stack alignment">, - MarshallingInfoStringInt<CodeGenOpts<"StackAlignment">>; + MarshallingInfoInt<CodeGenOpts<"StackAlignment">>; def mstack_probe_size : Joined<["-"], "mstack-probe-size=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Set the stack probe size">, - MarshallingInfoStringInt<CodeGenOpts<"StackProbeSize">, "4096">; + MarshallingInfoInt<CodeGenOpts<"StackProbeSize">, "4096">; def mstack_arg_probe : Flag<["-"], "mstack-arg-probe">, Group<m_Group>, HelpText<"Enable stack probes">; def mno_stack_arg_probe : Flag<["-"], "mno-stack-arg-probe">, Group<m_Group>, Flags<[CC1Option]>, @@ -3310,7 +3310,7 @@ def mstack_protector_guard_EQ : Joined<["-"], "mstack-protector-guard=">, Group< MarshallingInfoString<CodeGenOpts<"StackProtectorGuard">>; def mstack_protector_guard_offset_EQ : Joined<["-"], "mstack-protector-guard-offset=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Use the given offset for addressing the stack-protector guard">, - MarshallingInfoStringInt<CodeGenOpts<"StackProtectorGuardOffset">, "(unsigned)-1">; + MarshallingInfoInt<CodeGenOpts<"StackProtectorGuardOffset">, "(unsigned)-1">; def mstack_protector_guard_reg_EQ : Joined<["-"], "mstack-protector-guard-reg=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Use the given reg for addressing the stack-protector guard">, MarshallingInfoString<CodeGenOpts<"StackProtectorGuardReg">, [{"none"}]>; @@ -4451,7 +4451,7 @@ def analyzer_dump_egraph_EQ : Joined<["-"], "analyzer-dump-egraph=">, Alias<anal def analyzer_inline_max_stack_depth : Separate<["-"], "analyzer-inline-max-stack-depth">, HelpText<"Bound on stack depth while inlining (4 by default)">, // Cap the stack depth at 4 calls (5 stack frames, base + 4 calls). - MarshallingInfoStringInt<AnalyzerOpts<"InlineMaxStackDepth">, "5">; + MarshallingInfoInt<AnalyzerOpts<"InlineMaxStackDepth">, "5">; def analyzer_inline_max_stack_depth_EQ : Joined<["-"], "analyzer-inline-max-stack-depth=">, Alias<analyzer_inline_max_stack_depth>; @@ -4465,7 +4465,7 @@ def analyzer_disable_retry_exhausted : Flag<["-"], "analyzer-disable-retry-exhau def analyzer_max_loop : Separate<["-"], "analyzer-max-loop">, HelpText<"The maximum number of times the analyzer will go through a loop">, - MarshallingInfoStringInt<AnalyzerOpts<"maxBlockVisitOnPath">, "4">; + MarshallingInfoInt<AnalyzerOpts<"maxBlockVisitOnPath">, "4">; def analyzer_stats : Flag<["-"], "analyzer-stats">, HelpText<"Print internal analyzer statistics.">, MarshallingInfoFlag<AnalyzerOpts<"PrintStats">>; @@ -4574,7 +4574,7 @@ def default_function_attr : Separate<["-"], "default-function-attr">, HelpText<"Apply given attribute to all functions">, MarshallingInfoStringVector<CodeGenOpts<"DefaultFunctionAttrs">>; def dwarf_version_EQ : Joined<["-"], "dwarf-version=">, - MarshallingInfoStringInt<CodeGenOpts<"DwarfVersion">>; + MarshallingInfoInt<CodeGenOpts<"DwarfVersion">>; def debugger_tuning_EQ : Joined<["-"], "debugger-tuning=">, Values<"gdb,lldb,sce">, NormalizedValuesScope<"llvm::DebuggerKind">, NormalizedValues<["GDB", "LLDB", "SCE"]>, @@ -4726,10 +4726,10 @@ def split_stacks : Flag<["-"], "split-stacks">, MarshallingInfoFlag<CodeGenOpts<"EnableSegmentedStacks">>; def mregparm : Separate<["-"], "mregparm">, HelpText<"Limit the number of registers available for integer arguments">, - MarshallingInfoStringInt<CodeGenOpts<"NumRegisterParameters">>; + MarshallingInfoInt<CodeGenOpts<"NumRegisterParameters">>; def msmall_data_limit : Separate<["-"], "msmall-data-limit">, HelpText<"Put global and static data smaller than the limit into a special section">, - MarshallingInfoStringInt<CodeGenOpts<"SmallDataLimit">>; + MarshallingInfoInt<CodeGenOpts<"SmallDataLimit">>; def munwind_tables : Flag<["-"], "munwind-tables">, HelpText<"Generate unwinding tables for all functions">, MarshallingInfoFlag<CodeGenOpts<"UnwindTables">>; @@ -4757,7 +4757,7 @@ def linker_option : Joined<["--"], "linker-option=">, MarshallingInfoStringVector<CodeGenOpts<"LinkerOptions">>; def fsanitize_coverage_type : Joined<["-"], "fsanitize-coverage-type=">, HelpText<"Sanitizer coverage type">, - MarshallingInfoStringInt<CodeGenOpts<"SanitizeCoverageType">>; + MarshallingInfoInt<CodeGenOpts<"SanitizeCoverageType">>; def fsanitize_coverage_indirect_calls : Flag<["-"], "fsanitize-coverage-indirect-calls">, HelpText<"Enable sanitizer coverage for indirect calls">, @@ -4813,7 +4813,7 @@ def fsanitize_coverage_stack_depth def fpatchable_function_entry_offset_EQ : Joined<["-"], "fpatchable-function-entry-offset=">, MetaVarName<"<M>">, HelpText<"Generate M NOPs before function entry">, - MarshallingInfoStringInt<CodeGenOpts<"PatchableFunctionEntryOffset">>; + MarshallingInfoInt<CodeGenOpts<"PatchableFunctionEntryOffset">>; def fprofile_instrument_EQ : Joined<["-"], "fprofile-instrument=">, HelpText<"Enable PGO instrumentation. The accepted value is clang, llvm, " "or none">, Values<"none,clang,llvm,csllvm">, @@ -4903,26 +4903,26 @@ def fno_diagnostics_use_presumed_location : Flag<["-"], "fno-diagnostics-use-pre MarshallingInfoNegativeFlag<DiagnosticOpts<"ShowPresumedLoc">>; def ftabstop : Separate<["-"], "ftabstop">, MetaVarName<"<N>">, HelpText<"Set the tab stop distance.">, - MarshallingInfoStringInt<DiagnosticOpts<"TabStop">, "DiagnosticOptions::DefaultTabStop">; + MarshallingInfoInt<DiagnosticOpts<"TabStop">, "DiagnosticOptions::DefaultTabStop">; def ferror_limit : Separate<["-"], "ferror-limit">, MetaVarName<"<N>">, HelpText<"Set the maximum number of errors to emit before stopping (0 = no limit).">, - MarshallingInfoStringInt<DiagnosticOpts<"ErrorLimit">>; + MarshallingInfoInt<DiagnosticOpts<"ErrorLimit">>; def fmacro_backtrace_limit : Separate<["-"], "fmacro-backtrace-limit">, MetaVarName<"<N>">, HelpText<"Set the maximum number of entries to print in a macro expansion backtrace (0 = no limit).">, - MarshallingInfoStringInt<DiagnosticOpts<"MacroBacktraceLimit">, "DiagnosticOptions::DefaultMacroBacktraceLimit">; + MarshallingInfoInt<DiagnosticOpts<"MacroBacktraceLimit">, "DiagnosticOptions::DefaultMacroBacktraceLimit">; def ftemplate_backtrace_limit : Separate<["-"], "ftemplate-backtrace-limit">, MetaVarName<"<N>">, HelpText<"Set the maximum number of entries to print in a template instantiation backtrace (0 = no limit).">, - MarshallingInfoStringInt<DiagnosticOpts<"TemplateBacktraceLimit">, "DiagnosticOptions::DefaultTemplateBacktraceLimit">; + MarshallingInfoInt<DiagnosticOpts<"TemplateBacktraceLimit">, "DiagnosticOptions::DefaultTemplateBacktraceLimit">; def fconstexpr_backtrace_limit : Separate<["-"], "fconstexpr-backtrace-limit">, MetaVarName<"<N>">, HelpText<"Set the maximum number of entries to print in a constexpr evaluation backtrace (0 = no limit).">, - MarshallingInfoStringInt<DiagnosticOpts<"ConstexprBacktraceLimit">, "DiagnosticOptions::DefaultConstexprBacktraceLimit">; + MarshallingInfoInt<DiagnosticOpts<"ConstexprBacktraceLimit">, "DiagnosticOptions::DefaultConstexprBacktraceLimit">; def fspell_checking_limit : Separate<["-"], "fspell-checking-limit">, MetaVarName<"<N>">, HelpText<"Set the maximum number of times to perform spell checking on unrecognized identifiers (0 = no limit).">, - MarshallingInfoStringInt<DiagnosticOpts<"SpellCheckingLimit">, "DiagnosticOptions::DefaultSpellCheckingLimit">; + MarshallingInfoInt<DiagnosticOpts<"SpellCheckingLimit">, "DiagnosticOptions::DefaultSpellCheckingLimit">; def fcaret_diagnostics_max_lines : Separate<["-"], "fcaret-diagnostics-max-lines">, MetaVarName<"<N>">, HelpText<"Set the maximum number of source lines to show in a caret diagnostic">, - MarshallingInfoStringInt<DiagnosticOpts<"SnippetLineLimit">, "DiagnosticOptions::DefaultSnippetLineLimit">; + MarshallingInfoInt<DiagnosticOpts<"SnippetLineLimit">, "DiagnosticOptions::DefaultSnippetLineLimit">; def verify_EQ : CommaJoined<["-"], "verify=">, MetaVarName<"<prefixes>">, HelpText<"Verify diagnostic output using comment directives that start with" @@ -5269,10 +5269,10 @@ def fencode_extended_block_signature : Flag<["-"], "fencode-extended-block-signa MarshallingInfoFlag<LangOpts<"EncodeExtendedBlockSig">>; def function_alignment : Separate<["-"], "function-alignment">, HelpText<"default alignment for functions">, - MarshallingInfoStringInt<LangOpts<"FunctionAlignment">>; + MarshallingInfoInt<LangOpts<"FunctionAlignment">>; def pic_level : Separate<["-"], "pic-level">, HelpText<"Value for __PIC__">, - MarshallingInfoStringInt<LangOpts<"PICLevel">>; + MarshallingInfoInt<LangOpts<"PICLevel">>; def pic_is_pie : Flag<["-"], "pic-is-pie">, HelpText<"File is for a position independent executable">, MarshallingInfoFlag<LangOpts<"PIE">>; @@ -5307,7 +5307,7 @@ def stack_protector : Separate<["-"], "stack-protector">, MarshallingInfoEnum<LangOpts<"StackProtector">, "SSPOff">; def stack_protector_buffer_size : Separate<["-"], "stack-protector-buffer-size">, HelpText<"Lower bound for a buffer to be considered for stack protection">, - MarshallingInfoStringInt<CodeGenOpts<"SSPBufferSize">, "8">; + MarshallingInfoInt<CodeGenOpts<"SSPBufferSize">, "8">; def fvisibility : Separate<["-"], "fvisibility">, HelpText<"Default type and symbol visibility">, MarshallingInfoVisibility<LangOpts<"ValueVisibilityMode">, "DefaultVisibility">; @@ -5319,19 +5319,19 @@ def fapply_global_visibility_to_externs : Flag<["-"], "fapply-global-visibility- MarshallingInfoFlag<LangOpts<"SetVisibilityForExternDecls">>; def ftemplate_depth : Separate<["-"], "ftemplate-depth">, HelpText<"Maximum depth of recursive template instantiation">, - MarshallingInfoStringInt<LangOpts<"InstantiationDepth">, "1024">; + MarshallingInfoInt<LangOpts<"InstantiationDepth">, "1024">; def foperator_arrow_depth : Separate<["-"], "foperator-arrow-depth">, HelpText<"Maximum number of 'operator->'s to call for a member access">, - MarshallingInfoStringInt<LangOpts<"ArrowDepth">, "256">; + MarshallingInfoInt<LangOpts<"ArrowDepth">, "256">; def fconstexpr_depth : Separate<["-"], "fconstexpr-depth">, HelpText<"Maximum depth of recursive constexpr function calls">, - MarshallingInfoStringInt<LangOpts<"ConstexprCallDepth">, "512">; + MarshallingInfoInt<LangOpts<"ConstexprCallDepth">, "512">; def fconstexpr_steps : Separate<["-"], "fconstexpr-steps">, HelpText<"Maximum number of steps in constexpr function evaluation">, - MarshallingInfoStringInt<LangOpts<"ConstexprStepLimit">, "1048576">; + MarshallingInfoInt<LangOpts<"ConstexprStepLimit">, "1048576">; def fbracket_depth : Separate<["-"], "fbracket-depth">, HelpText<"Maximum nesting level for parentheses, brackets, and braces">, - MarshallingInfoStringInt<LangOpts<"BracketDepth">, "256">; + MarshallingInfoInt<LangOpts<"BracketDepth">, "256">; defm const_strings : BoolOption<"f", "const-strings", LangOpts<"ConstStrings">, DefaultFalse, PosFlag<SetTrue, [CC1Option], "Use">, NegFlag<SetFalse, [], "Don't use">, @@ -5368,7 +5368,7 @@ def fobjc_subscripting_legacy_runtime : Flag<["-"], "fobjc-subscripting-legacy-r // TODO: Enforce values valid for MSVtorDispMode. def vtordisp_mode_EQ : Joined<["-"], "vtordisp-mode=">, HelpText<"Control vtordisp placement on win32 targets">, - MarshallingInfoStringInt<LangOpts<"VtorDispMode">, "1">; + MarshallingInfoInt<LangOpts<"VtorDispMode">, "1">; def fnative_half_type: Flag<["-"], "fnative-half-type">, HelpText<"Use the native half type for __fp16 instead of promoting to float">, MarshallingInfoFlag<LangOpts<"NativeHalfType">>, diff --git a/llvm/include/llvm/Option/OptParser.td b/llvm/include/llvm/Option/OptParser.td index 5b617ebbdd82..45f092af7166 100644 --- a/llvm/include/llvm/Option/OptParser.td +++ b/llvm/include/llvm/Option/OptParser.td @@ -172,7 +172,7 @@ class MarshallingInfoString<KeyPathAndMacro kpm, code defaultvalue="std::string( code Denormalizer = "denormalizeString"; } -class MarshallingInfoStringInt<KeyPathAndMacro kpm, code defaultvalue="0", code type="unsigned"> +class MarshallingInfoInt<KeyPathAndMacro kpm, code defaultvalue="0", code type="unsigned"> : MarshallingInfo<kpm, defaultvalue> { code Normalizer = "normalizeStringIntegral<"#type#">"; code Denormalizer = "denormalizeString<"#type#">"; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
