Author: Fangrui Song Date: 2024-05-05T12:53:34-07:00 New Revision: 57f13b51bdb373534ba5e507868b353a015107de
URL: https://github.com/llvm/llvm-project/commit/57f13b51bdb373534ba5e507868b353a015107de DIFF: https://github.com/llvm/llvm-project/commit/57f13b51bdb373534ba5e507868b353a015107de.diff LOG: [HLSL] Remove overridden -S The cc1 option -S (https://reviews.llvm.org/D124983) is overridden by the latter -emit-llvm. Added: Modified: clang/lib/Driver/ToolChains/HLSL.cpp clang/test/Driver/dxc_fcgl.hlsl Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/HLSL.cpp b/clang/lib/Driver/ToolChains/HLSL.cpp index 1169b5d8c92dd6..558e4db46f8182 100644 --- a/clang/lib/Driver/ToolChains/HLSL.cpp +++ b/clang/lib/Driver/ToolChains/HLSL.cpp @@ -218,8 +218,7 @@ HLSLToolChain::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch, } } if (A->getOption().getID() == options::OPT_emit_pristine_llvm) { - // Translate fcgl into -S -emit-llvm and -disable-llvm-passes. - DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_S)); + // Translate -fcgl into -emit-llvm and -disable-llvm-passes. DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_emit_llvm)); DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_disable_llvm_passes)); diff --git a/clang/test/Driver/dxc_fcgl.hlsl b/clang/test/Driver/dxc_fcgl.hlsl index 567bad1bc13b5a..cfbf2503ddaaeb 100644 --- a/clang/test/Driver/dxc_fcgl.hlsl +++ b/clang/test/Driver/dxc_fcgl.hlsl @@ -1,6 +1,6 @@ // RUN: not %clang_dxc -fcgl -T lib_6_7 foo.hlsl -### %s 2>&1 | FileCheck %s -// Make sure fcgl option flag which translated into "-S" "-emit-llvm" "-disable-llvm-passes". +// Make sure fcgl option flag which translated into "-emit-llvm" "-disable-llvm-passes". // CHECK:"-S" // CHECK-SAME:"-emit-llvm" "-disable-llvm-passes" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
