From 5714f4deb2eaf52d4b2026a02027eb41bf581759 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Mon, 13 Oct 2025 11:52:49 -0700 Subject: [PATCH] Use Overload of lookupTarget Accepting Triple (#6205) The overload accepting a string/llvm::StringRef is deprecated and will be removed when LLVM 22 branches. --- toolchain/codegen/codegen.cpp | 4 ++-- toolchain/driver/compile_subcommand.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/codegen/codegen.cpp b/toolchain/codegen/codegen.cpp index 31357272c35b..7e9e26b69585 100644 --- a/toolchain/codegen/codegen.cpp +++ b/toolchain/codegen/codegen.cpp @@ -19,12 +19,12 @@ namespace Carbon { auto CodeGen::Make(llvm::Module* module, llvm::StringRef target_triple_str, Diagnostics::Consumer* consumer) -> std::optional { + llvm::Triple target_triple(target_triple_str); std::string error; const llvm::Target* target = - llvm::TargetRegistry::lookupTarget(target_triple_str, error); + llvm::TargetRegistry::lookupTarget(target_triple, error); CARBON_CHECK(target, "Target should be validated before codegen: {0}", error); - llvm::Triple target_triple(target_triple_str); module->setTargetTriple(target_triple); constexpr llvm::StringLiteral CPU = "generic"; diff --git a/toolchain/driver/compile_subcommand.cpp b/toolchain/driver/compile_subcommand.cpp index cabfe4f74150..291fdb44cd4b 100644 --- a/toolchain/driver/compile_subcommand.cpp +++ b/toolchain/driver/compile_subcommand.cpp @@ -885,7 +885,7 @@ auto CompileSubcommand::Run(DriverEnv& driver_env) -> DriverResult { // Validate the target before passing it to Clang. std::string target_error; const llvm::Target* target = llvm::TargetRegistry::lookupTarget( - options_.codegen_options.target, target_error); + llvm::Triple(options_.codegen_options.target), target_error); if (!target) { CARBON_DIAGNOSTIC(CompileTargetInvalid, Error, "invalid target: {0}", std::string);