Skip to content

Clean up various LLVM FFI things in codegen_llvm #137549

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

Merged
merged 11 commits into from
Mar 7, 2025
Merged

Clean up various LLVM FFI things in codegen_llvm #137549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a54bfcf
Use safe FFI for various functions in codegen_llvm
oli-obk Feb 21, 2025
d4379d2
Remove an unnecessary lifetime
oli-obk Feb 24, 2025
bfd88ce
Avoid some duplication between SimpleCx and CodegenCx
oli-obk Feb 24, 2025
75356b7
Generalize `BackendTypes` over `GenericCx`
oli-obk Feb 24, 2025
840e31b
Generalize BaseTypeCodegenMethods
oli-obk Feb 24, 2025
396baa7
Make allocator shim creation mostly use safe code
oli-obk Feb 24, 2025
29440b8
Remove an unused lifetime param
oli-obk Feb 24, 2025
241c83f
Deduplicate more functions between `SimpleCx` and `CodegenCx`
oli-obk Feb 24, 2025
f16f64b
Remove inherent function that has a trait method duplicate of a commo…
oli-obk Feb 24, 2025
3565603
Use a safe wrapper around an LLVM FFI function
oli-obk Feb 24, 2025
553828c
Mark more LLVM FFI as safe
oli-obk Feb 24, 2025
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
8 changes: 2 additions & 6 deletions compiler/rustc_codegen_llvm/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ impl<'a, 'll, CX: Borrow<SimpleCx<'ll>>> GenericBuilder<'a, 'll, CX> {
}

fn ret_void(&mut self) {
unsafe {
llvm::LLVMBuildRetVoid(self.llbuilder);
}
llvm::LLVMBuildRetVoid(self.llbuilder);
}

fn ret(&mut self, v: &'ll Value) {
Expand Down Expand Up @@ -293,9 +291,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
}

fn ret_void(&mut self) {
unsafe {
llvm::LLVMBuildRetVoid(self.llbuilder);
}
llvm::LLVMBuildRetVoid(self.llbuilder);
}

fn ret(&mut self, v: &'ll Value) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/llvm/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ unsafe extern "C" {
pub(crate) fn LLVMGetCurrentDebugLocation2<'a>(Builder: &Builder<'a>) -> Option<&'a Metadata>;

// Terminators
pub(crate) fn LLVMBuildRetVoid<'a>(B: &Builder<'a>) -> &'a Value;
pub(crate) safe fn LLVMBuildRetVoid<'a>(B: &Builder<'a>) -> &'a Value;
Copy link
Member

Choose a reason for hiding this comment

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

Is it better to add a comment on why it's a safe API?

pub(crate) fn LLVMBuildRet<'a>(B: &Builder<'a>, V: &'a Value) -> &'a Value;
pub(crate) fn LLVMBuildBr<'a>(B: &Builder<'a>, Dest: &'a BasicBlock) -> &'a Value;
pub(crate) fn LLVMBuildCondBr<'a>(
Expand Down