ZJIT: Elide unnecessary return statements

Author: aidenfoxivey

zjit/src/backend/tests.rs

@@ -63,10 +63,10 @@ fn test_alloc_regs() {
 }
 
 fn setup_asm() -> (Assembler, CodeBlock) {
-    return (
+    (
         Assembler::new(),
         CodeBlock::new_dummy()
-    );
+    )
 }
 
 // Test full codegen pipeline

zjit/src/cruby_methods.rs

@@ -255,8 +255,7 @@ fn inline_kernel_itself(_fun: &mut hir::Function, _block: hir::BlockId, recv: hi
 fn inline_kernel_block_given_p(fun: &mut hir::Function, block: hir::BlockId, _recv: hir::InsnId, args: &[hir::InsnId], _state: hir::InsnId) -> Option<hir::InsnId> {
     let &[] = args else { return None; };
     // TODO(max): In local iseq types that are not ISEQ_TYPE_METHOD, rewrite to Constant false.
-    let result = fun.push_insn(block, hir::Insn::IsBlockGiven);
-    return Some(result);
+    Some(fun.push_insn(block, hir::Insn::IsBlockGiven))
 }
 
 fn inline_array_aref(fun: &mut hir::Function, block: hir::BlockId, recv: hir::InsnId, args: &[hir::InsnId], state: hir::InsnId) -> Option<hir::InsnId> {

zjit/src/hir.rs

@@ -1428,7 +1428,7 @@ fn iseq_get_return_value(iseq: IseqPtr, captured_opnd: Option<InsnId>, ci_flags:
 
             // TODO(max): Support only_kwparam case where the local_idx is a positional parameter
 
-            return None;
+            None
         }
         YARVINSN_putnil => Some(IseqReturn::Value(Qnil)),
         YARVINSN_putobject => Some(IseqReturn::Value(unsafe { *rb_iseq_pc_at_idx(iseq, 1) })),
@@ -2618,16 +2618,16 @@ impl Function {
                         blockiseq,
                     });
                     fun.make_equal_to(send_insn_id, ccall);
-                    return Ok(());
+                    Ok(())
                 }
                 // Variadic method
                 -1 => {
                     // func(int argc, VALUE *argv, VALUE recv)
-                    return Err(());
+                    Err(())
                 }
                 -2 => {
                     // (self, args_ruby_array)
-                    return Err(());
+                    Err(())
                 }
                 _ => unreachable!("unknown cfunc kind: argc={argc}")
             }