Skip to content

Commit 93169c3

Browse files
authored
Update LLVM (#4530)
Includes updates to reflect these LLVM changes: * llvm/llvm-project#112517 * llvm/llvm-project#113331 --------- Co-authored-by: Josh L <[email protected]>
1 parent b2ea19f commit 93169c3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ bazel_dep(name = "zstd", version = "1.5.6", repo_name = "llvm_zstd")
139139

140140
# We pin to specific upstream commits and try to track top-of-tree reasonably
141141
# closely rather than pinning to a specific release.
142-
# HEAD as of 2024-10-17.
143-
llvm_project_version = "5033ea73bb01061feb09b3216c74619e1fbefdeb"
142+
# HEAD as of 2024-11-13.
143+
llvm_project_version = "97298853b4de70dbce9c0a140ac38e3ac179e02e"
144144

145145
# Load a repository for the raw llvm-project, pre-overlay.
146146
http_archive(
@@ -151,7 +151,7 @@ http_archive(
151151
"@carbon//bazel/llvm_project:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch",
152152
"@carbon//bazel/llvm_project:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch",
153153
],
154-
sha256 = "9964d7643f3cb1cfabde913b747a2fa2524c469adc847fceee4dd883dbc0482a",
154+
sha256 = "ac811cb61d281043c865c39260a5114a0e96d16ec0e4eb74a2516a24981b9064",
155155
strip_prefix = "llvm-project-{0}".format(llvm_project_version),
156156
urls = ["https://github.com/llvm/llvm-project/archive/{0}.tar.gz".format(llvm_project_version)],
157157
)

toolchain/driver/clang_runner.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ auto ClangRunner::Run(llvm::ArrayRef<llvm::StringRef> args) -> bool {
123123
clang::DiagnosticsEngine diagnostics(
124124
diagnostic_ids_, diagnostic_options.get(), &diagnostic_client,
125125
/*ShouldOwnClient=*/false);
126-
clang::ProcessWarningOptions(diagnostics, *diagnostic_options);
126+
auto vfs = llvm::vfs::getRealFileSystem();
127+
clang::ProcessWarningOptions(diagnostics, *diagnostic_options, *vfs);
127128

128129
clang::driver::Driver driver(clang_path, target_, diagnostics);
129130

toolchain/lower/file_context.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ auto FileContext::BuildFunctionDecl(SemIR::FunctionId function_id,
228228
param_inst_ids.reserve(max_llvm_params);
229229
auto return_param_id = SemIR::InstId::Invalid;
230230
if (return_info.has_return_slot()) {
231-
param_types.push_back(return_type->getPointerTo());
231+
param_types.push_back(
232+
llvm::PointerType::get(return_type, /*AddressSpace=*/0));
232233
return_param_id = sem_ir()
233234
.insts()
234235
.GetAs<SemIR::ReturnSlot>(function.return_slot_id)

0 commit comments

Comments
 (0)