Skip to content

Update LLVM and update APIs #6147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Update LLVM and update APIs #6147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ bazel_dep(name = "zstd", version = "1.5.7", repo_name = "llvm_zstd")

# We pin to specific upstream commits and try to track top-of-tree reasonably
# closely rather than pinning to a specific release.
# HEAD as of 2025-09-07.
llvm_project_version = "c000c9e4bf737c1cc0e5c7b435b24ea73d21ee05"
# HEAD as of 2025-09-23.
llvm_project_version = "113f01aa82d055410f22a9d03b3468fa68600589"

# Load a repository for the raw llvm-project, pre-overlay.
http_archive(
name = "llvm-raw",
build_file_content = "# empty",
integrity = "sha256-6URudXFgqoCuQI4hbb7AlN4Wj7WzLHFB4AWGjUV0UAI=",
integrity = "sha256-mu4Ao1qnZjl0ZYnG0J6MGCSb4Wtbaqa3iKVwpLxsRUM=",
patch_args = ["-p1"],
patches = [
"@carbon//bazel/llvm_project:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch",
Expand Down
13 changes: 8 additions & 5 deletions bazel/llvm_project/0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ Subject: [PATCH] Add libfuzzer target to compiler-rt.
1 file changed, 17 insertions(+)

diff --git a/utils/bazel/llvm-project-overlay/compiler-rt/BUILD.bazel b/utils/bazel/llvm-project-overlay/compiler-rt/BUILD.bazel
index 9bdd454e1e36..0f30c21f63dc 100644
index 90264449de76..115da4cb77f6 100644
--- a/utils/bazel/llvm-project-overlay/compiler-rt/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/compiler-rt/BUILD.bazel
@@ -50,3 +50,20 @@ cc_library(
":config",
@@ -57,6 +57,23 @@ cc_library(
],
)
+

+cc_library(
+ name = "FuzzerMain",
+ srcs = glob(
Expand All @@ -32,5 +31,9 @@ index 9bdd454e1e36..0f30c21f63dc 100644
+ ],
+ includes = ["lib/fuzzer"],
+)
+
cc_library(
name = "orc_rt_common_headers",
hdrs = [
--
2.42.0
2.42.0
4 changes: 2 additions & 2 deletions common/raw_hashtable_benchmark_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static_assert(llvm::isPowerOf2_64(NumFourCharStrs));
static auto MakeFourCharStrs(llvm::ArrayRef<char> characters, absl::BitGen& gen)
-> llvm::OwningArrayRef<std::array<char, 4>> {
constexpr ssize_t NumCharsMask = NumChars - 1;
constexpr ssize_t NumCharsShift = llvm::CTLog2<NumChars>();
constexpr ssize_t NumCharsShift = llvm::ConstantLog2<NumChars>();
llvm::OwningArrayRef<std::array<char, 4>> four_char_strs(NumFourCharStrs);
for (auto [i, str] : llvm::enumerate(four_char_strs)) {
str[0] = characters[i & NumCharsMask];
Expand Down Expand Up @@ -372,7 +372,7 @@ auto DumpHashStatistics(llvm::ArrayRef<T> keys) -> void {
ssize_t expected_size =
llvm::NextPowerOf2(keys.size() + (keys.size() / 7) - 1);

constexpr int GroupShift = llvm::CTLog2<GroupSize>();
constexpr int GroupShift = llvm::ConstantLog2<GroupSize>();

size_t mask = ComputeProbeMaskFromSize(expected_size);
uint64_t salt = ComputeSeed();
Expand Down
2 changes: 1 addition & 1 deletion common/raw_hashtable_metadata_group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class BitIndex
return reinterpret_cast<T*>(
&reinterpret_cast<std::byte*>(pointer)[index]);
} else if constexpr (llvm::isPowerOf2_64(sizeof(T))) {
constexpr size_t ScaleShift = llvm::CTLog2<sizeof(T)>();
constexpr size_t ScaleShift = llvm::ConstantLog2<sizeof(T)>();
static_assert(ScaleShift <= ByteEncodingShift,
"Scaling by >=8 should be handled above!");
constexpr size_t FoldedShift = ByteEncodingShift - ScaleShift;
Expand Down
1 change: 0 additions & 1 deletion toolchain/base/llvm_tools.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ LLVM_MAIN_TOOLS = {
"nm": struct(bin_name = "llvm-nm", lib = "@llvm-project//llvm:llvm-nm-lib"),
"objcopy": struct(bin_name = "llvm-objcopy", lib = "@llvm-project//llvm:llvm-objcopy-lib"),
"objdump": struct(bin_name = "llvm-objdump", lib = "@llvm-project//llvm:llvm-objdump-lib"),
"profdata": struct(bin_name = "llvm-profdata", lib = "@llvm-project//llvm:llvm-profdata-lib"),
"rc": struct(bin_name = "llvm-rc", lib = "@llvm-project//llvm:llvm-rc-lib"),
"readobj": struct(bin_name = "llvm-readobj", lib = "@llvm-project//llvm:llvm-readobj-lib"),
"sancov": struct(bin_name = "sancov", lib = "@llvm-project//llvm:sancov-lib"),
Expand Down
4 changes: 2 additions & 2 deletions toolchain/check/cpp/import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ static auto LookupCustomRecordType(Context& context,
// Maps a C++ tag type (class, struct, union, enum) to a Carbon type.
static auto MapTagType(Context& context, const clang::TagType& type)
-> TypeExpr {
auto* tag_decl = type.getOriginalDecl();
auto* tag_decl = type.getDecl();
Copy link
Contributor

@zygoloid zygoloid Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the version of LLVM we're moving to doesn't have this rename yet (llvm/llvm-project@b516dcc landed on October 15, but this PR is picking an LLVM revision from September).

CARBON_CHECK(tag_decl);

// Check if the declaration is already mapped.
Expand Down Expand Up @@ -1844,7 +1844,7 @@ static auto AddDependentUnimportedTypeDecls(Context& context,
}

if (const auto* tag_type = type->getAs<clang::TagType>()) {
AddDependentDecl(context, SemIR::ClangDeclKey(tag_type->getOriginalDecl()),
AddDependentDecl(context, SemIR::ClangDeclKey(tag_type->getDecl()),
worklist);
}
}
Expand Down
7 changes: 5 additions & 2 deletions toolchain/driver/clang_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,11 @@ auto ClangRunner::RunCC1(llvm::SmallVectorImpl<const char*>& cc1_args) -> int {
installation_->clang_resource_path();
}

// Create the filesystem.
clang_instance->createVirtualFileSystem(fs_, &diag_buffer);

// Create the actual diagnostics engine.
clang_instance->createDiagnostics(*fs_);
clang_instance->createDiagnostics();
if (!clang_instance->hasDiagnostics()) {
return EXIT_FAILURE;
}
Expand Down Expand Up @@ -374,7 +377,7 @@ auto ClangRunner::RunCC1(llvm::SmallVectorImpl<const char*>& cc1_args) -> int {
// options are stored in the compiler invocation and we can recreate the VFS
// from the compiler invocation.
if (!clang_instance->hasFileManager()) {
clang_instance->createFileManager(fs_);
clang_instance->createFileManager();
}

if (auto profiler_output = clang_instance->createOutputFile(
Expand Down
5 changes: 3 additions & 2 deletions toolchain/driver/compile_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,9 +1066,10 @@ auto CompileSubcommand::Run(DriverEnv& driver_env) -> DriverResult {
}

// Validate the target before passing it to Clang.
llvm::Triple target_triple(options_.codegen_options.target);
std::string target_error;
const llvm::Target* target = llvm::TargetRegistry::lookupTarget(
llvm::Triple(options_.codegen_options.target), target_error);
const llvm::Target* target =
llvm::TargetRegistry::lookupTarget(target_triple, target_error);
Comment on lines +1069 to +1072
Copy link
Contributor

@zygoloid zygoloid Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objection to the change, but I'm surprised this was necessary -- it looks like the old code would have still compiled and worked. Did it not?

Copy link
Contributor

@zygoloid zygoloid Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, looks like this issue was fixed in 5714f4d and I guess this PR was written against an older version. Nothing to see here, then.

if (!target) {
CARBON_DIAGNOSTIC(CompileTargetInvalid, Error, "invalid target: {0}",
std::string);
Expand Down
1 change: 0 additions & 1 deletion toolchain/driver/llvm_runner_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ TEST(LLVMRunnerTest, Version) {
case LLVMTool::InstallNameTool:
case LLVMTool::Lipo:
case LLVMTool::Objcopy:
case LLVMTool::Profdata:
case LLVMTool::Sancov:
case LLVMTool::Strip:
case LLVMTool::Symbolizer:
Expand Down
Loading