Author: Manuel Carrasco Date: 2026-05-06T13:22:03-03:00 New Revision: 6887ccf6251dcdf835e3df2bf93ad04133c5ad78
URL: https://github.com/llvm/llvm-project/commit/6887ccf6251dcdf835e3df2bf93ad04133c5ad78 DIFF: https://github.com/llvm/llvm-project/commit/6887ccf6251dcdf835e3df2bf93ad04133c5ad78.diff LOG: [Driver][HIP/SPIRV] Fix crash when llvm-link is executed. (#196074) There is a design limitation (see [InputInfo](https://github.com/llvm/llvm-project/blob/f08b4fff52cdd3fc8fdd962080da089497c00fcc/clang/include/clang/Driver/InputInfo.h#L23)) that is forwarding flags to `llvm-link` when it shouldn't happen. This commit fixes this issue by sanitizing the arguments forwarded to `llvm-link`. This may happen when `clang-linker-wrapper` eventually calls `clang`, which adds the `-Xlinker` flags. Crash reproducer is here: https://gcc.godbolt.org/z/rxvWcvan3. The fix is based on @MrSidims' old PR (#183492). The error started manifesting by default after the switch to the new driver, and the issue has been in the new driver since commit https://github.com/llvm/llvm-project/commit/4c6f398b866030c17fd94dcdca04f4df03c5214c. However, the problem could potentially be triggered by any call to `clang`, regardless of the `clang-linker-wrapper`. --------- Co-authored-by: Dmitry Sidorov <[email protected]> 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 b4ff90c1d61f0..e086e15a8c380 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"{{$}} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
