From d6f689ba07796e8724ed74578885c86f502e93da Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Fri, 15 Sep 2023 18:18:54 -0700 Subject: [PATCH] Another LLVM fix for CodeGenFileType (#3242) Due to: https://github.com/llvm/llvm-project/commit/0a1aa6cda2758b0926a95f87d39ffefb1cb90200 --- WORKSPACE | 4 ++-- toolchain/codegen/codegen.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 58ea71548e3e..2a6d8fa15fcd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -113,7 +113,7 @@ http_archive( # We pin to specific upstream commits and try to track top-of-tree reasonably # closely rather than pinning to a specific release. -llvm_version = "bf8fd086d09cfeeec44f29e6aed6ce61cede2334" +llvm_version = "3d51010a3350660160981c6b8e624dcc87c208a3" http_archive( name = "llvm-raw", @@ -124,7 +124,7 @@ http_archive( "@carbon//bazel/patches/llvm:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch", "@carbon//bazel/patches/llvm:0003_Add_library_for_clangd.patch", ], - sha256 = "4dfb44c8ec17c6cc1d1f883c631dd1175e916891babe52ddda0b4d0c7ab6970e", + sha256 = "efbca707a6eb1c714b849de120309070eef282660c0f4be5b68efef62cc95cf5", strip_prefix = "llvm-project-{0}".format(llvm_version), urls = ["https://github.com/llvm/llvm-project/archive/{0}.tar.gz".format(llvm_version)], ) diff --git a/toolchain/codegen/codegen.cpp b/toolchain/codegen/codegen.cpp index 0306f284277c..4ef6bb1f9813 100644 --- a/toolchain/codegen/codegen.cpp +++ b/toolchain/codegen/codegen.cpp @@ -46,11 +46,11 @@ auto CodeGen::Create(llvm::Module& module, llvm::StringRef target_triple, } auto CodeGen::EmitAssembly(llvm::raw_pwrite_stream& out) -> bool { - return EmitCode(out, llvm::CodeGenFileType::CGFT_AssemblyFile); + return EmitCode(out, llvm::CodeGenFileType::AssemblyFile); } auto CodeGen::EmitObject(llvm::raw_pwrite_stream& out) -> bool { - return EmitCode(out, llvm::CodeGenFileType::CGFT_ObjectFile); + return EmitCode(out, llvm::CodeGenFileType::ObjectFile); } auto CodeGen::EmitCode(llvm::raw_pwrite_stream& out,