Update FunctionContext::Inserter::InsertHelper for llvm changes (#4069)

The interface has changed upstream:


https://github.com/llvm/llvm-project/commit/80f881485accb020345ee7e1c4c3151ec55ce590
This commit is contained in:
Danial Klimkin
2024-06-21 20:49:13 +00:00
committed by GitHub
parent 4132c6a65f
commit 7e4f2f2b49
3 changed files with 5 additions and 6 deletions
+3 -3
View File
@@ -116,8 +116,8 @@ bazel_dep(name = "zstd", version = "1.5.6", 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 2024-05-17.
llvm_project_version = "a68d20e986053ec571223a9f3ead3e146a27dc82"
# HEAD as of 2024-06-20.
llvm_project_version = "80f881485accb020345ee7e1c4c3151ec55ce590"
# Load a repository for the raw llvm-project, pre-overlay.
http_archive(
@@ -128,7 +128,7 @@ http_archive(
"@carbon//bazel/llvm_project:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch",
"@carbon//bazel/llvm_project:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch",
],
sha256 = "4c53512522cfd625a75aa7f201e6932f18ebf3fbe8ee89e05883c3d30ca935ac",
sha256 = "3216d56b308d420170d6284d04560175b56fd56065a7442f32b732c606e77367",
strip_prefix = "llvm-project-{0}".format(llvm_project_version),
urls = ["https://github.com/llvm/llvm-project/archive/{0}.tar.gz".format(llvm_project_version)],
)
+2 -2
View File
@@ -152,7 +152,7 @@ auto FunctionContext::CopyObject(SemIR::TypeId type_id, SemIR::InstId source_id,
}
auto FunctionContext::Inserter::InsertHelper(
llvm::Instruction* inst, const llvm::Twine& name, llvm::BasicBlock* block,
llvm::Instruction* inst, const llvm::Twine& name,
llvm::BasicBlock::iterator insert_pt) const -> void {
llvm::StringRef base_name;
llvm::StringRef separator;
@@ -164,7 +164,7 @@ auto FunctionContext::Inserter::InsertHelper(
}
IRBuilderDefaultInserter::InsertHelper(inst, base_name + separator + name,
block, insert_pt);
insert_pt);
}
} // namespace Carbon::Lower
-1
View File
@@ -115,7 +115,6 @@ class FunctionContext {
private:
auto InsertHelper(llvm::Instruction* inst, const llvm::Twine& name,
llvm::BasicBlock* block,
llvm::BasicBlock::iterator insert_pt) const
-> void override;