Merge commit 'cc0cf7253967' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 05ae166fd278 · 2025-04-29T09:28:29.000-04:00
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
@@ -3003,6 +3003,8 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
               Ty = types::TY_CXX;
             else if (CCCIsCPP() || CCGenDiagnostics)
               Ty = types::TY_C;
+            else if (IsDXCMode())
+              Ty = types::TY_HLSL;
             else
               Ty = types::TY_Object;
           }
diff --git a/clang/test/Driver/dxc_I.test b/clang/test/Driver/dxc_I.test
@@ -0,0 +1,4 @@
+// RUN: %clang_dxc -Tlib_6_3  -### %s 2>&1 | FileCheck %s
+
+// Make sure a non `.hlsl` file is considered an HLSL source file in dxc mode.
+// CHECK: "-x" "hlsl" "{{.*}}dxc_I.test"

Original file line number	Diff line number	Diff line change
`@@ -3003,6 +3003,8 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,`
`3003`	`3003`	`Ty = types::TY_CXX;`
`3004`	`3004`	`else if (CCCIsCPP() \|\| CCGenDiagnostics)`
`3005`	`3005`	`Ty = types::TY_C;`
	`3006`	`+ else if (IsDXCMode())`
	`3007`	`+ Ty = types::TY_HLSL;`
`3006`	`3008`	`else`
`3007`	`3009`	`Ty = types::TY_Object;`
`3008`	`3010`	`}`