Author: Xiang Li Date: 2022-05-11T13:57:47-07:00 New Revision: 6055837f6d2941bbc09e44dc88b6a39b934a7453
URL: https://github.com/llvm/llvm-project/commit/6055837f6d2941bbc09e44dc88b6a39b934a7453 DIFF: https://github.com/llvm/llvm-project/commit/6055837f6d2941bbc09e44dc88b6a39b934a7453.diff LOG: Revert "[HLSL] add -D option for dxc mode." This reverts commit 4dae38ebfba0d8583e52c3ded8f62f5f9fa77fda. Differential Revision: https://reviews.llvm.org/D125414 Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/Clang.cpp Removed: clang/test/Driver/dxc_D.hlsl ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index e0eea7310fb2d..05988cbbf8d7e 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -6756,8 +6756,6 @@ def target_profile : DXCJoinedOrSeparate<"T">, MetaVarName<"<profile>">, "lib_6_3, lib_6_4, lib_6_5, lib_6_6, lib_6_7, lib_6_x," "ms_6_5, ms_6_6, ms_6_7," "as_6_5, as_6_6, as_6_7">; -def dxc_D : Option<["--", "/", "-"], "D", KIND_JOINED_OR_SEPARATE>, - Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>, Alias<D>; def emit_pristine_llvm : DXCFlag<"emit-pristine-llvm">, HelpText<"Emit pristine LLVM IR from the frontend by not running any LLVM passes at all." "Same as -S + -emit-llvm + -disable-llvm-passes.">; diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index a9fbdd4272c42..a4777b55072ba 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -3471,9 +3471,9 @@ static void RenderOpenCLOptions(const ArgList &Args, ArgStringList &CmdArgs, static void RenderHLSLOptions(const ArgList &Args, ArgStringList &CmdArgs, types::ID InputType) { - const unsigned ForwardedArguments[] = { - options::OPT_dxil_validator_version, options::OPT_D, options::OPT_S, - options::OPT_emit_llvm, options::OPT_disable_llvm_passes}; + const unsigned ForwardedArguments[] = {options::OPT_dxil_validator_version, + options::OPT_S, options::OPT_emit_llvm, + options::OPT_disable_llvm_passes}; for (const auto &Arg : ForwardedArguments) if (const auto *A = Args.getLastArg(Arg)) diff --git a/clang/test/Driver/dxc_D.hlsl b/clang/test/Driver/dxc_D.hlsl deleted file mode 100644 index d32d885f11b00..0000000000000 --- a/clang/test/Driver/dxc_D.hlsl +++ /dev/null @@ -1,13 +0,0 @@ -// RUN: %clang_dxc -DTEST=2 -### %s 2>&1 | FileCheck %s -// RUN: %clang_dxc -DTEST=2 -Tlib_6_7 %s -fcgl -Fo - | FileCheck %s --check-prefix=ERROR - -// Make sure -D send to cc1. -// CHECK:"-D" "TEST=2" - -#ifndef TEST -#error "TEST not defined" -#elif TEST != 2 -#error "TEST defined to wrong value" -#endif - -// ERROR-NOT: error: _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
