cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3) by Zalathar · Pull Request #146631 · rust-lang/rust

Zalathar · 2025-09-16T10:48:01Z

Part of Revamp cg_llvm debuginfo handling to use the LLVM-C API #134001
Follow-up to cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 1) #136375
Follow-up to cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 2) #136632

This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs.

This PR migrates all of the bindings that were touched by #136632, plus LLVMDIBuilderCreateStructType.

rustbot · 2025-09-16T10:48:06Z

r? @nnethercote

rustbot has assigned @nnethercote.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

nnethercote · 2025-09-16T22:48:32Z

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

+
+    pub(crate) fn LLVMDIBuilderCreateSubroutineType<'ll>(
+        Builder: &DIBuilder<'ll>,
+        File: Option<&'ll Metadata>, // (unused)


What does (unused) mean?

The underlying LLVM-C function ignores the File argument, discarding it with no effect.

I've rephrased this comment to // (ignored and has no effect).

(When the C API function was originally added, it needed a file argument, but subsequent changes to the underlying C++ code mean that it no longer does anything.)

nnethercote · 2025-09-16T22:55:08Z

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

    }
 }

+fn create_pointer_type<'ll>(


nice encapsulation

nnethercote · 2025-09-16T22:58:36Z

This stuff is unfamiliar to me but it all looks pretty straightforward. I will delegate approval just in case there's a change to made in response to my question about "(unused)".

@bors delegate=Zalathar

bors · 2025-09-16T22:58:39Z

✌️ @Zalathar, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

Zalathar · 2025-09-17T01:45:52Z

I've added some clarification to the “ignored” file parameter.

@nnethercote Did you intend to r=me this? I'm not sure what the review status of this PR is.

nnethercote · 2025-09-17T02:18:19Z

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+    unsafe {
+        llvm::LLVMDIBuilderCreateSubroutineType(
+            DIB(cx),
+            None, // (unused)


Can you change this one to (ignored and has no effect) to match? r=me with that, thanks.

Zalathar · 2025-09-17T02:35:55Z

@bors r=nnethercote rollup

bors · 2025-09-17T02:35:58Z

📌 Commit af88d14 has been approved by nnethercote

It is now in the queue for this repository.

cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3) - Part of rust-lang#134001 - Follow-up to rust-lang#136375 - Follow-up to rust-lang#136632 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs. This PR migrates all of the bindings that were touched by rust-lang#136632, plus `LLVMDIBuilderCreateStructType`.

Rollup of 14 pull requests Successful merges: - #142807 (libtest: expose --fail-fast as an unstable command-line option) - #144871 (Stabilize `btree_entry_insert` feature) - #145071 (Update the minimum external LLVM to 20) - #145181 (remove FIXME block from `has_significant_drop`, it never encounters inference variables) - #145660 (initial implementation of the darwin_objc unstable feature) - #145838 (don't apply temporary lifetime extension rules to non-extended `super let`) - #146259 (Suggest removing Box::new instead of unboxing it) - #146410 (Iterator repeat: no infinite loop for `last` and `count`) - #146460 (Add tidy readme) - #146552 (StateTransform: Do not renumber resume local.) - #146564 (Remove Rvalue::Len again.) - #146581 (Detect attempt to use var-args in closure) - #146588 (tests/run-make: Update list of statically linked musl targets) - #146631 (cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3)) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146631 - Zalathar:di-builder, r=nnethercote cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3) - Part of #134001 - Follow-up to #136375 - Follow-up to #136632 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs. This PR migrates all of the bindings that were touched by #136632, plus `LLVMDIBuilderCreateStructType`.

cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 4) - Part of rust-lang#134001 - Follow-up to rust-lang#146631 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs.

Rollup merge of #146673 - Zalathar:di-builder, r=nnethercote cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 4) - Part of #134001 - Follow-up to #146631 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs.

Rollup of 14 pull requests Successful merges: - rust-lang/rust#142807 (libtest: expose --fail-fast as an unstable command-line option) - rust-lang/rust#144871 (Stabilize `btree_entry_insert` feature) - rust-lang/rust#145071 (Update the minimum external LLVM to 20) - rust-lang/rust#145181 (remove FIXME block from `has_significant_drop`, it never encounters inference variables) - rust-lang/rust#145660 (initial implementation of the darwin_objc unstable feature) - rust-lang/rust#145838 (don't apply temporary lifetime extension rules to non-extended `super let`) - rust-lang/rust#146259 (Suggest removing Box::new instead of unboxing it) - rust-lang/rust#146410 (Iterator repeat: no infinite loop for `last` and `count`) - rust-lang/rust#146460 (Add tidy readme) - rust-lang/rust#146552 (StateTransform: Do not renumber resume local.) - rust-lang/rust#146564 (Remove Rvalue::Len again.) - rust-lang/rust#146581 (Detect attempt to use var-args in closure) - rust-lang/rust#146588 (tests/run-make: Update list of statically linked musl targets) - rust-lang/rust#146631 (cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3)) r? `@ghost` `@rustbot` modify labels: rollup

cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 4) - Part of rust-lang/rust#134001 - Follow-up to rust-lang/rust#146631 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs.

cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3) - Part of rust-lang#134001 - Follow-up to rust-lang#136375 - Follow-up to rust-lang#136632 --- This is another batch of LLVMDIBuilder binding migrations, replacing some our own LLVMRust bindings with bindings to upstream LLVM-C APIs. This PR migrates all of the bindings that were touched by rust-lang#136632, plus `LLVMDIBuilderCreateStructType`.

Rollup of 14 pull requests Successful merges: - rust-lang#142807 (libtest: expose --fail-fast as an unstable command-line option) - rust-lang#144871 (Stabilize `btree_entry_insert` feature) - rust-lang#145071 (Update the minimum external LLVM to 20) - rust-lang#145181 (remove FIXME block from `has_significant_drop`, it never encounters inference variables) - rust-lang#145660 (initial implementation of the darwin_objc unstable feature) - rust-lang#145838 (don't apply temporary lifetime extension rules to non-extended `super let`) - rust-lang#146259 (Suggest removing Box::new instead of unboxing it) - rust-lang#146410 (Iterator repeat: no infinite loop for `last` and `count`) - rust-lang#146460 (Add tidy readme) - rust-lang#146552 (StateTransform: Do not renumber resume local.) - rust-lang#146564 (Remove Rvalue::Len again.) - rust-lang#146581 (Detect attempt to use var-args in closure) - rust-lang#146588 (tests/run-make: Update list of statically linked musl targets) - rust-lang#146631 (cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 3)) r? `@ghost` `@rustbot` modify labels: rollup