Skip to content

Commit 19ad72d

Browse files
authored
ZJIT: Remove unnecessary option return type on gen_branch_params (ruby#14286)
1 parent a7a026a commit 19ad72d

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

zjit/src/codegen.rs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -737,25 +737,26 @@ fn gen_entry_params(asm: &mut Assembler, iseq: IseqPtr, entry_block: &Block) {
737737
}
738738

739739
/// Set branch params to basic block arguments
740-
fn gen_branch_params(jit: &mut JITState, asm: &mut Assembler, branch: &BranchEdge) -> Option<()> {
741-
if !branch.args.is_empty() {
742-
asm_comment!(asm, "set branch params: {}", branch.args.len());
743-
let mut moves: Vec<(Reg, Opnd)> = vec![];
744-
for (idx, &arg) in branch.args.iter().enumerate() {
745-
match param_opnd(idx) {
746-
Opnd::Reg(reg) => {
747-
// If a parameter is a register, we need to parallel-move it
748-
moves.push((reg, jit.get_opnd(arg)));
749-
},
750-
param => {
751-
// If a parameter is memory, we set it beforehand
752-
asm.mov(param, jit.get_opnd(arg));
753-
}
740+
fn gen_branch_params(jit: &mut JITState, asm: &mut Assembler, branch: &BranchEdge) {
741+
if branch.args.is_empty() {
742+
return;
743+
}
744+
745+
asm_comment!(asm, "set branch params: {}", branch.args.len());
746+
let mut moves: Vec<(Reg, Opnd)> = vec![];
747+
for (idx, &arg) in branch.args.iter().enumerate() {
748+
match param_opnd(idx) {
749+
Opnd::Reg(reg) => {
750+
// If a parameter is a register, we need to parallel-move it
751+
moves.push((reg, jit.get_opnd(arg)));
752+
},
753+
param => {
754+
// If a parameter is memory, we set it beforehand
755+
asm.mov(param, jit.get_opnd(arg));
754756
}
755757
}
756-
asm.parallel_mov(moves);
757758
}
758-
Some(())
759+
asm.parallel_mov(moves);
759760
}
760761

761762
/// Get a method parameter on JIT entry. As of entry, whether EP is escaped or not solely

0 commit comments

Comments
 (0)