Skip to content

Commit ed0aa34

Browse files
committed
[Driver] Add BoolMOption to simplify boolean -m* options
Similar to BoolFOption/BoolGOption for -f* and -g*
1 parent 8bcb1ce commit ed0aa34

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,13 @@ multiclass BoolGOption<string flag_base, KeyPathAndMacro kpm,
550550
Group<g_Group>;
551551
}
552552

553+
multiclass BoolMOption<string flag_base, KeyPathAndMacro kpm,
554+
Default default, FlagDef flag1, FlagDef flag2,
555+
BothFlags both = BothFlags<[]>> {
556+
defm NAME : BoolOption<"m", flag_base, kpm, default, flag1, flag2, both>,
557+
Group<m_Group>;
558+
}
559+
553560
// Works like BoolOption except without marshalling
554561
multiclass BoolOptionWithoutMarshalling<string prefix = "", string spelling_base,
555562
FlagDef flag1_base, FlagDef flag2_base,
@@ -4600,11 +4607,10 @@ def mretpoline : Flag<["-"], "mretpoline">, Group<m_Group>,
46004607
Visibility<[ClangOption, CLOption]>;
46014608
def mno_retpoline : Flag<["-"], "mno-retpoline">, Group<m_Group>,
46024609
Visibility<[ClangOption, CLOption]>;
4603-
defm speculative_load_hardening : BoolOption<"m", "speculative-load-hardening",
4610+
defm speculative_load_hardening : BoolMOption<"speculative-load-hardening",
46044611
CodeGenOpts<"SpeculativeLoadHardening">, DefaultFalse,
46054612
PosFlag<SetTrue, [], [ClangOption, CC1Option]>,
4606-
NegFlag<SetFalse>, BothFlags<[], [ClangOption, CLOption]>>,
4607-
Group<m_Group>;
4613+
NegFlag<SetFalse>, BothFlags<[], [ClangOption, CLOption]>>;
46084614
def mlvi_hardening : Flag<["-"], "mlvi-hardening">, Group<m_Group>,
46094615
Visibility<[ClangOption, CLOption]>,
46104616
HelpText<"Enable all mitigations for Load Value Injection (LVI)">;
@@ -4821,13 +4827,13 @@ def mexec_model_EQ : Joined<["-"], "mexec-model=">, Group<m_wasm_Features_Driver
48214827
"explicitly terminated.">;
48224828
} // let Flags = [TargetSpecific]
48234829

4824-
defm amdgpu_ieee : BoolOption<"m", "amdgpu-ieee",
4830+
defm amdgpu_ieee : BoolMOption<"amdgpu-ieee",
48254831
CodeGenOpts<"EmitIEEENaNCompliantInsts">, DefaultTrue,
48264832
PosFlag<SetTrue, [], [ClangOption], "Sets the IEEE bit in the expected default floating point "
48274833
" mode register. Floating point opcodes that support exception flag "
48284834
"gathering quiet and propagate signaling NaN inputs per IEEE 754-2008. "
48294835
"This option changes the ABI. (AMDGPU only)">,
4830-
NegFlag<SetFalse, [], [ClangOption, CC1Option]>>, Group<m_Group>;
4836+
NegFlag<SetFalse, [], [ClangOption, CC1Option]>>;
48314837

48324838
def mcode_object_version_EQ : Joined<["-"], "mcode-object-version=">, Group<m_Group>,
48334839
HelpText<"Specify code object ABI version. Defaults to 5. (AMDGPU only)">,
@@ -4846,14 +4852,14 @@ defm wavefrontsize64 : SimpleMFlag<"wavefrontsize64",
48464852
"Specify wavefront size 64", "Specify wavefront size 32",
48474853
" mode (AMDGPU only)">;
48484854

