Fix musttail returns for cast/indirect ABIs

Author: InvalidPathException

compiler/rustc_codegen_llvm/src/builder.rs

@@ -16,7 +16,6 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_hir::def_id::DefId;
-use rustc_middle::bug;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_middle::ty::layout::{
     FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasTypingEnv, LayoutError, LayoutOfHelpers,
@@ -1458,10 +1457,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
 
         match &fn_abi.ret.mode {
             PassMode::Ignore | PassMode::Indirect { .. } => self.ret_void(),
-            PassMode::Direct(_) | PassMode::Pair { .. } => self.ret(call),
-            mode @ PassMode::Cast { .. } => {
-                bug!("Encountered `PassMode::{mode:?}` during codegen")
-            }
+            PassMode::Direct(_) | PassMode::Pair { .. } | PassMode::Cast { .. } => self.ret(call),
         }
     }
 

compiler/rustc_codegen_ssa/src/mir/block.rs

@@ -1063,7 +1063,17 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 let return_dest = self.make_return_dest(bx, destination, &fn_abi.ret, &mut llargs);
                 target.map(|target| (return_dest, target))
             }
-            CallKind::Tail => None,
+            CallKind::Tail => {
+                if fn_abi.ret.is_indirect() {
+                    match self.make_return_dest(bx, destination, &fn_abi.ret, &mut llargs) {
+                        ReturnDest::Nothing => {}
+                        _ => bug!(
+                            "tail calls to functions with indirect returns cannot store into a destination"
+                        ),
+                    }
+                }
+                None
+            }
         };
 
         // Split the rust-call tupled arguments off.

tests/ui/explicit-tail-calls/become-cast-return.rs

@@ -1,7 +1,5 @@
-//@ check-pass
+//@ run-pass
 //@ ignore-backends: gcc
-//@ known-bug: #148239
-//@ compile-flags: -Zno-codegen
 #![expect(incomplete_features)]
 #![feature(explicit_tail_calls)]
 

tests/ui/explicit-tail-calls/become-indirect-return.rs

@@ -1,6 +1,5 @@
 //@ run-pass
 //@ ignore-backends: gcc
-//@ known-bug: #148239
 #![expect(incomplete_features)]
 #![feature(explicit_tail_calls)]
 
@@ -17,5 +16,5 @@ fn dispatch(param: &Box<u8>) -> [u8; 24] {
 fn main() {
     let param = Box::new(0);
     let result = dispatch(&param);
-    assert_ne!(result, [1; 24]); // the data is not right!
+    assert_eq!(result, [1; 24]);
 }