explicitly end va_list lifetime

folkertdev · folkertdev · commit 213bb873518b · 2025-08-31T16:07:28.000+02:00
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs
@@ -519,6 +519,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             match self.locals[mir::Local::from_usize(1 + va_list_arg_idx)] {
                 LocalRef::Place(va_list) => {
                     bx.va_end(va_list.val.llval);
+
+                    // Explicitly end the lifetime of the `va_list`, this matters for LLVM.
+                    bx.lifetime_end(va_list.val.llval, va_list.layout.size);
                 }
                 _ => bug!("C-variadic function must have a `VaList` place"),
             }

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {`
`519`	`519`	`match self.locals[mir::Local::from_usize(1 + va_list_arg_idx)] {`
`520`	`520`	`LocalRef::Place(va_list) => {`
`521`	`521`	`bx.va_end(va_list.val.llval);`
	`522`	`+`
	`523`	+ // Explicitly end the lifetime of the `va_list`, this matters for LLVM.
	`524`	`+ bx.lifetime_end(va_list.val.llval, va_list.layout.size);`
`522`	`525`	`}`
`523`	`526`	_ => bug!("C-variadic function must have a `VaList` place"),
`524`	`527`	`}`