4849-
defm unsafe_fp_atomics : BoolOption<"m", "unsafe-fp-atomics",
4855+
defm unsafe_fp_atomics : BoolMOption<"unsafe-fp-atomics",
48504856
TargetOpts<"AllowAMDGPUUnsafeFPAtomics">, DefaultFalse,
48514857
PosFlag<SetTrue, [], [ClangOption, CC1Option],
48524858
"Enable generation of unsafe floating point "
48534859
"atomic instructions. May generate more efficient code, but may not "
48544860
"respect rounding and denormal modes, and may give incorrect results "
48554861
"for certain memory destinations. (AMDGPU only)">,
4856-
NegFlag<SetFalse>>, Group<m_Group>;
4862+
NegFlag<SetFalse>>;
48574863

48584864
def faltivec : Flag<["-"], "faltivec">, Group<f_Group>;
48594865
def fno_altivec : Flag<["-"], "fno-altivec">, Group<f_Group>;
@@ -4941,11 +4947,10 @@ def mrop_protect : Flag<["-"], "mrop-protect">,
49414947
def mprivileged : Flag<["-"], "mprivileged">,
49424948
Group<m_ppc_Features_Group>;
49434949

4944-
defm regnames : BoolOption<"m", "regnames",
4950+
defm regnames : BoolMOption<"regnames",
49454951
CodeGenOpts<"PPCUseFullRegisterNames">, DefaultFalse,
49464952
PosFlag<SetTrue, [], [ClangOption, CC1Option], "Use full register names when writing assembly output">,
4947-
NegFlag<SetFalse, [], [ClangOption], "Use only register numbers when writing assembly output">>,
4948-
Group<m_Group>;
4953+
NegFlag<SetFalse, [], [ClangOption], "Use only register numbers when writing assembly output">>;
49494954
} // let Flags = [TargetSpecific]
49504955
def maix_small_local_exec_tls : Flag<["-"], "maix-small-local-exec-tls">,
49514956
Group<m_ppc_Features_Group>,
@@ -4987,10 +4992,10 @@ def mxcoff_build_id_EQ : Joined<["-"], "mxcoff-build-id=">, Group<Link_Group>, M
49874992
def mignore_xcoff_visibility : Flag<["-"], "mignore-xcoff-visibility">, Group<m_Group>,
49884993
HelpText<"Not emit the visibility attribute for asm in AIX OS or give all symbols 'unspecified' visibility in XCOFF object file">,
49894994
Flags<[TargetSpecific]>, Visibility<[ClangOption, CC1Option]>;
4990-
defm backchain : BoolOption<"m", "backchain",
4995+
defm backchain : BoolMOption<"backchain",
49914996
CodeGenOpts<"Backchain">, DefaultFalse,
49924997
PosFlag<SetTrue, [], [ClangOption], "Link stack frames through backchain on System Z">,
4993-
NegFlag<SetFalse>, BothFlags<[], [ClangOption, CC1Option]>>, Group<m_Group>;
4998+
NegFlag<SetFalse>, BothFlags<[], [ClangOption, CC1Option]>>;
49944999

49955000
def mno_warn_nonportable_cfstrings : Flag<["-"], "mno-warn-nonportable-cfstrings">, Group<m_Group>;
49965001
def mno_omit_leaf_frame_pointer : Flag<["-"], "mno-omit-leaf-frame-pointer">, Group<m_Group>;
@@ -6952,7 +6957,7 @@ def msmall_data_limit : Separate<["-"], "msmall-data-limit">,
69526957
def funwind_tables_EQ : Joined<["-"], "funwind-tables=">,
69536958
HelpText<"Generate unwinding tables for all functions">,
69546959
MarshallingInfoInt<CodeGenOpts<"UnwindTables">>;
6955-
defm constructor_aliases : BoolOption<"m", "constructor-aliases",
6960+
defm constructor_aliases : BoolMOption<"constructor-aliases",
69566961
CodeGenOpts<"CXXCtorDtorAliases">, DefaultFalse,
69576962
PosFlag<SetTrue, [], [ClangOption], "Enable">,
69586963
NegFlag<SetFalse, [], [ClangOption], "Disable">,

0 commit comments

Comments
 (0)