Author: Nico Weber Date: 2021-11-17T15:59:23-05:00 New Revision: 36873fb768dbedeb3e9167117d3bb63b3720d214
URL: https://github.com/llvm/llvm-project/commit/36873fb768dbedeb3e9167117d3bb63b3720d214 DIFF: https://github.com/llvm/llvm-project/commit/36873fb768dbedeb3e9167117d3bb63b3720d214.diff LOG: [clang] Try to fix test more after ae98182cf7341181e We need to use the td-based marshalling instead of doing this manually, else the setting gets lost on the way to codegen in most build configs. Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Frontend/CompilerInvocation.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 760025b32049b..9e0062150dce3 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -3131,7 +3131,10 @@ def mwatchos_simulator_version_min_EQ : Joined<["-"], "mwatchos-simulator-versio def mwatchsimulator_version_min_EQ : Joined<["-"], "mwatchsimulator-version-min=">, Alias<mwatchos_simulator_version_min_EQ>; def march_EQ : Joined<["-"], "march=">, Group<m_Group>, Flags<[CoreOption]>; def masm_EQ : Joined<["-"], "masm=">, Group<m_Group>, Flags<[NoXarchOption]>; -def inline_asm_EQ : Joined<["-"], "inline-asm=">, Group<m_Group>, Flags<[CC1Option]>; +def inline_asm_EQ : Joined<["-"], "inline-asm=">, Group<m_Group>, Flags<[CC1Option]>, + Values<"att,intel">, + NormalizedValuesScope<"CodeGenOptions">, NormalizedValues<["IAD_ATT", "IAD_Intel"]>, + MarshallingInfoEnum<CodeGenOpts<"InlineAsmDialect">, "IAD_Intel">; def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>, Flags<[CC1Option]>, MarshallingInfoString<TargetOpts<"CodeModel">, [{"default"}]>; def mtls_size_EQ : Joined<["-"], "mtls-size=">, Group<m_Group>, Flags<[NoXarchOption, CC1Option]>, diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 3efcab51792c3..8d33a59cb9839 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1614,18 +1614,6 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, } } - if (Arg *A = Args.getLastArg(options::OPT_inline_asm_EQ)) { - StringRef Value = A->getValue(); - if (Value == "att") { - Opts.InlineAsmDialect = CodeGenOptions::IAD_ATT; - } else if (Value == "intel") { - Opts.InlineAsmDialect = CodeGenOptions::IAD_Intel; - } else { - Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) - << A->getValue(); - } - } - // PIC defaults to -fno-direct-access-external-data while non-PIC defaults to // -fdirect-access-external-data. Opts.DirectAccessExternalData = _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits