Update compiler/rustc_codegen_llvm/src/builder.rs

xacrimon · WaffleLapkin · web-flow · commit 12c0f0d7c10e · 2025-07-25T20:58:41.000+02:00
Co-authored-by: waffle &lt;waffle.lapkin@gmail.com&gt;
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs
@@ -1443,6 +1443,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         instance: Option<Instance<'tcx>>,
     ) {
         let call = self.call(llty, fn_attrs, Some(fn_abi), llfn, args, funclet, instance);
+        llvm::LLVMRustSetTailCallKind(call, llvm::TailCallKind::MustTail);
 
         match &fn_abi.ret.mode {
             PassMode::Ignore | PassMode::Indirect { .. } => self.ret_void(),
@@ -1451,8 +1452,6 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
                 bug!("Encountered `PassMode::{mode:?}` during codegen")
             }
         }
-
-        llvm::LLVMRustSetTailCallKind(call, llvm::TailCallKind::MustTail);
     }
 
     fn zext(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> &'ll Value {

Original file line number	Diff line number	Diff line change
`@@ -1443,6 +1443,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {`
`1443`	`1443`	`instance: Option<Instance<'tcx>>,`
`1444`	`1444`	`) {`
`1445`	`1445`	`let call = self.call(llty, fn_attrs, Some(fn_abi), llfn, args, funclet, instance);`
	`1446`	`+ llvm::LLVMRustSetTailCallKind(call, llvm::TailCallKind::MustTail);`
`1446`	`1447`
`1447`	`1448`	`match &fn_abi.ret.mode {`
`1448`	`1449`	`PassMode::Ignore \| PassMode::Indirect { .. } => self.ret_void(),`
`@@ -1451,8 +1452,6 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {`
`1451`	`1452`	bug!("Encountered `PassMode::{mode:?}` during codegen")
`1452`	`1453`	`}`
`1453`	`1454`	`}`
`1454`		`-`
`1455`		`- llvm::LLVMRustSetTailCallKind(call, llvm::TailCallKind::MustTail);`
`1456`	`1455`	`}`
`1457`	`1456`
`1458`	`1457`	`fn zext(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> &'ll Value {`