https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/189329
Fix regression after ab885fdf5f67726ef564c34087e813f2ca861f5c. Apparently driver tests do not enforce there are no warnings. Oddly, I need to use -Werror for the specific error. If I use just -Werror, I get an error that the -Werror is unused. >From 5ff83cb0b4d50860fc67de67d7bdc17ffedcdd5c Mon Sep 17 00:00:00 2001 From: Matt Arsenault <[email protected]> Date: Mon, 30 Mar 2026 09:11:19 +0200 Subject: [PATCH] clang: Fix warnings with multiple offload arch args Fix regression after ab885fdf5f67726ef564c34087e813f2ca861f5c. Apparently driver tests do not enforce there are no warnings. Oddly, I need to use -Werror for the specific error. If I use just -Werror, I get an error that the -Werror is unused. --- clang/lib/Driver/Driver.cpp | 5 ++++- clang/test/Driver/hip-binding.hip | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index aff34603b8b86..55c9c7766d021 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1015,7 +1015,10 @@ static TripleSet inferOffloadToolchains(Compilation &C, A->claim(); C.getArgs().append(A); C.getArgs().AddSynthesizedArg(A); - Triples.insert(Triple); + + auto It = Triples.lower_bound(Triple); + if (It == Triples.end() || *It != Triple) + Triples.insert(It, Triple); } // Infer the default target triple if no specific architectures are given. diff --git a/clang/test/Driver/hip-binding.hip b/clang/test/Driver/hip-binding.hip index 1c02cfaadfad2..cf44692259257 100644 --- a/clang/test/Driver/hip-binding.hip +++ b/clang/test/Driver/hip-binding.hip @@ -1,4 +1,4 @@ -// RUN: %clang -ccc-print-bindings --target=x86_64-linux-gnu \ +// RUN: %clang -Werror=openmp-target -ccc-print-bindings --target=x86_64-linux-gnu \ // RUN: --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \ // RUN: --no-offload-new-driver -c 2>&1 | FileCheck -check-prefix=NRDCS %s // RUN: %clang -ccc-print-bindings --target=x86_64-linux-gnu --offload-new-driver \ _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
