Skip to content

Commit 57f13b5

Browse files
committed
[HLSL] Remove overridden -S
The cc1 option -S (https://reviews.llvm.org/D124983) is overridden by the latter -emit-llvm.
1 parent d33937b commit 57f13b5

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

clang/lib/Driver/ToolChains/HLSL.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,7 @@ HLSLToolChain::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch,
218218
}
219219
}
220220
if (A->getOption().getID() == options::OPT_emit_pristine_llvm) {
221-
// Translate fcgl into -S -emit-llvm and -disable-llvm-passes.
222-
DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_S));
221+
// Translate -fcgl into -emit-llvm and -disable-llvm-passes.
223222
DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_emit_llvm));
224223
DAL->AddFlagArg(nullptr,
225224
Opts.getOption(options::OPT_disable_llvm_passes));

clang/test/Driver/dxc_fcgl.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: not %clang_dxc -fcgl -T lib_6_7 foo.hlsl -### %s 2>&1 | FileCheck %s
22

3-
// Make sure fcgl option flag which translated into "-S" "-emit-llvm" "-disable-llvm-passes".
3+
// Make sure fcgl option flag which translated into "-emit-llvm" "-disable-llvm-passes".
44
// CHECK:"-S"
55
// CHECK-SAME:"-emit-llvm" "-disable-llvm-passes"
66

0 commit comments

Comments
 (0)