[clang] 12e391e - Reland "[Driver][HIP/SPIRV] Fix crash when llvm-link is executed" (#196131)

[via cfe-commits]

Author: Manuel Carrasco
Date: 2026-05-06T14:42:14-03:00
New Revision: 12e391e2ac3cac6ec99c0a6d2b14198e7c99e079

URL: https://github.com/llvm/llvm-project/commit/12e391e2ac3cac6ec99c0a6d2b14198e7c99e079
DIFF: https://github.com/llvm/llvm-project/commit/12e391e2ac3cac6ec99c0a6d2b14198e7c99e079.diff

LOG: Reland "[Driver][HIP/SPIRV] Fix crash when llvm-link is executed"  (#196131)

Originally reverted due to possible regression detected by buildbot.
This PR relands https://github.com/llvm/llvm-project/pull/196074.
Failures were due to flaky tests.

Added: 
    clang/test/Driver/hip-spirv-linker-crash.c

Modified: 
    clang/lib/Driver/ToolChains/HIPAMD.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/HIPAMD.cpp b/clang/lib/Driver/ToolChains/HIPAMD.cpp
index b5271e7593dc6..b7732c9274725 100644
--- a/clang/lib/Driver/ToolChains/HIPAMD.cpp
+++ b/clang/lib/Driver/ToolChains/HIPAMD.cpp
@@ -40,7 +40,8 @@ void AMDGCN::Linker::constructLLVMLinkCommand(
   ArgStringList LinkerInputs;
 
   for (auto Input : Inputs)
-    LinkerInputs.push_back(Input.getFilename());
+    if (Input.isFilename())
+      LinkerInputs.push_back(Input.getFilename());
 
   // Look for archive of bundled bitcode in arguments, and add temporary files
   // for the extracted archive of bitcode to inputs.

diff  --git a/clang/test/Driver/hip-spirv-linker-crash.c b/clang/test/Driver/hip-spirv-linker-crash.c
new file mode 100644
index 0000000000000..3f8835f2b5696
--- /dev/null
+++ b/clang/test/Driver/hip-spirv-linker-crash.c
@@ -0,0 +1,15 @@
+// Verify that SPIR-V compilation does not crash during the llvm-link step
+// due to extra args that are not meant to be forwarded there.
+//
+// RUN: %clang -### --target=spirv64-amd-amdhsa -use-spirv-backend \
+// RUN:   -Xlinker -opt-bisect-limit=-1 %s 2>&1 \
+// RUN:   | FileCheck %s
+//
+// RUN: %clang -### --target=spirv64-amd-amdhsa -use-spirv-backend \
+// RUN:   -Xlinker -mllvm -Xlinker -opt-bisect-limit=-1 %s 2>&1 \
+// RUN:   | FileCheck %s
+//
+// CHECK: "{{.*}}llvm-link"
+// CHECK-NOT: opt-bisect-limit
+// CHECK-NOT: -mllvm
+// CHECK-SAME: "-o" "{{.*}}.bc" "{{.*}}.bc"{{$}}