From 03502e97583d19b5d47600f45689455e3e5bd456 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Mon, 6 Oct 2025 22:25:58 +0000 Subject: [PATCH 1/2] [NFC][clang] Prefer triple overload of lookupTarget The string overload will be deprecated soon, similar to other functions in TargetRegistry. --- clang/lib/Testing/CommandLineArgs.cpp | 2 +- clang/unittests/Driver/ToolChainTest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Testing/CommandLineArgs.cpp b/clang/lib/Testing/CommandLineArgs.cpp index e9da72f71c599..ae4ccb4e1e8d8 100644 --- a/clang/lib/Testing/CommandLineArgs.cpp +++ b/clang/lib/Testing/CommandLineArgs.cpp @@ -103,7 +103,7 @@ std::string getAnyTargetForTesting() { StringRef TargetName(Target.getName()); if (TargetName == "x86-64") TargetName = "x86_64"; - if (llvm::TargetRegistry::lookupTarget(TargetName, Error) == &Target) { + if (llvm::TargetRegistry::lookupTarget(llvm::Triple(TargetName), Error) == &Target) { return std::string(TargetName); } } diff --git a/clang/unittests/Driver/ToolChainTest.cpp b/clang/unittests/Driver/ToolChainTest.cpp index c1c5c9604aa16..afa17ff219be2 100644 --- a/clang/unittests/Driver/ToolChainTest.cpp +++ b/clang/unittests/Driver/ToolChainTest.cpp @@ -442,7 +442,7 @@ TEST(ToolChainTest, ParsedClangName) { TEST(ToolChainTest, GetTargetAndMode) { llvm::InitializeAllTargets(); std::string IgnoredError; - if (!llvm::TargetRegistry::lookupTarget("x86_64", IgnoredError)) + if (!llvm::TargetRegistry::lookupTarget(llvm::Triple("x86_64"), IgnoredError)) GTEST_SKIP(); ParsedClangName Res = ToolChain::getTargetAndModeFromProgramName("clang"); From 0663d94e11b80fcc0dd7c1285acb28118029fc52 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Mon, 6 Oct 2025 22:45:45 +0000 Subject: [PATCH 2/2] fix --- clang/lib/Testing/CommandLineArgs.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/Testing/CommandLineArgs.cpp b/clang/lib/Testing/CommandLineArgs.cpp index ae4ccb4e1e8d8..95f37e3b6dcdc 100644 --- a/clang/lib/Testing/CommandLineArgs.cpp +++ b/clang/lib/Testing/CommandLineArgs.cpp @@ -103,7 +103,8 @@ std::string getAnyTargetForTesting() { StringRef TargetName(Target.getName()); if (TargetName == "x86-64") TargetName = "x86_64"; - if (llvm::TargetRegistry::lookupTarget(llvm::Triple(TargetName), Error) == &Target) { + if (llvm::TargetRegistry::lookupTarget(llvm::Triple(TargetName), Error) == + &Target) { return std::string(TargetName); } }